diff --git a/.guix-channel b/.guix-channel
index 3a5a513ca..2d4c5dcaa 100644
--- a/.guix-channel
+++ b/.guix-channel
@@ -2,4 +2,4 @@
 
 (channel
   (version 0)
-  (directory "build-aux/guix"))
+  (directory ".guix/modules"))
diff --git a/build-aux/manifest.scm b/.guix/manifest.scm
similarity index 100%
rename from build-aux/manifest.scm
rename to .guix/manifest.scm
diff --git a/build-aux/guix/guile-package.scm b/.guix/modules/guile-package.scm
similarity index 100%
rename from build-aux/guix/guile-package.scm
rename to .guix/modules/guile-package.scm
diff --git a/Makefile.am b/Makefile.am
index 61b76a544..5a71258b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,8 +83,8 @@ EXTRA_DIST = LICENSE HACKING GUILE-VERSION			\
 	     libguile/texi-fragments-to-docstrings		\
 	     gdbinit						\
 	     guix.scm						\
-	     build-aux/guix/guile-package.scm			\
-	     build-aux/manifest.scm
+	     .guix/modules/guile-package.scm			\
+	     .guix/manifest.scm
 
 TESTS = check-guile
 TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
diff --git a/guix.scm b/guix.scm
index 716f374c1..ce8427b3d 120000
--- a/guix.scm
+++ b/guix.scm
@@ -1 +1 @@
-build-aux/guix/guile-package.scm
\ No newline at end of file
+.guix/modules/guile-package.scm
\ No newline at end of file