diff --git a/srcpkgs/python-gnupg/template b/srcpkgs/python-gnupg/template
deleted file mode 100644
index b5dd94bf8e1..00000000000
--- a/srcpkgs/python-gnupg/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-gnupg'
-pkgname=python-gnupg
-version=0.4.6
-revision=1
-archs=noarch
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python gnupg"
-short_desc="Python2 wrapper for GnuPG"
-maintainer="Lon Willett <xgit@lonw.net>"
-license="BSD-3-Clause"
-homepage="https://bitbucket.org/vinay.sajip/python-gnupg"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3aa0884b3bd414652c2385b9df39e7b87272c2eca1b8fcc3089bc9e58652019a
-
-post_install() {
-	vlicense LICENSE.txt
-}
-
-python3-gnupg_package() {
-	depends="python3 gnupg"
-	short_desc="${short_desc/Python2/Python3}"
-	archs=noarch
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE.txt
-	}
-}
diff --git a/srcpkgs/python3-gnupg b/srcpkgs/python3-gnupg
deleted file mode 120000
index 03e85363c37..00000000000
--- a/srcpkgs/python3-gnupg
+++ /dev/null
@@ -1 +0,0 @@
-python-gnupg
\ No newline at end of file
diff --git a/srcpkgs/python3-gnupg/template b/srcpkgs/python3-gnupg/template
new file mode 100644
index 00000000000..fcd1fffc9f8
--- /dev/null
+++ b/srcpkgs/python3-gnupg/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-gnupg'
+pkgname=python3-gnupg
+_pkgname=python-gnupg
+version=0.4.6
+revision=2
+wrksrc=$_pkgname-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 gnupg"
+short_desc="Python3 wrapper for GnuPG"
+maintainer="Lon Willett <xgit@lonw.net>"
+license="BSD-3-Clause"
+homepage="https://bitbucket.org/vinay.sajip/python-gnupg"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=3aa0884b3bd414652c2385b9df39e7b87272c2eca1b8fcc3089bc9e58652019a
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python-gnupg/update b/srcpkgs/python3-gnupg/update
similarity index 100%
rename from srcpkgs/python-gnupg/update
rename to srcpkgs/python3-gnupg/update
diff --git a/srcpkgs/python3-httplib2/template b/srcpkgs/python3-httplib2/template
index de7bdb42255..eefec628859 100644
--- a/srcpkgs/python3-httplib2/template
+++ b/srcpkgs/python3-httplib2/template
@@ -19,10 +19,8 @@ checksum="34537dcdd5e0f2386d29e0e2c6d4a1703a3b982d34c198a5102e6e5d6194b107
 
 post_install() {
 	# use system ca certificates
-	for py_sitelib in $py2_sitelib $py3_sitelib; do
-		rm -rf ${DESTDIR}/${py_sitelib}/httplib2/cacerts.txt
-		ln -sf /etc/ssl/cert.pem ${DESTDIR}/${py_sitelib}/httplib2/cacerts.txt
-	done
+	rm -rf ${DESTDIR}/${py3_sitelib}/httplib2/cacerts.txt
+	ln -sf /etc/ssl/cert.pem ${DESTDIR}/${py3_sitelib}/httplib2/cacerts.txt
 
 	vlicense ../LICENSE.txt
 }