diff --git a/srcpkgs/wicd-gtk b/srcpkgs/wicd-gtk
new file mode 120000
index 00000000000..f702365e026
--- /dev/null
+++ b/srcpkgs/wicd-gtk
@@ -0,0 +1 @@
+wicd
\ No newline at end of file
diff --git a/srcpkgs/wicd/files/wicd.service b/srcpkgs/wicd/files/wicd.service
deleted file mode 100644
index 4ae9e4317b6..00000000000
--- a/srcpkgs/wicd/files/wicd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Wicd Network Manager
-
-[Service]
-Type=dbus
-BusName=org.wicd.daemon
-ExecStart=/usr/sbin/wicd -f
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template
index 9e084705047..043c162b3ec 100644
--- a/srcpkgs/wicd/template
+++ b/srcpkgs/wicd/template
@@ -1,6 +1,7 @@
 # Template file for 'wicd'
 pkgname=wicd
 version=1.7.1
+revision=1
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 short_desc="Open source wired and wireless network manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -24,36 +25,34 @@ long_desc="
    * Tray icon showing network activity and signal strength
    * A full-featured console interface"
 
+subpackages="wicd-gtk"
 noarch=yes
+pycompile_module="wicd"
+pycompile_dirs="usr/lib/wicd usr/share/wicd"
+
 conf_files="
 /etc/dbus-1/system.d/wicd.conf
 /etc/wicd/encryption/templates/active"
-systemd_services="wicd.service on"
-gtk_iconcache_dirs="/usr/share/icons/hicolor"
-pycompile_module="wicd"
 
-Add_dependency full dbus-python
-Add_dependency full pygtk
+systemd_services="wicd.service on"
+
 Add_dependency full dhcpcd
 Add_dependency full wpa_supplicant
 Add_dependency full wireless_tools
 Add_dependency full ethtool
+Add_dependency full dbus-python
+Add_dependency full pygobject2
 Add_dependency full python-urwid	">=0.9.9"
-Add_dependency full notify-python
-
-Add_dependency run shared-mime-info
-Add_dependency run hicolor-icon-theme
-Add_dependency run desktop-file-utils
 
 do_install() {
-	python setup.py configure --no-install-init \
+	python setup.py configure \
 		--resume=/usr/share/wicd/scripts \
 		--suspend=/usr/share/wicd/scripts
 	python setup.py install --root=${DESTDIR}
 
-	vinstall ${FILESDIR}/wicd.service 644 lib/systemd/system
 	vinstall ${FILESDIR}/wicd.desktop 644 usr/share/applications
 	vmkdir usr/lib/wicd
 	vcopy "build/lib/wicd/*.py" usr/lib/wicd
 	chmod 755 ${DESTDIR}/usr/lib/wicd/*.py
+	rm -rf ${DESTDIR}/usr/share/doc
 }
diff --git a/srcpkgs/wicd/wicd-gtk.template b/srcpkgs/wicd/wicd-gtk.template
new file mode 100644
index 00000000000..ff9b3054c70
--- /dev/null
+++ b/srcpkgs/wicd/wicd-gtk.template
@@ -0,0 +1,29 @@
+# Template file for 'wicd-gtk'.
+#
+short_desc="${short_desc} - GTK UI"
+long_desc="${long_desc}
+
+ This package contains the WICD GTK+ UI."
+
+noarch=yes
+gtk_iconcache_dirs="/usr/share/icons/hicolor"
+pycompile_dirs="usr/share/wicd/gtk"
+
+Add_dependency run wicd ">=${version}"
+Add_dependency run pygtk
+Add_dependency run notify-python
+Add_dependency run shared-mime-info
+Add_dependency run desktop-file-utils
+Add_dependency run hicolor-icon-theme
+
+do_install() {
+	vmove etc/xdg etc
+	vmove usr/bin/wicd-client usr/bin
+	vmove usr/bin/wicd-gtk usr/bin
+	vmove usr/share/applications usr/share
+	vmove usr/share/pixmaps usr/share
+	vmove usr/share/icons usr/share
+	vmove usr/share/wicd/gtk usr/share/wicd
+	vmove usr/share/man/man1/wicd-client.1 usr/share/man/man1
+	vmove usr/share/man/nl/man1/wicd-client.1 usr/share/man/nl/man1
+}