diff --git a/src/ikarus.boot b/src/ikarus.boot
index c0f8c95..78f30a4 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/ikarus.handlers.ss b/src/ikarus.handlers.ss
index dde04a6..b4d4832 100644
--- a/src/ikarus.handlers.ss
+++ b/src/ikarus.handlers.ss
@@ -25,7 +25,7 @@
     cdr-error fxadd1-error fxsub1-error cadr-error fx+-type-error
     fx+-types-error fx+-overflow-error $do-event)
   (import (except (ikarus) interrupt-handler)
-          (only (ikarus system) $interrupted? $unset-interrupted!))
+          (only (ikarus system $junkyard) $interrupted? $unset-interrupted!))
 
   (define interrupt-handler
     (make-parameter
diff --git a/src/makefile.ss b/src/makefile.ss
index 986d240..353dc91 100755
--- a/src/makefile.ss
+++ b/src/makefile.ss
@@ -114,7 +114,7 @@
       [$io (ikarus system $io)]
       [$arg-list (ikarus system $arg-list)]
       [$stack (ikarus system $stack)]
-      ;[$lists (ikarus system $lists)]
+      [$junkyard (ikarus system $junkyard)]
       ;[$lists (ikarus system $lists)]
       ))
 
@@ -545,31 +545,31 @@
       [$seal-frame-and-call             $stack]
       [$make-call-with-values-procedure $stack]
       [$make-values-procedure           $stack]
-      ; (ikarus system)
-      [$forward-ptr?                    s  ]
-      [$interrupted?                    s  ]
-      [$unset-interrupted!              s  ]
-      [$apply-nonprocedure-error-handler s]
-      [$incorrect-args-error-handler     s]
-      [$multiple-values-error            s]
-      [$debug                            s]
-      [$underflow-misaligned-error       s]
-      [top-level-value-error             s]
-      [car-error                         s]
-      [cdr-error                         s]
-      [fxadd1-error                      s]
-      [fxsub1-error                      s]
-      [cadr-error                        s]
-      [fx+-type-error                    s]
-      [fx+-types-error                   s]
-      [fx+-overflow-error                s]
-      [$do-event                         s]
-      [do-overflow            s]
-      [do-overflow-words      s]
-      [do-vararg-overflow     s]
-      [collect                s]
-      [do-stack-overflow      s]
-      [syntax-dispatch        s]
+      ; (ikarus system $junkyard)
+      [$forward-ptr?                     $junkyard]
+      [$interrupted?                     $junkyard]
+      [$unset-interrupted!               $junkyard]
+      [$apply-nonprocedure-error-handler $junkyard]
+      [$incorrect-args-error-handler     $junkyard]
+      [$multiple-values-error            $junkyard]
+      [$debug                            $junkyard]
+      [$underflow-misaligned-error       $junkyard]
+      [top-level-value-error             $junkyard]
+      [car-error                         $junkyard]
+      [cdr-error                         $junkyard]
+      [fxadd1-error                      $junkyard]
+      [fxsub1-error                      $junkyard]
+      [cadr-error                        $junkyard]
+      [fx+-type-error                    $junkyard]
+      [fx+-types-error                   $junkyard]
+      [fx+-overflow-error                $junkyard]
+      [$do-event                         $junkyard]
+      [do-overflow                       $junkyard]
+      [do-overflow-words                 $junkyard]
+      [do-vararg-overflow                $junkyard]
+      [collect                           $junkyard]
+      [do-stack-overflow                 $junkyard]
+      [syntax-dispatch                   $junkyard]
       ))
 
   (define (verify-procedures-map)