diff --git a/srcpkgs/papyon/template b/srcpkgs/python-papyon/template
similarity index 55%
rename from srcpkgs/papyon/template
rename to srcpkgs/python-papyon/template
index 173f6cf583b..4cf3c13293a 100644
--- a/srcpkgs/papyon/template
+++ b/srcpkgs/python-papyon/template
@@ -1,12 +1,14 @@
-# Template file for 'papyon'
-pkgname=papyon
+# Template file for 'python-papyon'
+pkgname=python-papyon
 version=0.5.6
-revision=3
+revision=4
 noarch=yes
+wrksrc="papyon-${version}"
+replaces="papyon>=0"
 build_style=python-module
-makedepends="farstream-devel gst-python-devel pygobject pyopenssl pycrypto"
-depends="gst-python farstream pygobject pyopenssl pycrypto"
-pycompile_module="papyon tests"
+makedepends="farstream-devel gst-python-devel pygobject python-openssl python-crypto"
+depends="gst-python farstream pygobject python-openssl python-crypto"
+pycompile_module="papyon"
 short_desc="MSN library purely written in Python"
 homepage="http://www.freedesktop.org/wiki/Software/papyon"
 license="GPL-2"