diff --git a/Makefile.am b/Makefile.am
index 8c3df8f396..7e4b2b9406 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -462,8 +462,8 @@ check-system: $(GOBJECTS)
 
 # Public key used to sign substitutes from hydra.gnu.org & co.
 dist_pkgdata_DATA =				\
-  hydra.gnu.org.pub				\
-  berlin.guixsd.org.pub
+  etc/substitutes/hydra.gnu.org.pub		\
+  etc/substitutes/berlin.guixsd.org.pub
 
 # Bash completion file.
 dist_bashcompletion_DATA = etc/completion/bash/guix	\
diff --git a/berlin.guixsd.org.pub b/etc/substitutes/berlin.guixsd.org.pub
similarity index 100%
rename from berlin.guixsd.org.pub
rename to etc/substitutes/berlin.guixsd.org.pub
diff --git a/hydra.gnu.org.pub b/etc/substitutes/hydra.gnu.org.pub
similarity index 100%
rename from hydra.gnu.org.pub
rename to etc/substitutes/hydra.gnu.org.pub