diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index c17c1c2a5..983cbc33f 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-31  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* init.c (scm_init_guile_1): move scm_weaks_prehistory before
+	scm_struct_prehistory. The effect is that structs are freed before
+	weak vectors are cleaned up. This fixes a bug reported by Kevin
+	Ryde (putting a struct into a weak vector exposes a freed cell).
+
 2004-08-29  Rob Browning  <rlb@defaultvalue.org>
 
 	* ramap.c (s_scm_array_map_x): update documentation; rename ra0 to
diff --git a/libguile/init.c b/libguile/init.c
index 34e17ca53..1f61a3e3d 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -469,9 +469,9 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_debug_malloc_prehistory ();
 #endif
   scm_init_storage ();	          /* requires smob_prehistory */
+  scm_weaks_prehistory ();	  /* requires storage */
   scm_struct_prehistory ();	  /* requires storage */
   scm_symbols_prehistory ();      /* requires storage */
-  scm_weaks_prehistory ();	  /* requires storage */
   scm_init_subr_table ();
   scm_environments_prehistory (); /* requires storage */
   scm_modules_prehistory ();      /* requires storage */