diff --git a/hall.scm b/hall.scm
index e863548..ed56ffb 100644
--- a/hall.scm
+++ b/hall.scm
@@ -8,23 +8,22 @@
   (description "An nREPL implementation in guile")
   (home-page "")
   (license gpl3+)
-  (dependencies `(("guile-config" ,guile-config)
-                  ("guile-torrent" ,guile-torrent)))
+  (dependencies
+    `(("guile-config" ,guile-config)
+      ("guile-torrent" ,guile-torrent)))
   (skip ())
   (files (libraries
            ((directory
               "guile-nrepl"
-              ((scheme-file "bencode")))
-            (scheme-file "guile-nrepl")))
+              ((scheme-file "bencode")))))
          (tests ((directory "tests" ((scheme-file "bencode")))))
          (programs ((directory "scripts" ())))
          (documentation
-           ((directory "doc" ((texi-file "guile-nrepl")))
-            (text-file "COPYING")
+           ((symlink "README" "README.org")
             (text-file "HACKING")
-            (symlink "README" "README.org")
-            (org-file "README")))
+            (text-file "COPYING")
+            (directory "doc" ((texi-file "guile-nrepl")))))
          (infrastructure
-           ((scheme-file "hall")
+           ((scheme-file "guix")
             (text-file ".gitignore")
-            (scheme-file "guix")))))
+            (scheme-file "hall")))))
diff --git a/manifest.scm b/manifest.scm
index ae5c7f1..8181745 100644
--- a/manifest.scm
+++ b/manifest.scm
@@ -2,4 +2,8 @@
 ;; You can store it in a file that you may then pass to any 'guix' command
 ;; that accepts a '--manifest' (or '-m') option.
 
-(specifications->manifest (list "guile-hall"))
+(concatenate-manifests
+  (list (specifications->manifest
+          (list "guile-hall" "guile-torrent"))
+        (package->development-manifest
+          (specification->package "guile-hall"))))