diff --git a/pitfall/info.rkt b/pitfall/info.rkt
index bf2a1f39..ca8ad6b4 100644
--- a/pitfall/info.rkt
+++ b/pitfall/info.rkt
@@ -1,18 +1,14 @@
 #lang info
 (define collection 'multi)
+(define version "0.0")
+(define test-omit-paths 'all)
 (define deps '("at-exp-lib"
+               "base"
                "beautiful-racket-lib"
                "brag"
                "describe"
+               "fontland"
                "png-image"
+               "rackunit-lib"
                "srfi-lite-lib"
-               "sugar"
-               "debug"
-               "base" 
-               "draw-lib"
-               "rackunit-lib"))
-(define build-deps '("scribble-lib" "racket-doc"))
-(define version "0.0")
-(define pkg-authors '(mb))
-(define test-omit-paths 'all)
-#;(define compile-omit-paths '("pdfkit" "fontkit"))
+               "sugar"))
diff --git a/pitfall/pitfall/embedded.rkt b/pitfall/pitfall/embedded.rkt
index dccec8fc..369ffe85 100644
--- a/pitfall/pitfall/embedded.rkt
+++ b/pitfall/pitfall/embedded.rkt
@@ -1,5 +1,5 @@
 #lang pitfall/racket
-(require "font.rkt" fontkit "reference.rkt")
+(require "font.rkt" fontland "reference.rkt")
 (provide EmbeddedFont)
 
 #|
@@ -205,7 +205,7 @@ HERE
                  
 
 (module+ test
-  (require rackunit fontkit)
+  (require rackunit fontland)
   (define f (openSync "test/assets/Charter.ttf" #f))
   (define ef (make-object EmbeddedFont #f f #f))
   (check-equal? (send ef widthOfString "f" 1000) 321.0)
diff --git a/pitfall/pitfall/font-open.rkt b/pitfall/pitfall/font-open.rkt
index c4e7b108..2497b1cd 100644
--- a/pitfall/pitfall/font-open.rkt
+++ b/pitfall/pitfall/font-open.rkt
@@ -1,5 +1,5 @@
 #lang pitfall/racket
-(require "standard-font.rkt" "font.rkt" fontkit "embedded.rkt")
+(require "standard-font.rkt" "font.rkt" fontland "embedded.rkt")
 (provide PDFFont-open)
 
 (define/contract (PDFFont-open document src family id)
diff --git a/pitfall/pitfall/page-test.rkt b/pitfall/pitfall/page-test.rkt
index c4667995..de38054a 100644
--- a/pitfall/pitfall/page-test.rkt
+++ b/pitfall/pitfall/page-test.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/class rackunit "document.rkt" "page.rkt" "reference.rkt" "helper.rkt" sugar/js)
+(require racket/class rackunit "document.rkt" "page.rkt" "reference.rkt" "helper.rkt" sugar/unstable/js)
 (define p (make-object PDFPage (make-object PDFDocument)))
 (check-equal? (· p size) "letter")
 (check-equal? (· p layout) "portrait")
diff --git a/pitfall/pitfall/parse.rkt b/pitfall/pitfall/parse.rkt
index 163ca9fc..a33e5349 100644
--- a/pitfall/pitfall/parse.rkt
+++ b/pitfall/pitfall/parse.rkt
@@ -1,5 +1,5 @@
 #lang br
-(require racket/file sugar/cache sugar/port racket/dict (prefix-in zlib: pitfall/zlib))
+(require racket/file sugar/cache sugar/unstable/port racket/dict (prefix-in zlib: pitfall/zlib))
 
 (define dict-key-pattern #px"^/[-:\\w]+")
 
diff --git a/pitfall/pitfall/racket.rkt b/pitfall/pitfall/racket.rkt
index 3381e843..0e4738ef 100644
--- a/pitfall/pitfall/racket.rkt
+++ b/pitfall/pitfall/racket.rkt
@@ -19,12 +19,12 @@
      racket/port
      racket/function
      br/define
-     sugar/class
-     sugar/js
-     sugar/dict
-     sugar/stub
-     sugar/port
-     sugar/contract
+     sugar/unstable/class
+     sugar/unstable/js
+     sugar/unstable/dict
+     sugar/unstable/stub
+     sugar/unstable/port
+     sugar/unstable/contract
      describe)
 
 (module reader syntax/module-reader
diff --git a/pitfall/pitfall/standard-font.rkt b/pitfall/pitfall/standard-font.rkt
index 1e07bda1..2907a046 100644
--- a/pitfall/pitfall/standard-font.rkt
+++ b/pitfall/pitfall/standard-font.rkt
@@ -1,5 +1,5 @@
 #lang pitfall/racket
-(require "afm-font.rkt" "font.rkt" fontkit)
+(require "afm-font.rkt" "font.rkt" fontland)
 (require racket/runtime-path)
 (provide isStandardFont standard-fonts StandardFont)