diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 933c7fe2439..a98b2123e49 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,13 +1,13 @@
 # Template file for 'gajim'
 pkgname=gajim
 version=0.15.3
-revision=3
+revision=4
 noarch=yes
 build_style=gnu-configure
 configure_args="--enable-site-packages"
 hostmakedepends="intltool python"
-makedepends="dbus-python pygtk-devel python-openssl pysqlite"
-depends="python dbus-python pysqlite python-openssl pygtk"
+makedepends="dbus-python pygtk-devel python-openssl python-sqlite"
+depends="${makedepends/-devel/}"
 pycompile_module="gajim"
 short_desc="Full featured Jabber/XMPP client"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/hamster-applet/template b/srcpkgs/hamster-applet/template
index 11a7157a954..b4b762ee21b 100644
--- a/srcpkgs/hamster-applet/template
+++ b/srcpkgs/hamster-applet/template
@@ -1,12 +1,12 @@
 # Template file for 'hamster-applet'
 pkgname=hamster-applet
 version=2.91.2
-revision=4
+revision=5
 noarch="yes"
 build_style=waf
 hostmakedepends="pkg-config intltool gnome-doc-utils docbook2x"
-makedepends="python-devel glib-devel dbus-glib-devel gnome-control-center-devel pysqlite pyxdg"
-depends="pygtk pyxdg dbus-python python-gconf notify-python pysqlite"
+makedepends="python-devel glib-devel dbus-glib-devel gnome-control-center-devel python-sqlite pyxdg"
+depends="pygtk pyxdg dbus-python python-gconf notify-python python-sqlite"
 pycompile_module="hamster"
 short_desc="Time tracking application for individuals"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/pysqlite/template b/srcpkgs/python-sqlite/template
similarity index 66%
rename from srcpkgs/pysqlite/template
rename to srcpkgs/python-sqlite/template
index c5fc61c8dbc..bc8d4d762d9 100644
--- a/srcpkgs/pysqlite/template
+++ b/srcpkgs/python-sqlite/template
@@ -1,12 +1,14 @@
-# Template file for 'pysqlite'
-pkgname=pysqlite
+# Template file for 'python-sqlite'
+pkgname=python-sqlite
 version=2.6.3
 revision=1
+wrksrc="pysqlite-${version}"
 build_style=python-module
 hostmakedepends="python-devel"
-makedepends="sqlite-devel python-devel"
+makedepends="sqlite-devel ${hostmakedepends}"
 pycompile_module="pysqlite2"
-short_desc="DB-API 2.0 interface for SQLite databases"
+replaces="pysqlite>=0"
+short_desc="Python2 DB-API 2.0 interface for SQLite databases"
 homepage="https://code.google.com/p/pysqlite/"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"