diff --git a/Makefile.am b/Makefile.am
index f39e571581..418b63a377 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,7 +127,7 @@ EXTRA_DIST =					\
   ROADMAP					\
   TODO						\
   .dir-locals.el				\
-  hydra.scm					\
+  build-aux/hydra/gnu-system.scm		\
   build-aux/download.scm			\
   build-aux/sync-synopses.scm			\
   srfi/srfi-64.scm				\
diff --git a/hydra.scm b/build-aux/hydra/gnu-system.scm
similarity index 98%
rename from hydra.scm
rename to build-aux/hydra/gnu-system.scm
index c4b6dba924..f03c201223 100644
--- a/hydra.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -31,7 +31,7 @@
 
   (and=> (assoc-ref (current-source-location) 'filename)
          (lambda (file)
-           (let ((dir (dirname file)))
+           (let ((dir (string-append (dirname file) "/../..")))
              (format (current-error-port) "prepending ~s to the load path~%"
                      dir)
              (set! %load-path (cons dir %load-path))))))