diff --git a/corepkgs/fetchurl/Makefile.am b/corepkgs/fetchurl/Makefile.am
index 72741ac23..0c8f0c939 100644
--- a/corepkgs/fetchurl/Makefile.am
+++ b/corepkgs/fetchurl/Makefile.am
@@ -7,4 +7,4 @@ install-exec-local:
 
 include ../../substitute.mk
 
-EXTRA_DIST = fetchurl.fix fetchurl.sh
+EXTRA_DIST = fetchurl.fix fetchurl.sh.in
diff --git a/corepkgs/nar/Makefile.am b/corepkgs/nar/Makefile.am
index f6eb27747..e369d29c5 100644
--- a/corepkgs/nar/Makefile.am
+++ b/corepkgs/nar/Makefile.am
@@ -9,4 +9,4 @@ install-exec-local:
 
 include ../../substitute.mk
 
-EXTRA_DIST = nar.fix nar.sh unnar.fix unnar.sh
+EXTRA_DIST = nar.fix nar.sh.in unnar.fix unnar.sh.in
diff --git a/src/Makefile.am b/src/Makefile.am
index a422fb8cf..e5aa15fd9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,4 +52,4 @@ install-data-local:
 	$(INSTALL) -d $(prefix)/store
 	$(bindir)/nix --init
 
-EXTRA_DIST = *.hh *.h
+EXTRA_DIST = *.hh *.h test-builder-*.sh