diff --git a/Makefile.am b/Makefile.am
index ed11bcc7ac..6695e7e5b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -107,9 +107,13 @@ KCONFIGS =					\
   gnu/packages/linux-libre-i686.conf		\
   gnu/packages/linux-libre-x86_64.conf
 
+# Templates, examples.
+EXAMPLES =					\
+  gnu/system/os-config.tmpl
+
 GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go
 
-nobase_dist_guilemodule_DATA = $(MODULES) $(KCONFIGS)
+nobase_dist_guilemodule_DATA = $(MODULES) $(KCONFIGS) $(EXAMPLES)
 nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm
 
 # Do we need to provide our own non-broken (srfi srfi-37) module?
diff --git a/gnu-system.am b/gnu-system.am
index 1f6240fa51..7928b52592 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -269,7 +269,6 @@ GNU_SYSTEM_MODULES =				\
   gnu/system/file-systems.scm			\
   gnu/system/grub.scm				\
   gnu/system/install.scm			\
-  gnu/system/os-config.tmpl			\
   gnu/system/linux.scm				\
   gnu/system/linux-initrd.scm			\
   gnu/system/shadow.scm				\