diff --git a/src/ikarus.boot b/src/ikarus.boot
index ec67669..cdb8391 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/libpp.ss b/src/ikarus.pretty-print.ss
similarity index 99%
rename from src/libpp.ss
rename to src/ikarus.pretty-print.ss
index 68d46c0..5a716e9 100644
--- a/src/libpp.ss
+++ b/src/ikarus.pretty-print.ss
@@ -1,7 +1,7 @@
 
 (library (ikarus pretty-print)
-  (export)
-  (import (scheme))
+  (export pretty-print)
+  (import (except (ikarus) pretty-print))
   (define (map1ltr f ls)
     ;;; ltr so that gensym counts get assigned properly
     (cond
@@ -501,7 +501,7 @@
   (define *pretty-format* '*pretty-format*)
   (define (set-fmt! name fmt)
     (putprop name *pretty-format* fmt))
-  (primitive-set! 'pretty-print 
+  (define pretty-print 
     (case-lambda
       [(x) (pretty x (current-output-port))]
       [(x p)
diff --git a/src/makefile.ss b/src/makefile.ss
index d4cf15d..8b2a1c0 100755
--- a/src/makefile.ss
+++ b/src/makefile.ss
@@ -38,9 +38,7 @@
       "ikarus.vectors.ss"
       "ikarus.numerics.ss"
       "ikarus.guardians.ss"
-
       "ikarus.command-line.ss"
-
       "ikarus.core.ss"
       "ikarus.io-ports.ss"
       "ikarus.io-primitives.unsafe.ss"
@@ -52,13 +50,12 @@
       "ikarus.writer.ss"
       "ikarus.reader.ss"
       "ikarus.code-objects.ss"
-
       "ikarus.trace.ss"
       "ikarus.intel-assembler.ss"
       "ikarus.fasl.ss"
       "ikarus.compiler.ss"
       "ikarus.syntax.ss"
-      "libpp.ss"
+      "ikarus.pretty-print.ss"
       "libcafe.ss"
       "libposix.ss"
       "libtimers.ss"