diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 545a28f22..be5971a3c 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -73,7 +73,7 @@ help:
 	@echo 'Use WIXPREFIX to provide the WIX binaries for the MSI package.'
 	@echo '    Using WIX also requires wine with installed wine mono.'
 	@echo '    See help-wixlib for more information'
-	@echo 'Set W32VERSION=w64 to build a 64 bit Windows version.'
+	@echo 'Set W32VERSION=w32 to build a 32 bit Windows version.'
 
 help-wixlib:
 	@echo 'The buildsystem can create a wixlib to build MSI packages.'
@@ -161,8 +161,8 @@ WHAT=git
 # Set target to "native" or "w32".
 TARGETOS=
 
-# To build a 64 bit Windows version also change this to "w64"
-W32VERSION=w32
+# To build a 32 bit Windows version also change this to "w32"
+W32VERSION=w64
 
 # Set to 1 to use a pre-installed swdb.lst instead of the online version.
 CUSTOM_SWDB=0
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 8b42e821f..49a56497b 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -1349,6 +1349,7 @@ Section "-un.gnupg"
   Delete "$INSTDIR\share\doc\gnupg\examples\pwpattern.list"
   RMDir  "$INSTDIR\share\doc\gnupg\examples"
   RMDir  "$INSTDIR\share\doc\gnupg"
+  RMDir  "$INSTDIR\share\doc"
 
   Delete "$INSTDIR\share\gnupg\sks-keyservers.netCA.pem"
   Delete "$INSTDIR\share\gnupg\dirmngr-conf.skel"