diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c10960341..8a8ab8bb4 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-28  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygwin.din: Export stpcpy, stpncpy.
+	* posix.sgml: Add stpcpy and stpncpy to list of implemented
+	GNU extensions.
+	* include/cygwin/version.h: Bump API minor number.
+
 2007-06-27  Corinna Vinschen  <corinna@vinschen.de>
 
 	* shared_info.h (SHARED_INFO_CB): Accommodate change to shared_info.
diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
index 56a342c50..346291af9 100644
--- a/winsup/cygwin/cygwin.din
+++ b/winsup/cygwin/cygwin.din
@@ -1424,6 +1424,8 @@ _stat64 = stat64 SIGFE
 statfs SIGFE
 _statfs = statfs SIGFE
 statvfs SIGFE
+stpcpy NOSIGFE
+stpncpy NOSIGFE
 strcasecmp NOSIGFE
 _strcasecmp = strcasecmp NOSIGFE
 strcasestr NOSIGFE
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 1337a283f..ba58c38a3 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -314,12 +314,13 @@ details. */
            fopencookie.
       172: Export getifaddrs, freeifaddrs.
       173: Export __assert_func.
+      174: Export stpcpy, stpncpy.
      */
 
      /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
 
 #define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 173
+#define CYGWIN_VERSION_API_MINOR 174
 
      /* 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 f90c315d1..2567195e7 100644
--- a/winsup/cygwin/posix.sgml
+++ b/winsup/cygwin/posix.sgml
@@ -962,6 +962,8 @@ also ISO/IEC 9945:2003 and IEEE Std 1003.1-2001 (POSIX.1-2001).</para>
     mempcpy
     pow10
     pow10f
+    stpcpy
+    stpncpy
     strndup
     strnlen
     tdestroy