diff --git a/Makefile.am b/Makefile.am
index 56423ad9b..8db95bd2f 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,22 @@
 ACLOCAL_AMFLAGS = -I config
 
 SUBDIRS = src doc
+
 DIST_SUBDIRS = src doc
+
+EXTRA_DIST = \
+	builds/android/Android.mk \
+	builds/android/Application.mk \
+	builds/android/build.sh \
+	builds/android/clean.sh \
+	builds/mingw32/Makefile.mingw32 \
+	builds/mingw32/platform.h \
+	builds/msvc/czmq11.sln \
+	builds/msvc/czmq_selftest.vcproj \
+	builds/msvc/czmq_selftest.vcxproj \
+	builds/msvc/czmq_selftest.vcxproj.filters \
+	builds/msvc/czmq.sln \
+	builds/msvc/czmq.vcproj \
+	builds/msvc/czmq.vcxproj \
+	builds/msvc/czmq.vcxproj.filters \
+	builds/msvc/README.txt
diff --git a/builds/msvc/Makefile.am b/builds/msvc/Makefile.am
deleted file mode 100644
index fa97dd14d..000000000
--- a/builds/msvc/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = czmq_selftest.vcproj czmq.sln czmq.vcproj README.txt
diff --git a/configure.ac b/configure.ac
index 9e5383e33..3a2425104 100755
--- a/configure.ac
+++ b/configure.ac
@@ -226,5 +226,5 @@ AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(perror gettimeofday memset getifaddrs freeifaddrs)
 
 # Specify output files
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile builds/msvc/Makefile src/libczmq.pc])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile src/libczmq.pc])
 AC_OUTPUT
diff --git a/doc/zhash.txt b/doc/zhash.txt
index 480a9c114..461529c27 100644
--- a/doc/zhash.txt
+++ b/doc/zhash.txt
@@ -163,6 +163,10 @@ EXAMPLE
     assert (streq (item, "dead beef"));
     zhash_destroy (&copy);
 
+    // Test foreach
+    assert (0 == zhash_foreach (hash, test_foreach, hash));
+    assert (-1 == zhash_foreach (hash, test_foreach_error, hash));
+
     //  Test save and load
     zhash_save (hash, ".cache");
     copy = zhash_new ();