diff --git a/pkgs/htdp-pkgs/htdp-doc/htdp/info.rkt b/pkgs/htdp-pkgs/htdp-doc/htdp/info.rkt
new file mode 100644
index 0000000000..34fa93d357
--- /dev/null
+++ b/pkgs/htdp-pkgs/htdp-doc/htdp/info.rkt
@@ -0,0 +1,3 @@
+#lang setup/infotab
+
+(define scribblings '(("htdp.scrbl")))
diff --git a/pkgs/htdp-pkgs/htdp-doc/info.rkt b/pkgs/htdp-pkgs/htdp-doc/info.rkt
new file mode 100644
index 0000000000..a114943344
--- /dev/null
+++ b/pkgs/htdp-pkgs/htdp-doc/info.rkt
@@ -0,0 +1,15 @@
+#lang setup/infotab
+
+(define collection 'multi)
+
+(define deps
+  '("base"
+    "scribble-lib"
+    "at-exp-lib"
+    "draw-lib"
+    "gui-lib"
+    "htdp-lib"
+    "sandbox-lib"
+    ))
+(define build-deps '(#;"at-exp-lib"
+                     #;"rackunit-lib"))
diff --git a/pkgs/htdp-pkgs/htdp-doc/stepper/info.rkt b/pkgs/htdp-pkgs/htdp-doc/stepper/info.rkt
new file mode 100644
index 0000000000..8e13313117
--- /dev/null
+++ b/pkgs/htdp-pkgs/htdp-doc/stepper/info.rkt
@@ -0,0 +1,4 @@
+#lang setup/infotab
+
+(define scribblings '(("scribblings/stepper.scrbl")))
+
diff --git a/pkgs/htdp-pkgs/htdp-doc/teachpack/info.rkt b/pkgs/htdp-pkgs/htdp-doc/teachpack/info.rkt
new file mode 100644
index 0000000000..344ef2d1db
--- /dev/null
+++ b/pkgs/htdp-pkgs/htdp-doc/teachpack/info.rkt
@@ -0,0 +1,4 @@
+#lang setup/infotab
+
+(define scribblings '(("teachpack.scrbl" (multi-page) (teaching -13))))
+
diff --git a/pkgs/htdp-pkgs/htdp-doc/test-engine/info.rkt b/pkgs/htdp-pkgs/htdp-doc/test-engine/info.rkt
new file mode 100644
index 0000000000..e344a6fd44
--- /dev/null
+++ b/pkgs/htdp-pkgs/htdp-doc/test-engine/info.rkt
@@ -0,0 +1,2 @@
+#lang setup/infotab
+(define scribblings '(("test-engine.scrbl" () (tool-library))))
diff --git a/pkgs/htdp-pkgs/htdp-lib/htdp/info.rkt b/pkgs/htdp-pkgs/htdp-lib/htdp/info.rkt
index 26c6ce4a3d..401b48d8ec 100644
--- a/pkgs/htdp-pkgs/htdp-lib/htdp/info.rkt
+++ b/pkgs/htdp-pkgs/htdp-lib/htdp/info.rkt
@@ -5,4 +5,3 @@
   '("hangman-world.rkt" "hangman-world-play.rkt"
     "tests"))
 
-(define scribblings '(("htdp.scrbl")))
diff --git a/pkgs/htdp-pkgs/htdp-lib/info.rkt b/pkgs/htdp-pkgs/htdp-lib/info.rkt
index 63f11dd317..2f6ed34a1f 100644
--- a/pkgs/htdp-pkgs/htdp-lib/info.rkt
+++ b/pkgs/htdp-pkgs/htdp-lib/info.rkt
@@ -2,23 +2,25 @@
 
 (define collection 'multi)
 
-(define deps '("base"
-               "compatibility-lib"
-               "draw-lib"
-               "errortrace-lib"
-               "gui-lib"
-               "images"
-               "pconvert-lib"
-               "r5rs-lib"
-               "sandbox-lib"
-               "scribble-lib"
-               "slideshow-lib"
-               "snip-lib"
-               "string-constants-lib"
-               "typed-racket-lib"
-               "web-server-lib"
-               "wxme-lib"
-               "drracket"
-               "deinprogramm"))
+(define deps
+  '("base"
+    "compatibility-lib"
+    "draw-lib"
+    "errortrace-lib"
+    "gui-lib"
+    "htdp-doc"
+    "images"
+    "pconvert-lib"
+    "r5rs-lib"
+    "sandbox-lib"
+    "scribble-lib"
+    "slideshow-lib"
+    "snip-lib"    
+    "string-constants-lib"
+    "typed-racket-lib"
+    "web-server-lib"
+    "wxme-lib"
+    "drracket"
+    "deinprogramm"))
 (define build-deps '("at-exp-lib"
                      "rackunit-lib"))
diff --git a/pkgs/htdp-pkgs/htdp-lib/stepper/info.rkt b/pkgs/htdp-pkgs/htdp-lib/stepper/info.rkt
index 91695c5b13..fc3e48dd5b 100644
--- a/pkgs/htdp-pkgs/htdp-lib/stepper/info.rkt
+++ b/pkgs/htdp-pkgs/htdp-lib/stepper/info.rkt
@@ -6,5 +6,4 @@
 
 (define drracket-tool-icons (list '("stepper-32x32.png" "icons")))
 
-(define scribblings '(("scribblings/stepper.scrbl")))
 (define release-notes (list (list "Stepper" "HISTORY.txt")))
diff --git a/pkgs/htdp-pkgs/htdp-lib/teachpack/info.rkt b/pkgs/htdp-pkgs/htdp-lib/teachpack/info.rkt
index 1f3a35cd8a..a199e01610 100644
--- a/pkgs/htdp-pkgs/htdp-lib/teachpack/info.rkt
+++ b/pkgs/htdp-pkgs/htdp-lib/teachpack/info.rkt
@@ -1,4 +1,3 @@
 #lang setup/infotab
 
-(define scribblings '(("teachpack.scrbl" (multi-page) (teaching -13))))
 (define release-notes (list (list "Teachpacks" "HISTORY.txt")))
diff --git a/pkgs/htdp-pkgs/htdp-lib/test-engine/info.rkt b/pkgs/htdp-pkgs/htdp-lib/test-engine/info.rkt
index 3ed25bbe47..21eacd63ce 100644
--- a/pkgs/htdp-pkgs/htdp-lib/test-engine/info.rkt
+++ b/pkgs/htdp-pkgs/htdp-lib/test-engine/info.rkt
@@ -3,4 +3,3 @@
 (define tools (list (list "test-tool.scm")))
 (define tool-names '("Test Engine"))
 
-(define scribblings '(("test-engine.scrbl" () (tool-library))))
diff --git a/pkgs/htdp-pkgs/htdp/info.rkt b/pkgs/htdp-pkgs/htdp/info.rkt
new file mode 100644
index 0000000000..1f5ae8e852
--- /dev/null
+++ b/pkgs/htdp-pkgs/htdp/info.rkt
@@ -0,0 +1,6 @@
+#lang setup/infotab
+
+(define collection 'multi)
+
+(define deps '("htdp-lib" "htdp-doc"))
+(define implies '("htdp-lib" "htdp-doc"))