diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100755
index 0000000..872167c
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+autoreconf -vif
diff --git a/guix.scm b/guix.scm
index ec71fe9..74d1a9d 100644
--- a/guix.scm
+++ b/guix.scm
@@ -3,17 +3,26 @@
   ((guix licenses) #:prefix license:)
   (guix download)
   (guix build-system gnu)
+	(guix gexp)
   (gnu packages)
   (gnu packages autotools)
   (gnu packages guile)
   (gnu packages guile-xyz)
   (gnu packages pkg-config)
-  (gnu packages texinfo))
+  (gnu packages texinfo)
+	(srfi srfi-1))
+
+(define (keep-file? file stat)
+  (not (any (lambda (my-string)
+              (string-contains file my-string))
+            (list ".git" ".dir-locals.el" "guix.scm"))))
 
 (package
   (name "gib-gab-gob")
   (version "0.1")
-  (source "./gib-gab-gob-0.1.tar.gz")
+  (source (local-file (dirname (current-filename))
+                      #:recursive? #t
+                      #:select? keep-file?))
   (build-system gnu-build-system)
   (arguments
     `(#:modules
diff --git a/hall.scm b/hall.scm
index b0f99b2..19a3a80 100644
--- a/hall.scm
+++ b/hall.scm
@@ -16,31 +16,32 @@
   (files (libraries
            ((directory
               "gib-gab-gob"
-              ((compiled-scheme-file "game")
-               (scheme-file "rps")
+              ((compiled-scheme-file "board")
+               (compiled-scheme-file "game")
                (scheme-file "game")
-               (compiled-scheme-file "board")
                (scheme-file "board")
+               (scheme-file "rps")
                (compiled-scheme-file "rps")))))
-         (tests ((directory "tests" ())))
+         (tests ())
          (programs
            ((directory
               "scripts"
               ((in-file "make-joiner")
                (in-file "make-initiator")
-               (text-file "make-initiator")
-               (text-file "make-joiner")))))
-         (documentation ((org-file "README")))
+               (text-file "make-joiner")
+               (text-file "make-initiator")))))
+         (documentation
+           ((org-file "README") (text-file "COPYING")))
          (infrastructure
-           ((in-file "pre-inst-env")
+           ((automake-file "Makefile")
+            (autoconf-file "configure")
+            (text-file ".gitignore")
+            (scheme-file "hall")
             (directory
               "build-aux"
-              ((tex-file "texinfo")
-               (scheme-file "test-driver")
+              ((scheme-file "test-driver")
                (text-file "missing")
-               (text-file "install-sh")
-               (text-file "mdate-sh")))
-            (scheme-file "hall")
-            (text-file ".gitignore")
-            (autoconf-file "configure")
-            (automake-file "Makefile")))))
+               (text-file "install-sh")))
+            (in-file "pre-inst-env")
+            (scheme-file "guix")
+            (shell-file "bootstrap")))))