diff --git a/srcpkgs/phorward-devel b/srcpkgs/libphorward-devel
similarity index 100%
rename from srcpkgs/phorward-devel
rename to srcpkgs/libphorward-devel
diff --git a/srcpkgs/phorward-doc b/srcpkgs/phorward-doc
deleted file mode 120000
index c7c930b241..0000000000
--- a/srcpkgs/phorward-doc
+++ /dev/null
@@ -1 +0,0 @@
-phorward
\ No newline at end of file
diff --git a/srcpkgs/phorward/template b/srcpkgs/phorward/template
index d49c4bcb29..84d912fc37 100644
--- a/srcpkgs/phorward/template
+++ b/srcpkgs/phorward/template
@@ -1,39 +1,27 @@
 # Template build file for 'phorward'
 pkgname=phorward
-version=0.17
-revision=5
+version=0.21.0
+revision=1
 build_style=gnu-configure
-short_desc="Software package consisting of a powerful C functions library."
+short_desc="Software package consisting of a powerful C functions library"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
+license="BSD-3-Clause"
 homepage="http://www.phorward-software.com"
-license="BSD"
-distfiles="${homepage}/products/${pkgname}/${pkgname}-${version}-source.tar.gz"
-checksum=6e359e5398b59f4db4d6fabb641a8336563aecca8e7af2de9016c9f81c305c55
-
-wrksrc="${pkgname}-${version}-source"
-
-phorward-devel_package() {
-	depends="phorward>=${version}_${revision}
-		libphorward>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-		vmove usr/include
-	}
-}
+distfiles="https://github.com/phorward/phorward/archive/v${version}.tar.gz"
+checksum=53108dea83a58e8bc3f6d363a40e9ef219feb427edfa968301d876e5bcd09b05
 
 libphorward_package() {
-	short_desc+=" - runtime library"
+	short_desc+=" - libraries"
 	pkg_install() {
-		vmove "usr/lib/libphorward*.so.*"
+		vmove usr/lib/libphorward.so.*
 	}
 }
 
-phorward-doc_package() {
-	noarch=yes
-	short_desc+=" - documentation"
+libphorward-devel_package() {
+	short_desc+=" - development files"
 	pkg_install() {
-		vmove usr/share/man
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
 	}
 }
diff --git a/srcpkgs/phorward/update b/srcpkgs/phorward/update
deleted file mode 100644
index c0495e2e47..0000000000
--- a/srcpkgs/phorward/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://bitbucket.org/codepilot/phorward/downloads"
-pattern="get/v?\K[\d.]+(?=\.tar)"