diff --git a/srcpkgs/unzip/patches/fix_Makefile.diff b/srcpkgs/unzip/patches/fix_Makefile.diff
deleted file mode 100644
index 8d9419d684f..00000000000
--- a/srcpkgs/unzip/patches/fix_Makefile.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- unix/Makefile.orig	2009-03-21 01:54:48.460031655 +0100
-+++ unix/Makefile	2009-03-21 01:55:23.230935902 +0100
-@@ -102,9 +102,9 @@ INSTALL_PROGRAM = $(INSTALL)
- INSTALL_D = mkdir -p
- # on some systems, manext=l and MANDIR=/usr/man/man$(manext) may be appropriate
- manext = 1
--prefix = /usr/local
--BINDIR = $(prefix)/bin#			where to install executables
--MANDIR = $(prefix)/man/man$(manext)#	where to install man pages
-+DESTDIR = /usr/local
-+BINDIR = $(DESTDIR)/usr/bin#			where to install executables
-+MANDIR = $(DESTDIR)/usr/share/man/man$(manext)#	where to install man pages
- INSTALLEDBIN = $(BINDIR)/funzip$E $(BINDIR)/unzip$E $(BINDIR)/unzipsfx$E \
- 	$(BINDIR)/zipgrep$E $(BINDIR)/zipinfo$E
- INSTALLEDMAN = $(MANDIR)/funzip.$(manext) $(MANDIR)/unzip.$(manext) \
diff --git a/srcpkgs/unzip/patches/unzipsfx_no_libz.diff b/srcpkgs/unzip/patches/unzipsfx_no_libz.diff
deleted file mode 100644
index 604b13444cd..00000000000
--- a/srcpkgs/unzip/patches/unzipsfx_no_libz.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/11/03 07:53:55 rillig Exp $
-
-unzipsfx does not need libz, so a special compile rule is needed for it.
-
---- unix/Makefile.orig	Mon Oct 30 22:45:35 2006
-+++ unix/Makefile	Mon Oct 30 22:48:02 2006
-@@ -87,7 +87,7 @@
- OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $M$O
- LOBJS = $(OBJS)
- OBJSDLL = $(OBJS:.o=.pic.o) api.pic.o
--OBJX = unzipsfx$O $(CRC32)$O crctab_$O crypt_$O extract_$O fileio_$O \
-+OBJX = unzipsfx$O crc32_$O crctab_$O crypt_$O extract_$O fileio_$O \
- 	globals_$O inflate_$O match_$O process_$O ttyio_$O $M_$O
- LOBJX = $(OBJX)
- OBJF = funzip$O $(CRC32)$O cryptf$O globalsf$O inflatef$O ttyiof$O
-@@ -306,6 +306,11 @@
- 	-$(CP) unzip.c unzipsfx.c
- 	$(CC) -c $(CF) -DSFX unzipsfx.c
- 	$(RM) unzipsfx.c
-+
-+crc32_$O:	crc32.c $(UNZIP_H) zip.h			# unzipsfx only
-+	-$(CP) crc32.c crc32_.c
-+	$(CC) -c $(CF) -DSFX crc32_.c
-+	$(RM) crc32_.c
- 
- crctab_$O:	crctab.c $(UNZIP_H) zip.h
- 	-$(CP) crctab.c crctab_.c
diff --git a/srcpkgs/unzip/template b/srcpkgs/unzip/template
index 0cc530f459f..72233ee4b5d 100644
--- a/srcpkgs/unzip/template
+++ b/srcpkgs/unzip/template
@@ -1,12 +1,12 @@
 # Template file for 'unzip'
 pkgname=unzip
-version=5.52
-distfiles="ftp://ftp.fr.netbsd.org/pub/pkgsrc/distfiles/${pkgname}-${version}/${pkgname}552.tgz"
-build_style=gnu_makefile
-make_build_target="-f unix/Makefile generic_zlib unzipsfx"
+version=6.0
+wrksrc=unzip60
+distfiles="${SOURCEFORGE_SITE}/infozip/${pkgname}60.tar.gz"
+build_style=custom-install
 short_desc="List, test and extract compressed files in a ZIP archive"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9
+checksum=036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37
 long_desc="
  Unzip will list, test, or extract files from a ZIP archive, commonly
  found on MS-DOS systems.  The default behavior (with no options) is to
@@ -31,5 +31,25 @@ long_desc="
  be extracted, unzipsfx seeks itself under the name by which it was
  invoked and tests or extracts the contents of the appended archive."
 
-Add_dependency full glibc
-Add_dependency full zlib
+CFLAGS="-D_FILE_OFFSET_BITS=64 -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT"
+CFLAGS="${CFLAGS} -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE"
+CFLAGS="${CFLAGS} -DNO_LCHMOD -DDATE_FORMAT=DF_YMD -DUSE_BZIP2 -DNATIVE"
+
+Add_dependency run glibc
+Add_dependency run bzip2
+Add_dependency build bzip2-devel
+
+do_build()
+{
+	cd ${wrksrc} && make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" \
+		prefix=/usr LF2=""  D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 \
+		unzips || return 1
+}
+
+do_install()
+{
+	cd ${wrksrc} && make -f unix/Makefile prefix=${DESTDIR}/usr \
+		INSTALL_PROGRAM="install" install || return 1
+	mkdir -p ${DESTDIR}/usr/share && \
+		mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share
+}