diff --git a/ChangeLog b/ChangeLog
index 1b60d934b2..ddaa3f5310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
 	* sysdeps/unix/syscalls.list: Use __setrlimit as strong name.
 
+	* posix/unistd.h: Move internal prototypes from here ...
+	* include/unistd.h: ... to here.
+
+	* sysvipc/sys/shm.h: Add const attribute to __getpagesize.
+
 2000-08-24  Ulrich Drepper  <drepper@redhat.com>
 
 	* grp/initgroups.c (initgroups): Deallocate groups array.
diff --git a/sysvipc/sys/shm.h b/sysvipc/sys/shm.h
index 7a00a39f67..ff9e04ca06 100644
--- a/sysvipc/sys/shm.h
+++ b/sysvipc/sys/shm.h
@@ -45,7 +45,7 @@ __BEGIN_DECLS
 
 /* Segment low boundary address multiple.  */
 #define SHMLBA		(__getpagesize ())
-extern int __getpagesize (void) __THROW;
+extern int __getpagesize (void) __THROW __attribute__ ((__const__));
 
 
 /* The following System V style IPC functions implement a shared memory