diff --git a/libguile/Makefile.in b/libguile/Makefile.in
index 929babc32..a7461405e 100644
--- a/libguile/Makefile.in
+++ b/libguile/Makefile.in
@@ -77,7 +77,6 @@ MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 NM = @NM@
 PACKAGE = @PACKAGE@
-PROG_HOSTNAME = @PROG_HOSTNAME@
 QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
 RANLIB = @RANLIB@
 THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
diff --git a/libguile/init.c b/libguile/init.c
index 8ec1cc3b5..02b438a87 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -458,9 +458,7 @@ scm_boot_guile_1 (base, closure)
       scm_init_unif ();
       scm_init_simpos ();
       scm_init_load_path ();
-#if defined (HAVE_RL_GETC_FUNCTION) || defined (TOTORO)
-      /* The test for TOTORO is a kludge to make totoro.red-bean.com
-         generate snapshots correctly. */
+#if defined (HAVE_RL_GETC_FUNCTION)
       scm_init_readline ();
 #endif
       scm_init_standard_ports ();
diff --git a/libguile/readline.c b/libguile/readline.c
index 3ebce6b1a..8840bd210 100644
--- a/libguile/readline.c
+++ b/libguile/readline.c
@@ -43,9 +43,7 @@
 
 
 #include "_scm.h"
-#if defined (HAVE_RL_GETC_FUNCTION) || defined (TOTORO)
-/* The test for TOTORO is a kludge to make totoro.red-bean.com
-   generate snapshots correctly. */
+#if defined (HAVE_RL_GETC_FUNCTION)
 #include <libguile.h>
 #include <readline.h>
 #include <gh.h>
diff --git a/libguile/scmconfig.h.in b/libguile/scmconfig.h.in
index f4277db2c..a919b4a65 100644
--- a/libguile/scmconfig.h.in
+++ b/libguile/scmconfig.h.in
@@ -140,15 +140,6 @@
 /* Define if using cooperative multithreading.  */
 #undef USE_COOP_THREADS
 
-/* Define if using "FSU" pthreads.  */
-#undef USE_FSU_PTHREADS
-
-/* Define if using MIT pthreads.  */
-#undef USE_MIT_PTHREADS
-
-/* Define if using PCthreads pthreads.  */
-#undef USE_PCTHREADS_PTHREADS
-
 /* Define if using any sort of threads.  */
 #undef USE_THREADS
 
@@ -179,12 +170,6 @@
 /* Define if usleep doesn't return a value. */
 #undef USLEEP_RETURNS_VOID
 
-/* Define if configuring on totoro.red-bean.com.
-   This variable is used in a workaround which forces totoro to include
-   readline support regardless.  This kludge should obviously be
-   removed as fast as possible. */
-#undef TOTORO
-
 /* Define if you have the bzero function.  */
 #undef HAVE_BZERO