diff --git a/srcpkgs/python-pam/template b/srcpkgs/python-pam/template
index d024e4f01a..1a89d71323 100644
--- a/srcpkgs/python-pam/template
+++ b/srcpkgs/python-pam/template
@@ -1,17 +1,30 @@
 # Template file for 'python-pam'
 pkgname=python-pam
-version=0.1.4
-revision=6
+version=1.8.4
+revision=2
 noarch=yes
-wrksrc="${pkgname/python-}-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-makedepends="python-devel pam-devel"
-depends="python pam"
+build_style=python-module
 pycompile_module="pam.py"
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python pam"
 short_desc="Python2 module for PAM authentication"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
-homepage="http://atlee.ca/software/pam/"
+maintainer="John <johnz@posteo.net>"
 license="MIT"
-distfiles="${PYPI_SITE}/p/pam/${pkgname/python-/}-${version}.tar.gz"
-checksum=35e88575afc37a2a5f96e20b22fa55d3e3213370d4ce640af1597c2a1dde226b
+homepage="https://github.com/FirefighterBlu3/python-pam"
+distfiles="https://github.com/FirefighterBlu3/python-pam/archive/v${version}.tar.gz"
+checksum=fa048ca74f08de1390b2576754c05327700a7ebc3d05511f0329a04ebe1aeaa3
+
+post_install() {
+	vlicense LICENSE
+}
+
+python3-pam_package() {
+	noarch=yes
+	depends="python3 pam"
+	pycompile_module="pam.py"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/lib/python3*
+		vlicense LICENSE
+	}
+}
diff --git a/srcpkgs/python3-pam b/srcpkgs/python3-pam
new file mode 120000
index 0000000000..8fd44a7dbe
--- /dev/null
+++ b/srcpkgs/python3-pam
@@ -0,0 +1 @@
+python-pam
\ No newline at end of file
diff --git a/srcpkgs/python3-pam/template b/srcpkgs/python3-pam/template
deleted file mode 100644
index 6a08e60ee5..0000000000
--- a/srcpkgs/python3-pam/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python3-pam'
-pkgname=python3-pam
-version=1.8.4
-revision=1
-wrksrc="${pkgname/3}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel pam-devel"
-depends="python3 pam"
-short_desc="Python pam module supporting py3"
-maintainer="John <johnz@posteo.net>"
-license="MIT"
-homepage="https://github.com/FirefighterBlu3/python-pam"
-distfiles="https://github.com/FirefighterBlu3/python-pam/archive/v${version}.tar.gz"
-checksum=fa048ca74f08de1390b2576754c05327700a7ebc3d05511f0329a04ebe1aeaa3
-
-post_install() {
-	vlicense LICENSE
-}