diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index dcdc37d4787b..137affa64b28 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	zip
 PORTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	SF/info${PORTNAME}/Zip%203.x%20%28latest%29/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
-MAINTAINER=	ler@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create/update ZIP files compatible with PKZIP
 WWW=		https://infozip.sourceforge.net/Zip.html
 
 # License is BSD-based, but not identical, so install with documentation
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe
 
 CPE_VENDOR=	info-zip_project
 
 OPTIONS_DEFINE=	DOCS
 
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 MAKEFILE=	unix/Makefile
 ALL_TARGET=	generic
 
 PLIST_FILES=	bin/zip bin/zipcloak bin/zipnote bin/zipsplit \
 		share/man/man1/zip.1.gz share/man/man1/zipcloak.1.gz \
 		share/man/man1/zipnote.1.gz share/man/man1/zipsplit.1.gz
 PORTDOCS=	*
 
 do-install:
 .for p in ${PLIST_FILES:Mbin*:T}
 	${INSTALL_PROGRAM} ${WRKSRC}/${p} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/${p}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README* TODO WHATSNEW WHERE ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/archivers/zip/files/patch-unix_configure b/archivers/zip/files/patch-unix_configure
index 3e421f3ffba6..bcd7e875e2c6 100644
--- a/archivers/zip/files/patch-unix_configure
+++ b/archivers/zip/files/patch-unix_configure
@@ -1,35 +1,75 @@
 --- unix/configure.orig	2008-06-20 03:32:20 UTC
 +++ unix/configure
 @@ -98,7 +98,6 @@ int main()
  _EOF_
        $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
        if test $? -eq 0; then
 -        CFLAGS_OPT='-O3'
          echo "  GNU C ($CFLAGS_OPT)"
          # Special Mac OS X shared library "ld" option?
          if test ` uname -s 2> /dev/null ` = 'Darwin'; then
 @@ -110,7 +109,6 @@ _EOF_
            rm -f conftest
          fi
        else
 -        CFLAGS_OPT='-O'
          echo "  Other-unknown C ($CFLAGS_OPT)"
        fi
      fi
 @@ -224,7 +222,6 @@ CPP="${CC} -E"
  [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
  [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
  [ -f /lib/cpp ] && CPP=/lib/cpp
 -[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
  [ -f /xenix ] && CPP="${CC} -E"
  [ -f /lynx.os ] && CPP="${CC} -E"
  
-@@ -244,7 +241,7 @@ if eval "$CPP match.S > _match.s 2>/dev/
+@@ -244,7 +241,7 @@ if eval "$CPP match.S > _match.s 2>/dev/null"; then
      echo "int foo() { return 0;}" > conftest.c
      $CC -c conftest.c >/dev/null 2>/dev/null
      echo Check if compiler generates underlines
 -    nm conftest.o | grep "(^|[^_])foo" >/dev/null 2>/dev/null
 +    nm conftest.o | egrep "(^|[^_])foo" >/dev/null 2>/dev/null
      [ $? -eq 0 ] && CPP="${CPP} -DNO_UNDERLINE"
      if eval "$CPP crc_i386.S > _crc_i386.s 2>/dev/null"; then
        if eval "$CC -c _crc_i386.s >/dev/null 2>/dev/null" && [ -f _crc_i386.o ]
+@@ -519,7 +516,10 @@ done
+ 
+ 
+ echo Check for memset
+-echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c
++cat > conftest.c << _EOF_
++#include <string.h>
++int main(){ char k; memset(&k,0,0); return 0; }
++_EOF_
+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
+ [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM"
+ 
+@@ -556,6 +556,7 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
+ 
+ echo Check for directory libraries
+ cat > conftest.c << _EOF_
++#include <dirent.h>
+ int main() { return closedir(opendir(".")); }
+ _EOF_
+ 
+@@ -578,7 +579,10 @@ fi
+ # Dynix/ptx 1.3 needed this
+ 
+ echo Check for readlink
+-echo "int main(){ return readlink(); }" > conftest.c
++cat > conftest.c << _EOF_
++#include <unistd.h>
++int main() { return readlink(); }
++_EOF_
+ $CC -o conftest conftest.c >/dev/null 2>/dev/null
+ if [ $? -ne 0 ]; then
+   $CC -o conftest conftest.c -lseq >/dev/null 2>/dev/null
+@@ -621,6 +625,7 @@ CFLAGS="${CFLAGS} ${OPT}"
+ 
+ echo Check for valloc
+ cat > conftest.c << _EOF_
++#include <unistd.h>
+ main()
+ {
+ #ifdef MMAP