diff --git a/archivers/unzoo/Makefile b/archivers/unzoo/Makefile
index 347b408910d5..13781aae7d93 100644
--- a/archivers/unzoo/Makefile
+++ b/archivers/unzoo/Makefile
@@ -6,21 +6,25 @@
 #
 
 PORTNAME=	unzoo
-DISTVERSION=	4.4
+PORTVERSION=	4.4
+PORTREVISION=	1
 CATEGORIES=	archivers
-MASTER_SITES=	http://critical.ch/distfiles/ \
-		http://energy.critical.ch/distfiles/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ehaupt
+MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
+
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	unzoo_4.4-4.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A zoo archive extractor
 
+USE_GCC=	3.2+
+
 EXTRA_DEFINES=	-DSYS_IS_UNIX -DSYS_HAS_MKDIR
 
-PLIST_FILES=	bin/unzoo
-
 MAN1=		unzoo.1
+PLIST_FILES=	bin/unzoo
 
 .include <bsd.port.pre.mk>
 
@@ -28,12 +32,16 @@ MAN1=		unzoo.1
 CFLAGS+=	-trigraphs
 .endif
 
+post-extract:
+	@${MKDIR} ${WRKSRC}
+	@${MV} ${WRKDIR}/${PORTNAME}.c ${WRKSRC}
+
 do-build:
 	${CC} ${CFLAGS} ${EXTRA_DEFINES} -o ${WRKSRC}/${PORTNAME} \
 		${WRKSRC}/${PORTNAME}.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/archivers/unzoo/distinfo b/archivers/unzoo/distinfo
index 004f51891ee0..a0c9bc6a4309 100644
--- a/archivers/unzoo/distinfo
+++ b/archivers/unzoo/distinfo
@@ -1,3 +1,6 @@
-MD5 (unzoo-4.4.tar.gz) = 2e73c26188688033b7c2b6c7da32ad39
-SHA256 (unzoo-4.4.tar.gz) = ddbaf41e7edd833eed987892caeb6ac39f47b9dd8abb660f906933fd91fbbf55
-SIZE (unzoo-4.4.tar.gz) = 26842
+MD5 (unzoo_4.4.orig.tar.gz) = 9d5f3c31adfca8ff61f8a9f8e664f12e
+SHA256 (unzoo_4.4.orig.tar.gz) = 977bb2147a52370d3fce87947f66ea18eb927654d732f685d977a1f68ac35ef6
+SIZE (unzoo_4.4.orig.tar.gz) = 25737
+MD5 (unzoo_4.4-4.diff.gz) = 26d4d23890f0a78b4be446bb464a4157
+SHA256 (unzoo_4.4-4.diff.gz) = 67b8e05465448cfad88c20dfebc4cce9b3fc62326231a83f3e3fb41ab746d283
+SIZE (unzoo_4.4-4.diff.gz) = 8567