diff --git a/ChangeLog b/ChangeLog
index d7cc72fbae..a80ce7b057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2001-08-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* catgets/catgets.c (catclose): Be liberal about catalog_desc in
+	catclose too.
+
 2001-08-09  Ulrich Drepper  <drepper@redhat.com>
 
 	* time/strptime.c (strptime_internal): Add handling of year +
 	%U/%W week + week day.
+	* time/tst-strptime.c: Add test case for %U and %W handling.
 
 	* stdio-common/vfscanf.c: Fix reading of wide chars and strings if
 	not COMPILE_WSCANF.
diff --git a/catgets/catgets.c b/catgets/catgets.c
index 248b552c91..b11cc597b3 100644
--- a/catgets/catgets.c
+++ b/catgets/catgets.c
@@ -114,6 +114,13 @@ catclose (nl_catd catalog_desc)
 {
   __nl_catd catalog;
 
+  /* Be generous if catalog which failed to be open is used.  */
+  if (catalog_desc == (nl_catd) -1)
+    {
+      __set_errno (EBADF);
+      return -1;
+    }
+
   catalog = (__nl_catd) catalog_desc;
 
 #ifdef _POSIX_MAPPED_FILES
diff --git a/time/tst-strptime.c b/time/tst-strptime.c
index 96bda389d8..d866923903 100644
--- a/time/tst-strptime.c
+++ b/time/tst-strptime.c
@@ -1,5 +1,5 @@
 /* Test for strptime.
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -35,6 +35,8 @@ static const struct
   { "03/03/00", "%D", 5, 62 },
   { "9/9/99", "%x", 4, 251 },
   { "19990502123412", "%Y%m%d%H%M%S", 0, 121 },
+  { "2001 20 Mon", "%Y %U %a", 1, 140 },
+  { "2001 21 Mon", "%Y %W %a", 1, 140 },
 };