diff -up gnupg-2.1.10/tools/Makefile.am.insttools gnupg-2.1.10/tools/Makefile.am
--- gnupg-2.1.10/tools/Makefile.am.insttools	2015-11-30 17:39:52.000000000 +0100
+++ gnupg-2.1.10/tools/Makefile.am	2016-01-13 15:59:24.368328089 +0100
@@ -35,8 +35,8 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER
 sbin_SCRIPTS = addgnupghome applygnupgdefaults
 
 if HAVE_USTAR
-# bin_SCRIPTS += gpg-zip
-noinst_SCRIPTS = gpg-zip
+bin_SCRIPTS += gpg-zip
+#noinst_SCRIPTS = gpg-zip
 endif
 
 if BUILD_SYMCRYPTRUN
@@ -51,13 +51,12 @@ else
   gpgtar =
 endif
 
-# Fixme: We should remove the gpgkey2ssh tool.
 bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun}
 if !HAVE_W32_SYSTEM
 bin_PROGRAMS += watchgnupg gpgparsemail
 endif
 if !HAVE_W32CE_SYSTEM
-bin_PROGRAMS += gpgkey2ssh ${gpgtar}
+bin_PROGRAMS += ${gpgtar} gpgsplit
 endif
 
 if !DISABLE_REGEX
@@ -65,7 +64,7 @@ libexec_PROGRAMS = gpg-check-pattern
 endif
 
 if !HAVE_W32CE_SYSTEM
-noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
+noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgkey2ssh 
 endif
 
 common_libs = $(libcommon)
diff -up gnupg-2.1.10/tools/Makefile.in.insttools gnupg-2.1.10/tools/Makefile.in
--- gnupg-2.1.10/tools/Makefile.in.insttools	2015-12-04 10:57:06.000000000 +0100
+++ gnupg-2.1.10/tools/Makefile.in	2016-01-13 16:02:57.079201039 +0100
@@ -139,12 +139,12 @@ DIST_COMMON = $(top_srcdir)/am/cmacros.a
 bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
 	$(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4)
 @HAVE_W32_SYSTEM_FALSE@am__append_9 = watchgnupg gpgparsemail
-@HAVE_W32CE_SYSTEM_FALSE@am__append_10 = gpgkey2ssh ${gpgtar}
+@HAVE_W32CE_SYSTEM_FALSE@am__append_10 = gpgsplit ${gpgtar}
 @DISABLE_REGEX_FALSE@libexec_PROGRAMS = gpg-check-pattern$(EXEEXT)
 @HAVE_W32CE_SYSTEM_FALSE@noinst_PROGRAMS = clean-sat$(EXEEXT) \
 @HAVE_W32CE_SYSTEM_FALSE@	mk-tdata$(EXEEXT) \
 @HAVE_W32CE_SYSTEM_FALSE@	make-dns-cert$(EXEEXT) \
-@HAVE_W32CE_SYSTEM_FALSE@	gpgsplit$(EXEEXT)
+@HAVE_W32CE_SYSTEM_FALSE@	gpgkey2ssh$(EXEEXT)
 subdir = tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -170,7 +170,7 @@ CONFIG_CLEAN_VPATH_FILES =
 @HAVE_W32_SYSTEM_FALSE@am__EXEEXT_2 = watchgnupg$(EXEEXT) \
 @HAVE_W32_SYSTEM_FALSE@	gpgparsemail$(EXEEXT)
 @BUILD_GPGTAR_TRUE@am__EXEEXT_3 = gpgtar$(EXEEXT)
-@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_4 = gpgkey2ssh$(EXEEXT) \
+@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_4 = gpgsplit$(EXEEXT) \
 @HAVE_W32CE_SYSTEM_FALSE@	$(am__EXEEXT_3)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(sbindir)"
@@ -566,7 +566,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER
 sbin_SCRIPTS = addgnupghome applygnupgdefaults
 
 # bin_SCRIPTS += gpg-zip
-@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
+@HAVE_USTAR_TRUE@bin_SCRIPTS += gpg-zip
 @BUILD_SYMCRYPTRUN_FALSE@symcryptrun = 
 @BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun
 @BUILD_GPGTAR_FALSE@gpgtar =