diff --git a/autogen.rc b/autogen.rc
index 832d6c4da..8cb7eedcb 100644
--- a/autogen.rc
+++ b/autogen.rc
@@ -8,7 +8,7 @@ case "$myhost:$myhostsub" in
     extraoptions="$extraoptions --disable-zip --enable-gpg2-is-gpg"
     ;;
   w32:)
-    extraoptions="--enable-gpgtar"
+    extraoptions="--enable-gpgtar --enable-gpg2-is-gpg"
     ;;
 esac
 
diff --git a/g10/Makefile.am b/g10/Makefile.am
index cd1d15701..18a1b69b8 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -33,7 +33,7 @@ AM_CFLAGS = $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) \
 needed_libs = ../kbx/libkeybox.a $(libcommon)
 
 # Because there are no program specific transform macros we need to
-# work around that to allow installaing gpg as gpg2.
+# work around that to allow installing gpg as gpg2.
 gpg2_hack_list = gpg gpgv
 if USE_GPG2_HACK
 gpg2_hack_uninst = gpg2 gpgv2