--- common/Makefile.am
+++ common/Makefile.am
@@ -26,7 +26,7 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) -fPIC
 
 common_sources = \
 	common-defs.h \
--- common/Makefile.in
+++ common/Makefile.in
@@ -409,7 +409,7 @@
 noinst_LIBRARIES = libcommon.a libcommonpth.a libsimple-pwquery.a libgpgrl.a
 TESTS = $(module_tests)
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) -fPIC
 common_sources = \
 	common-defs.h \
 	util.h i18n.h \
--- gl/Makefile.am
+++ gl/Makefile.am
@@ -13,6 +13,8 @@
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
+AM_CFLAGS = -fPIC
+
 noinst_LIBRARIES = libgnu.a
 
 libgnu_a_SOURCES =
--- gl/Makefile.in
+++ gl/Makefile.in
@@ -339,6 +339,7 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
+AM_CFLAGS = -fPIC
 noinst_LIBRARIES = libgnu.a
 libgnu_a_SOURCES = allocsa.h allocsa.c mkdtemp.h setenv.h \
 	printf-args.h printf-parse.h vasnprintf.h vasprintf.h xsize.h
--- jnlib/Makefile.am
+++ jnlib/Makefile.am
@@ -27,7 +27,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/intl
 
 # We need libgcrypt because libjnlib-config includes gcrypt.h
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) -fPIC
 
 noinst_LIBRARIES = libjnlib.a
 
--- jnlib/Makefile.in
+++ jnlib/Makefile.in
@@ -353,7 +353,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/intl
 
 # We need libgcrypt because libjnlib-config includes gcrypt.h
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) -fPIC
 noinst_LIBRARIES = libjnlib.a
 
 #libjnlib_a_LDFLAGS =
--- tools/Makefile.am
+++ tools/Makefile.am
@@ -27,14 +27,14 @@
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
 include $(top_srcdir)/am/cmacros.am
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS) -fPIE
 
 sbin_SCRIPTS = addgnupghome applygnupgdefaults
 
 bin_SCRIPTS = gpgsm-gencert.sh
 if HAVE_USTAR
-# bin_SCRIPTS += gpg-zip
-noinst_SCRIPTS = gpg-zip
+bin_SCRIPTS += gpg-zip
+#noinst_SCRIPTS = gpg-zip
 endif
 
 if BUILD_SYMCRYPTRUN
@@ -44,19 +44,19 @@
 endif
 
 bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} \
-	       gpgparsemail
+	       gpgparsemail gpgsplit
 if !HAVE_W32_SYSTEM
 bin_PROGRAMS += watchgnupg
 endif
 
-noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
+noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert
 
 common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a
 pwquery_libs = ../common/libsimple-pwquery.a
 
 gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
 		 $(ZLIBS) $(LIBINTL) $(LIBICONV)
-
+gpgsplit_LDFLAGS = -pie
 gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
 
 # jnlib/common sucks in gpg-error, will they, nil they (some compilers
--- tools/Makefile.in
+++ tools/Makefile.in
@@ -93,10 +93,10 @@
 @GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
 bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
 	gpgkey2ssh$(EXEEXT) $(am__EXEEXT_1) gpgparsemail$(EXEEXT) \
-	$(am__EXEEXT_2)
+	$(am__EXEEXT_2) gpgsplit$(EXEEXT)
 @HAVE_W32_SYSTEM_FALSE@am__append_7 = watchgnupg
 noinst_PROGRAMS = clean-sat$(EXEEXT) mk-tdata$(EXEEXT) \
-	make-dns-cert$(EXEEXT) gpgsplit$(EXEEXT)
+	make-dns-cert$(EXEEXT)
 subdir = tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gl/m4/alloca.m4 \
@@ -447,18 +447,18 @@
 	-I$(top_srcdir)/common -DLOCALEDIR=\"$(localedir)\" \
 	$(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(am__append_6)
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS) -fPIE
 sbin_SCRIPTS = addgnupghome applygnupgdefaults
 bin_SCRIPTS = gpgsm-gencert.sh
-# bin_SCRIPTS += gpg-zip
-@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
+@HAVE_USTAR_TRUE@bin_SCRIPTS = gpg-zip
+# noinst_SCRIPTS = gpg-zip
 @BUILD_SYMCRYPTRUN_FALSE@symcryptrun = 
 @BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun
 common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a
 pwquery_libs = ../common/libsimple-pwquery.a
 gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
 		 $(ZLIBS) $(LIBINTL) $(LIBICONV)
-
+gpgsplit_LDFLAGS = -pie
 gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
 
 # jnlib/common sucks in gpg-error, will they, nil they (some compilers