diff --git a/src/ikarus.boot b/src/ikarus.boot
index c65e9c7..1a7a4b8 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/ikarus.syntax.ss b/src/ikarus.syntax.ss
index 054ca88..a66c81f 100644
--- a/src/ikarus.syntax.ss
+++ b/src/ikarus.syntax.ss
@@ -566,7 +566,7 @@
     (lambda (sym)
       (let-values ([(subst env) 
                     (library-subst/env 
-                      (find-library-by-name '(scheme)))])
+                      (find-library-by-name '(ikarus system $all)))])
         (cond
           [(assq sym subst) =>
            (lambda (x)
diff --git a/src/makefile.ss b/src/makefile.ss
index 6f7b3a3..a9b79e6 100755
--- a/src/makefile.ss
+++ b/src/makefile.ss
@@ -95,7 +95,8 @@
       [or                (macro . or)]))
 
   (define library-legend
-    '([s   (ikarus system)]
+    '([$all (ikarus system $all)]
+      [s   (ikarus system)]
       [u   (ikarus system unsafe)]
       [i   (ikarus)]
       [r   (r6rs)]
@@ -1101,12 +1102,16 @@
               [version     '()]
               [import-libs '()]
               [visit-libs  '()]
-              [invoke-libs '()]
-              [subst (get-export-subset key export-subst)]
-              [env (if (equal? name '(ikarus system)) export-env '())])
-          `(install-library 
-             ',id ',name ',version ',import-libs ',visit-libs ',invoke-libs
-             ',subst ',env void void))))
+              [invoke-libs '()])
+          (let-values ([(subst env)
+                        (if (equal? name '(ikarus system $all)) 
+                            (values export-subst export-env)
+                            (values
+                              (get-export-subset key export-subst)
+                              '()))])
+            `(install-library 
+               ',id ',name ',version ',import-libs ',visit-libs ',invoke-libs
+               ',subst ',env void void)))))
     (let ([code `(library (ikarus primlocs)
                     (export) ;;; must be empty
                     (import