diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index a67afec93..d3299a69a 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -3560,5 +3560,16 @@
 ;;;
 
 (if (memq 'debug-extensions *features*)
-    (define-module (guile) :use-module (ice-9 debug))
-    (define-module (guile)))
+    (define-module (guile) :use-module (ice-9 debug)))
+
+
+
+;;; {Load thread code if threads are present.}
+;;;
+;;; *fixme* This is a temporary solution.
+;;;
+
+(if (memq 'threads *features*)
+    (define-module (guile) :use-module (ice-9 threads)))
+
+(define-module (guile))