diff --git a/Makefile.am b/Makefile.am
index 97f590cc8d..dfd3bbfdb3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = externals src scripts corepkgs doc misc tests
-EXTRA_DIST = substitute.mk nix.spec nix.spec.in
+EXTRA_DIST = substitute.mk nix.spec nix.spec.in bootstrap
 
 include ./substitute.mk
 
diff --git a/externals/Makefile.am b/externals/Makefile.am
index 7ae27dda39..8741967618 100644
--- a/externals/Makefile.am
+++ b/externals/Makefile.am
@@ -34,12 +34,12 @@ endif
 
 # CWI ATerm
 
-ATERM = aterm-2.1
+ATERM = aterm-2.2
 
 $(ATERM).tar.gz:
 	@echo "Nix requires the CWI ATerm library to build."
-	@echo "Please download version 2.1 from"
-	@echo "  http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.1.tar.gz"
+	@echo "Please download version 2.2 from"
+	@echo "  http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.2.tar.gz"
 	@echo "and place it in the externals/ directory."
 	false