diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 51417e14b..c7dbfc7ac 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-27  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
+
+	* cygwin.din (strchrnul): Export.
+	* include/cygwin/version.h (CYGWIN_VERSION_API_MINOR): Bump.
+	* posix.sgml (std-gnu): Add strchrnul.
+
 2011-03-27  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
 	* dll_init.cc (dll::init): Accommodate ill-behaved dlls who don't fill
diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
index b0c330031..e1dcea75b 100644
--- a/winsup/cygwin/cygwin.din
+++ b/winsup/cygwin/cygwin.din
@@ -1583,6 +1583,7 @@ strcat NOSIGFE
 _strcat = strcat NOSIGFE
 strchr NOSIGFE
 _strchr = strchr NOSIGFE
+strchrnul NOSIGFE
 strcmp NOSIGFE
 _strcmp = strcmp NOSIGFE
 strcoll NOSIGFE
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index f20e850e1..9a8b9e6f4 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -400,12 +400,13 @@ details. */
       234: Export program_invocation_name, program_invocation_short_name.
       235: Export madvise.
       236: Export pthread_yield, __xpg_strerror_r.
+      237: Export strchrnul.
      */
 
      /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
 
 #define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 236
+#define CYGWIN_VERSION_API_MINOR 237
 
      /* There is also a compatibity version number associated with the
 	shared memory regions.  It is incremented when incompatible
diff --git a/winsup/cygwin/posix.sgml b/winsup/cygwin/posix.sgml
index 9f73b3d59..393a2bcb7 100644
--- a/winsup/cygwin/posix.sgml
+++ b/winsup/cygwin/posix.sgml
@@ -1112,6 +1112,7 @@ also IEEE Std 1003.1-2008 (POSIX.1-2008).</para>
     pow10f
     removexattr
     setxattr
+    strchrnul
     tdestroy
     timegm
     timelocal