diff --git a/Makefile.am b/Makefile.am
index 41e0e67120..ed11bcc7ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -253,6 +253,7 @@ guix_install_go_files = install-nobase_nodist_guilemoduleDATA
 $(guix_install_go_files): install-nobase_dist_guilemoduleDATA
 
 SUBDIRS = po/guix po/packages
+BUILT_SOURCES =
 
 include doc.am
 
diff --git a/daemon.am b/daemon.am
index b0a6d48873..fb662b1b14 100644
--- a/daemon.am
+++ b/daemon.am
@@ -20,7 +20,7 @@
 # Integration of the `guix-daemon' code taken from upstream Nix.
 #
 
-BUILT_SOURCES = nix/libstore/schema.sql.hh
+BUILT_SOURCES += nix/libstore/schema.sql.hh
 CLEANFILES += $(BUILT_SOURCES)
 
 noinst_LIBRARIES = libformat.a libutil.a libstore.a
diff --git a/doc.am b/doc.am
index 6cbc35a8cc..67cd739fae 100644
--- a/doc.am
+++ b/doc.am
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 # Copyright © 2013 Andreas Enge <andreas@enge.fr>
 #
 # This file is part of GNU Guix.
@@ -24,6 +24,15 @@ EXTRA_DIST +=					\
   doc/images/bootstrap-graph.eps		\
   doc/images/bootstrap-graph.pdf
 
+# Bundle this file so that makeinfo finds it in out-of-source-tree builds.
+BUILT_SOURCES        += doc/os-config.texi
+EXTRA_DIST           += doc/os-config.texi
+MAINTAINERCLEANFILES  = doc/os-config.texi
+
+doc/os-config.texi: gnu/system/os-config.tmpl
+	$(MKDIR_P) "`dirname "$@"`"
+	cp "$<" "$@"
+
 infoimagedir = $(infodir)/images
 dist_infoimage_DATA = doc/images/bootstrap-graph.png
 
diff --git a/doc/guix.texi b/doc/guix.texi
index 6b9e87018f..2060da9c55 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2856,7 +2856,7 @@ only a root account would look like this (on the installation system,
 this example is available as @file{/etc/configuration-template.scm}):
 
 @example
-@include gnu/system/os-config.tmpl
+@include os-config.texi
 @end example
 
 @noindent