diff --git a/Makefile.am b/Makefile.am
index 14026970c..a5069319f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,18 +46,19 @@ dist-win32:
 	@# FIXME: Need to forge a file libusb.pc
 	$(am__cd) $(distdirw32)/_build \
 	&& ( test -d libltdl || ( libtoolize --ltdl && \
-		$(am__cd) libltdl && ./configure --host=i586-mingw32msvc && make ) ) \
+		$(am__cd) libltdl && ./configure --disable-static --host=i586-mingw32msvc && make ) ) \
 	&& ../../$(top_srcdir)/configure --disable-static \
 			--host=i586-mingw32msvc \
 			--prefix=`pwd`/../_inst \
 			--without-rpc-backends \
+			--without-cxx-binding \
 			PKG_CONFIG_LIBDIR=../../$(libusb_win32_bin_path)/lib/pkgconfig \
 	&& make $(AM_MAKEFLAGS) install
 	mkdir -p $(zipdir)/bin $(zipdir)/lib/msvc $(zipdir)/lib/gcc $(zipdir)/include
 	cp -a $(distdirw32)/_build/src/libhamlib.def $(zipdir)/lib/msvc/libhamlib-@ABI_VERSION@.def
 	cp -a $(distdirw32)/_inst/include/hamlib $(zipdir)/include/.
 	$(TODOS) $(zipdir)/lib/msvc/libhamlib-@ABI_VERSION@.def $(zipdir)/include/hamlib/*.h
-	@# C++ binding is useless on win32 because of its ABI
+	@# C++ binding is pointless on win32 because of its ABI
 	rm -f $(zipdir)/include/hamlib/{rig,rot}class.h
 	for f in README README.betatester LICENSE COPYING.LIB README_VB ; do \
 		cp -a $(top_srcdir)/$${f} $(zipdir)/$${f}.txt && $(TODOS) $(zipdir)/$${f}.txt ; done