diff --git a/src/ikarus.boot b/src/ikarus.boot
index dc2dbea..cc336f2 100644
Binary files a/src/ikarus.boot and b/src/ikarus.boot differ
diff --git a/src/libtrace.ss b/src/ikarus.trace.ss
similarity index 94%
rename from src/libtrace.ss
rename to src/ikarus.trace.ss
index 40c59ba..2c6d900 100644
--- a/src/libtrace.ss
+++ b/src/ikarus.trace.ss
@@ -1,7 +1,10 @@
 
 (library (ikarus trace)
-  (export)
-  (import (scheme))
+  (export make-traced-procedure trace-symbol! untrace-symbol!)
+  (import
+    (only (scheme) top-level-bound? set-top-level-value!
+          top-level-value)
+    (ikarus))
 
   (define k* '())
   
@@ -96,9 +99,7 @@
             [else (cons (car ls) (loop (cdr ls)))])))
       (set! traced-symbols (loop traced-symbols))))
 
-  (primitive-set! 'make-traced-procedure make-traced-procedure)
-  (primitive-set! 'trace-symbol! trace-symbol!)
-  (primitive-set! 'untrace-symbol! untrace-symbol!))
+  )
 
 
 #!eof
diff --git a/src/makefile.ss b/src/makefile.ss
index 7c4d73e..75081b9 100755
--- a/src/makefile.ss
+++ b/src/makefile.ss
@@ -53,9 +53,9 @@
       "ikarus.reader.ss"
       "ikarus.code-objects.ss"
 
+      "ikarus.trace.ss"
       "ikarus.intel-assembler.ss"
       "ikarus.fasl.ss"
-      "libtrace.ss"
       "ikarus.compiler.ss"
       "libsyntax.ss"
       "libpp.ss"