diff --git a/textproc/humanzip/Makefile b/textproc/humanzip/Makefile
index 143d2b506060..4c0fa683075c 100644
--- a/textproc/humanzip/Makefile
+++ b/textproc/humanzip/Makefile
@@ -9,22 +9,27 @@ MASTER_SITES=	SAVANNAH CENKES
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compresses text to human readable output
 
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's|g++|${CXX}|;s|-O2|${CFLAGS}|' \
-		${WRKSRC}/${MAKEFILE}
+LICENSE=	GPLv2 # (or later)
 
-MAN1=	${PORTNAME}.1
-MLINKS=	${PORTNAME}.1 humanunzip.1
-PLIST_FILES=	bin/${PORTNAME} bin/humanunzip
 PORTDOCS=	CHANGELOG README TODO
+PLIST_FILES=	bin/humanunzip bin/humanzip \
+		man/man1/humanunzip.1.gz man/man1/humanzip.1.gz
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|g++|$${CXX}| ; \
+		 s|-O2|$${CFLAGS}|' ${WRKSRC}/${MAKEFILE}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/human*zip ${PREFIX}/bin/
-	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/
-.ifndef NOPORTDOCS
-	@${INSTALL} -d ${DOCSDIR}/
-	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-.endif
+.for i in humanzip humanunzip
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin)
+.endfor
+	(cd ${WRKSRC} && ${INSTALL_MAN} humanzip.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1)
+	${LN} -sf humanzip.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/humanunzip.1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+.endfor
 
 .include <bsd.port.mk>
diff --git a/textproc/humanzip/files/patch-humanunzip.cpp b/textproc/humanzip/files/patch-humanunzip.cpp
new file mode 100644
index 000000000000..687bf3b7a2a8
--- /dev/null
+++ b/textproc/humanzip/files/patch-humanunzip.cpp
@@ -0,0 +1,10 @@
+--- humanunzip.cpp.orig
++++ humanunzip.cpp
+@@ -22,6 +22,7 @@
+ #include <fstream>
+ #include <sstream>
+ #include <vector>
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include "humanzip.h"
+ 
diff --git a/textproc/humanzip/files/patch-humanzip.cpp b/textproc/humanzip/files/patch-humanzip.cpp
new file mode 100644
index 000000000000..4daf6cb4f7ad
--- /dev/null
+++ b/textproc/humanzip/files/patch-humanzip.cpp
@@ -0,0 +1,9 @@
+--- humanzip.cpp.orig
++++ humanzip.cpp
+@@ -24,6 +24,7 @@
+ #include <getopt.h>
+ #include <vector>
+ #include <iomanip>
++#include <unistd.h>
+ #include <sys/stat.h>
+ #include "humanzip.h"
diff --git a/textproc/humanzip/pkg-descr b/textproc/humanzip/pkg-descr
index e75e521e86d9..d735d29d5c65 100644
--- a/textproc/humanzip/pkg-descr
+++ b/textproc/humanzip/pkg-descr
@@ -9,5 +9,4 @@ print size of documents.  Humanzip does not explictly try to reduce the
 size of the file as measured in bytes, although this usually happens 
 incidentally.
 
-Author: Matthew Strait
 WWW: http://savannah.nongnu.org/projects/humanzip/