diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
index 54ebc5c5d..1d39325c4 100644
--- a/winsup/testsuite/ChangeLog
+++ b/winsup/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct  5 11:15:55 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* winsup.api/nullgetcwd.c: New file.  Check that NULL first argument to
+	getcwd works.
+
 Thu Oct  4 22:47:51 2001  Christopher Faylor <cgf@cygnus.com>
 
 	* winsup.api/systemcall.c (main): Change some messages for clarity.
diff --git a/winsup/testsuite/winsup.api/nullgetcwd.c b/winsup/testsuite/winsup.api/nullgetcwd.c
new file mode 100644
index 000000000..f7d873261
--- /dev/null
+++ b/winsup/testsuite/winsup.api/nullgetcwd.c
@@ -0,0 +1,16 @@
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+int
+main (int argc, char *argv)
+{
+  char *cwd = getcwd (NULL, 256);
+  if (cwd == NULL)
+    {
+      fprintf (stderr, "%s: getcwd returns NULL\n", argv[0]);
+      exit (1);
+    }
+
+  exit (0);
+}
+