diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c6de5d72b..f1ffd25ea 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-02  Christopher Faylor  <cgf@redhat.com>
+
+	* dcrt0.cc (dll_crt0_1): Remove getpagesize() call.
+	* shared.cc (memory_init): Move it here.
+
 2002-08-31  Christopher January  <chris@atomice.net>
 
 	* fhandler_proc.cc: Add <sys/param.h> include.
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 003085dd1..ee9d42e3c 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -568,8 +568,6 @@ dll_crt0_1 ()
   user_data->resourcelocks->Init ();
   user_data->threadinterface->Init (user_data->forkee);
 
-  (void) getpagesize ();	/* initialize page size constant */
-
   mainthread.init ("mainthread"); // For use in determining if signals
 				  //  should be blocked.
 
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc
index b6d15f3b3..3031ae780 100644
--- a/winsup/cygwin/shared.cc
+++ b/winsup/cygwin/shared.cc
@@ -146,6 +146,7 @@ memory_init ()
   cygheap->shared_h = shared_h;
   ProtectHandleINH (cygheap->shared_h);
 
+  getpagesize ();
   heap_init ();
   mount_table = (mount_info *) open_shared (user_name, MOUNT_VERSION,
 					    cygwin_mount_h,