diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index a03cb44..f99077b 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2016 Eraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
+;;; Copyright © 2016 Amirouche <amirouche@hypermove.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1300,13 +1301,11 @@ is no support for parsing block and inline level HTML.")
                                            effective))
                 (source (assoc-ref %build-inputs "source"))
                 (doc (string-append out "/share/doc/scheme-bytestructures"))
-                (scm-files (find-files "bytestructures" "\\.scm$"))
+                (scm-files (with-directory-excursion source
+                             (find-files "bytestructures" "\\.scm$")))
                 (guild (string-append (assoc-ref %build-inputs "guile")
                                       "/bin/guild")))
            ;; Make installation directories.
-           (mkdir-p (string-append module-dir "/bytestructures/guile"))
-           (mkdir-p (string-append module-dir "/bytestructures/r6"))
-           (mkdir-p (string-append module-dir "/bytestructures/body"))
            (mkdir-p doc)
 
            ;; Compile .scm files and install.
@@ -1320,8 +1319,11 @@ is no support for parsing block and inline level HTML.")
                                                                  (string-rindex file #\.))
                                                       ".go")))
                          ;; Install source module.
+                         (mkdir-p (dirname dest-file))
                          (copy-file file dest-file)
+
                          ;; Install compiled module.
+                         (mkdir-p (dirname go-file))
                          (unless (zero? (system* guild "compile"
                                                  "-L" source
                                                  "-o" go-file