diff --git a/PKGBUILD b/PKGBUILD
index 9564d138..1a7ab63f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 
-pkgname=(wmii-hg pyxp-hg pygmi-hg)
+pkgname=(wmii-hg python-pyxp-hg python-pygmi-hg)
 pkgver=2746
 pkgrel=1
 pkgdesc="The latest hg pull of wmii, a lightweight, dynamic window manager for X11"
@@ -39,15 +39,15 @@ package_wmii-hg() {
     install -m644 -D ./LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_pyxp-hg() {
+package_python-pyxp-hg() {
     arch=(any)
     depends=(python)
     _make -C alternative_wmiircs/python pyclean pyxp.install
 }
 
-package_pygmi-hg() {
+package_python-pygmi-hg() {
     arch=(any)
-    depends=(pyxp-hg)
+    depends=(python-pyxp-hg)
     _make -C alternative_wmiircs/python pyclean pygmi.install
 }
 
diff --git a/alternative_wmiircs/python/pygmi/Makefile b/alternative_wmiircs/python/pygmi/Makefile
deleted file mode 100644
index b8ad7fb9..00000000
--- a/alternative_wmiircs/python/pygmi/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-ROOT=../../..
-include $(ROOT)/mk/hdr.mk
-include $(ROOT)/mk/wmii.mk
-
-BINARY = __init__.py \
-	 event.py    \
-	 fs.py       \
-	 menu.py     \
-	 monitor.py  \
-	 util.py
-
-DIR    = $(GLOBALCONF)/python/pygmi
diff --git a/alternative_wmiircs/python/pyxp/Makefile b/alternative_wmiircs/python/pyxp/Makefile
deleted file mode 100644
index 6a860939..00000000
--- a/alternative_wmiircs/python/pyxp/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-ROOT=../../..
-include $(ROOT)/mk/hdr.mk
-include $(ROOT)/mk/wmii.mk
-
-BINARY = __init__.py    \
-	 asyncclient.py \
-	 client.py      \
-	 dial.py        \
-	 fcall.py       \
-	 fields.py      \
-	 messages.py    \
-	 mux.py         \
-	 types.py
-
-DIR    = $(GLOBALCONF)/python/pyxp