diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 48474f24f..9e4bd80ff 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-10  Mikael Djurfeldt  <mdj@linnaeus.mit.edu>
+
+	* init.c, goops.c: Reverted change of 2001-03-29.  (The goops
+	module should be registered in order to work for an application
+	which uses libguile statically linked.)
+
 2001-04-10  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* numbers.[ch] (scm_num2long, scm_num2long_long,
diff --git a/libguile/goops.c b/libguile/goops.c
index beddf7dc9..f63a4a42f 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -2694,16 +2694,12 @@ scm_init_goops (void)
   scm_set_current_module (old_module);
 }
 
-#if (SCM_DEBUG_DEPRECATED == 0)
-
 void
 scm_init_oop_goops_goopscore_module ()
 {
   scm_register_module_xxx ("oop goops goopscore", (void *) scm_init_goops);
 }
 
-#endif /* (SCM_DEBUG_DEPRECATED == 0) */
-
 /*
   Local Variables:
   c-file-style: "gnu"
diff --git a/libguile/init.c b/libguile/init.c
index 92ac9eaea..f7b023ffb 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999, 2000, 2001 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -79,6 +79,7 @@
 #include "libguile/fports.h"
 #include "libguile/gc.h"
 #include "libguile/gdbint.h"
+#include "libguile/goops.h"
 #include "libguile/gsubr.h"
 #include "libguile/hash.h"
 #include "libguile/hashtab.h"
@@ -573,6 +574,8 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_init_dynamic_linking ();
   scm_init_lang ();
   scm_init_script ();
+
+  scm_init_oop_goops_goopscore_module ();
   
   scm_initialized_p = 1;