diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8a763f9bc..0b386854f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-24  Christopher Faylor  <cgf@alum.bu.edu>
+
+	* include/cygwin/version.h: Bump api minor version number.
+
+2004-05-24  Christopher Faylor  <cgf@alum.bu.edu>
+
+	* cygwin.din: Export atoll.
+
 2004-05-20  Christopher Faylor  <cgf@alum.bu.edu>
 
 	* tty.cc (tty_list::allocate_tty): Leave tty_mutex armed on successful
diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
index f31906248..a849f41b1 100644
--- a/winsup/cygwin/cygwin.din
+++ b/winsup/cygwin/cygwin.din
@@ -208,6 +208,7 @@ atoi NOSIGFE
 _atoi = atoi NOSIGFE
 atol NOSIGFE
 _atol = atol NOSIGFE
+atoll NOSIGFE
 bcmp NOSIGFE
 _bcmp = bcmp NOSIGFE
 bcopy NOSIGFE
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index cc669604d..d171f40f1 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -243,12 +243,13 @@ details. */
       114: Export rand_r, ttyname_r.
       115: Export flockfile, ftrylockfile, funlockfile, getgrgid_r, getgrnam_r,
            getlogin_r.
+      116: Export atoll.
      */
 
      /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
 
 #define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 115
+#define CYGWIN_VERSION_API_MINOR 116
 
      /* There is also a compatibity version number associated with the
 	shared memory regions.  It is incremented when incompatible
diff --git a/winsup/cygwin/winbase.h b/winsup/cygwin/winbase.h
index 3dbf116ea..fc9af06fb 100644
--- a/winsup/cygwin/winbase.h
+++ b/winsup/cygwin/winbase.h
@@ -34,7 +34,7 @@ ilockexch (long *t, long v)
   __asm__ __volatile__ ("\n\
 1:	lock	cmpxchgl %3,(%1)\n\
 	jne 1b\n\
- 	": "=a" (__res), "=q" (t): "1" (t), "q" (v), "0" (*t));
+ 	": "=a" (__res), "=q" (t): "1" (t), "q" (v), "0" (*t): "memory": "cc");
   return __res;
 }
 
@@ -44,7 +44,7 @@ ilockcmpexch (long *t, long v, long c)
   register int __res;
   __asm__ __volatile__ ("\n\
 	lock cmpxchgl %3,(%1)\n\
-	": "=a" (__res), "=q" (t) : "1" (t), "q" (v), "0" (c));
+	": "=a" (__res), "=q" (t) : "1" (t), "q" (v), "0" (c): "memory": "cc");
   return __res;
 }