diff --git a/Makefile.am b/Makefile.am
index 0f2075089..1cd009811 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,8 @@
 
 ## Process this file with automake to produce Makefile.in
 
-# To include the wixlibs for building an MSI installer in a release use
-#   make release WITH_MSI=1
+# We want to also build the wixlib for use by GnuPG Desktop
+WITH_MSI=1
 
 # Location of the released tarball archives.  This is prefixed by
 # the variable RELEASE_ARCHIVE in ~/.gnupg-autogen.rc.  For example:
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index db78afa50..170c20b79 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -1543,10 +1543,8 @@ sign-installer:
 	 if [ -f "$${msifile}" ]; then \
 	   $(call MKSWDB_commands,$${msifile},$${reldate},"wixlib_"); \
 	 fi; \
-	 echo "speedo: /*" ;\
-	 echo "speedo:  * Verification result" ;\
-	 echo "speedo:  */" ;\
-         osslsigncode verify $${exefile} \
+	 echo "speedo: /* (osslsigncode verify disabled) */" ;\
+	 echo osslsigncode verify $${exefile} \
 	)