diff -Naur gzip-1.3.5.orig/Makefile.am gzip-1.3.5/Makefile.am
--- gzip-1.3.5.orig/Makefile.am	2002-09-29 18:18:50.000000000 +0000
+++ gzip-1.3.5/Makefile.am	2005-01-30 18:26:39.137520920 +0000
@@ -47,6 +47,8 @@
   bits.c crypt.c deflate.c getopt.c getopt1.c gzip.c inflate.c lzw.c \
   trees.c unlzh.c unlzw.c unpack.c unzip.c util.c yesno.c zip.c
 gzip_LDADD = @LIBOBJS@
+gzip_CFLAGS = @FPIECFLAGS@ @SSPCFLAGS@
+gzip_LDFLAGS = @PIELDFLAGS@ @RELROLDFLAGS@ @NOWLDFLAGS@
 
 AM_MAKEINFOFLAGS = --no-split
 
diff -Naur gzip-1.3.5.orig/configure.in gzip-1.3.5/configure.in
--- gzip-1.3.5.orig/configure.in	2002-09-30 09:28:09.000000000 +0000
+++ gzip-1.3.5/configure.in	2005-01-30 18:27:20.205994466 +0000
@@ -28,6 +28,11 @@
 AC_PROG_CPP
 AC_PROG_LN_S
 AC_PROG_SHELL
+_AC_PROG_CC_FPIE
+_AC_PROG_CC_FPIC
+_AC_PROG_CC_SSP
+_AC_PROG_CC_RELRO
+_AC_PROG_CC_NOW
 AC_AIX
 AC_GNU_SOURCE
 AC_MINIX
@@ -47,30 +52,6 @@
 fi
 AC_OBJEXT
 
-# Try to assemble match.S.
-# "gcc -E match.s" ignores -E, so we must use match.S.
-AC_CACHE_CHECK([for assembler], [gzip_cv_assembler],
-  [gzip_cv_assembler=no
-   case " $DEFS " in
-   *' NO_ASM '*) ;;
-   *)
-     if cp $srcdir/match.c _match.S &&
-        eval "$ASCPP _match.S > _match.s 2>/dev/null"; then
-       if test ! -s _match.s || grep error < _match.s > /dev/null; then
-	 :
-       elif eval "$CC -c _match.s >/dev/null 2>&1" &&
-	    test -f _match.$OBJEXT; then
-	 gzip_cv_assembler=yes
-       fi
-     fi
-     rm -f _match.S _match.s _match.$OBJEXT;;
-   esac])
-if test $gzip_cv_assembler = yes; then
-  AC_DEFINE(ASMV, ,
-    [Define if an assembler version of longest_match is available.])
-  AC_LIBOBJ(match)
-fi
-
 AC_ISC_POSIX
 AC_C_CONST
 AC_HEADER_STDC