diff --git a/srcpkgs/gitflow/template b/srcpkgs/gitflow/template
index 1ff82a67069..cb869243d20 100644
--- a/srcpkgs/gitflow/template
+++ b/srcpkgs/gitflow/template
@@ -5,21 +5,24 @@ version=20120925
 revision=3
 _commit=15aab26490facf285acef56cb5d61025eacb3a69
 _shflags_commit=2fb06af13de884e9680f14a00c82e52a67c867f1
+create_wrksrc=yes
 hostmakedepends="perl"
 depends="git"
 short_desc="Git extensions to provide high-level repository operations"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/nvie/gitflow"
-distfiles="${homepage}/archive/${_commit}.tar.gz https://github.com/nvie/shFlags/archive/${_shflags_commit}.tar.gz"
-checksum="277ecb102afd45c3137d630de11ceac4b267a73d6a5f2ac41ccbd3d96b609ce7 a1c5782a78e106d0c6289a9412fffa376f4cd78f4f86af441eb7bf06cf664594"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/nvie/shFlags/archive/${_shflags_commit}.tar.gz"
+checksum="277ecb102afd45c3137d630de11ceac4b267a73d6a5f2ac41ccbd3d96b609ce7
+ a1c5782a78e106d0c6289a9412fffa376f4cd78f4f86af441eb7bf06cf664594"
 
 wrksrc="$pkgname-$_commit"
 
 post_extract() {
-	cd $wrksrc
-	rm -r shFlags
-	cp -r ../shFlags-$_shflags_commit $wrksrc/shFlags
+	mv gitflow-${_commit}/* .
+	rmdir shFlags
+	mv shFlags-$_shflags_commit $wrksrc/shFlags
 }
 
 do_build() {