diff --git a/srcpkgs/netpbm/patches/netpbm-CAN-2005-2471.patch b/srcpkgs/netpbm/files/netpbm-CAN-2005-2471.patch
similarity index 100%
rename from srcpkgs/netpbm/patches/netpbm-CAN-2005-2471.patch
rename to srcpkgs/netpbm/files/netpbm-CAN-2005-2471.patch
diff --git a/srcpkgs/netpbm/patches/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch
similarity index 100%
rename from srcpkgs/netpbm/patches/netpbm-security-code.patch
rename to srcpkgs/netpbm/files/netpbm-security-code.patch
diff --git a/srcpkgs/netpbm/patches/netpbm-security-scripts.patch b/srcpkgs/netpbm/files/netpbm-security-scripts.patch
similarity index 100%
rename from srcpkgs/netpbm/patches/netpbm-security-scripts.patch
rename to srcpkgs/netpbm/files/netpbm-security-scripts.patch
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 72a404a74b9..ce2882aefbe 100644
--- a/srcpkgs/netpbm/template
+++ b/srcpkgs/netpbm/template
@@ -1,20 +1,29 @@
 # Template file for 'netpbm'
 pkgname=netpbm
 # from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
-version=10.70.05
+version=10.70.06
 revision=1
-patch_args="-Np1"
-hostmakedepends="pkg-config perl python flex subversion"
+_githash=921c08b68f785180a918591ea0699de6275d202d
+_githash_guide=dd67b8beae254b3a55e58124560a9233103bb45b
+create_wrksrc=yes
+build_wrksrc="netpbm-mirror-${_githash}"
+hostmakedepends="pkg-config perl python flex"
 makedepends="libjpeg-turbo-devel tiff-devel libpng-devel zlib-devel libxml2-devel libX11-devel"
 short_desc="Toolkit for manipulation of graphic images"
 maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="BSD,GPL-2,custom"
 homepage="http://netpbm.sourceforge.net/"
 nocross=yes
+distfiles="https://github.com/chneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
+ https://github.com/chneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
+checksum="8d3a3b3795fe053ccd1d79ac85578a31a2bd09256608ff1076167d5b16419d9b
+ 05f36a02a7ed34e02492dcefa37728b122e6d5a64877abb0f35877695de69a5c"
 
-do_fetch() {
-	svn co http://svn.code.sf.net/p/netpbm/code/advanced ${wrksrc}
-	svn co http://svn.code.sf.net/p/netpbm/code/userguide ${wrksrc}/userguide
+post_extract() {
+	cd $build_wrksrc
+	for p in ${FILESDIR}/*.patch; do
+		patch -Np1 -i $p
+	done
 }
 
 do_configure() {
@@ -29,14 +38,16 @@ do_configure() {
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS" ${makejobs}
 	make MAKEMAN="${PWD}/buildtools/makeman" USERGUIDE=. \
-		-C userguide -f "${PWD}/buildtools/manpage.mk" manpages
+		-C ../netpbm-mirror-${_githash_guide} \
+		-f "${PWD}/buildtools/manpage.mk" manpages
 }
 
 do_install() {
 	make pkgdir=$DESTDIR/usr PKGMANDIR=share/man install-run install-dev
 	rm $DESTDIR/usr/share/man/man?/*
 	make MAKEMAN="${PWD}/buildtools/makeman" MANDIR="$DESTDIR/usr/share/man" \
-		-C userguide -f "${PWD}/buildtools/manpage.mk" installman
+		-C ../netpbm-mirror-${_githash_guide} \
+		-f "${PWD}/buildtools/manpage.mk" installman
 	vlicense doc/copyright_summary LICENSE
 }