diff --git a/Makefile.am b/Makefile.am
index 7365c8b36740e6c9aa9a50f869d4836741f73fad..6c5ca1fc733f46544ffe3abaec85ac6265235cd0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,13 @@ ganeti:
 pre-check: ganeti
 	$(MAKE) -C lib $@
 
+# a dist hook rule for catching revision control directories
+distcheck-hook:
+	if find $(top_distdir) | grep -F -e '.svn' -e '.git'; then \
+		echo "Found revision control files in final archive" 1>&2 ; \
+		exit 1; \
+	fi
+
 # custom rules
 depgraph: depgraph.png
 
diff --git a/NEWS b/NEWS
index f11cfe9f0b36d9c4f0ee1034fd1ce3baccd943de..5b95bb4f25b90a62f28ffb94b7a40a9a5a91e705 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 Version 1.2.1
-  - experimental HWM support, read the install document, section
+  - experimental HVM support, read the install document, section
     "Initializing the cluster"
   - allow for the PVM hypervisor per-instance kernel and initrd paths
   - add a new command β€˜gnt-cluster verify-disks’ which uses a new
diff --git a/test/Makefile.am b/test/Makefile.am
index 7f91966260339fed05b1277ab5cf6eefa6a32a79..d2af6b35a870591c9166ffba958499912ce0feee 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -11,5 +11,5 @@ check-am: do-pre-check
 do-pre-check:
 	$(MAKE) -C $(top_builddir) pre-check
 
-EXTRA_DIST = $(TESTS) mocks.py data
+EXTRA_DIST = $(TESTS) mocks.py $(wildcard data/*.txt)
 CLEANFILES = *.py[co]