diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index 90ed99d0df6..d476a78ada8 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -1,11 +1,13 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
 version=0.6.21
+revision=1
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-static --with-systemdsystemunitdir=/lib/systemd/system"
 depends="ConsoleKit-x11"
 makedepends="pkg-config intltool gobject-introspection polkit-devel systemd-devel"
+subpackages="$pkgname-devel"
 short_desc="D-Bus interfaces for querying and manipulating user account information"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cgit.freedesktop.org/accountsservice/"
@@ -16,11 +18,6 @@ long_desc="
  querying and manipulating user account information and an implementation
  of these interfaces, based on the useradd, usermod and userdel commands."
 
-systemd_services="accounts-daemon.service on"
-subpackages="$pkgname-devel"
-
-
-
 post_install() {
 	for d in users icons; do
 		vmkdir var/lib/AccountsService/${d}
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 4c66713ee48..0bf01044176 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -1,6 +1,7 @@
 # Template file for 'avahi'
 pkgname=avahi
 version=0.6.31
+revision=3
 homepage="http://www.avahi.org"
 distfiles="$homepage/download/avahi-$version.tar.gz"
 build_style=gnu-configure
@@ -10,7 +11,6 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
 --with-avahi-priv-access-group=netdev --with-autoipd-user=avahi
 --with-autoipd-group=avahi --with-distro=none --disable-xmltoman
 --disable-dbm --with-systemdsystemunitdir=/lib/systemd/system"
-revision=2
 depends="dbus"
 makedepends="pkg-config intltool libssp-devel dbus-devel libcap-devel libdaemon-devel gdbm-devel expat-devel pygtk-devel dbus-python gtk+3-devel gobject-introspection"
 short_desc="Multicast DNS Service Discovery"
@@ -26,7 +26,7 @@ long_desc="
 
 # Create avahi and netdev system accounts.
 system_accounts="avahi netdev"
-systemd_services="avahi-daemon.service on avahi-dnsconfd.service on"
+systemd_services="avahi-daemon.service on"
 conf_files="
 /etc/avahi/services/ssh.service
 /etc/avahi/services/sftp-ssh.service
@@ -42,5 +42,3 @@ subpackages="$subpackages $pkgname-ui-libs-gtk3"
 subpackages="$subpackages $pkgname-ui-libs-devel $pkgname-utils"
 subpackages="$subpackages $pkgname-ui-utils $pkgname-python-utils"
 subpackages="$subpackages $pkgname-python"
-
-
diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index f33b62e9812..3816650689b 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,7 +1,7 @@
 # Template file for 'bluez'
 pkgname=bluez
 version=4.99
-revision=5
+revision=6
 distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--libexecdir=/lib --enable-gstreamer --enable-dund
@@ -21,7 +21,6 @@ long_desc="
  BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
  project distributed under GNU General Public License (GPL)."
 
-systemd_services="bluetooth.service on"
 make_dirs="/var/lib/bluetooth 0755 root root"
 conf_files="
 /etc/bluetooth/main.conf
diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template
index 7bc07775183..c210bcf5a67 100644
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@@ -1,7 +1,7 @@
 # Template file for 'colord'
 pkgname=colord
 version=0.1.19
-revision=2
+revision=3
 homepage="http://www.freedesktop.org/software/colord"
 distfiles="$homepage/releases/$pkgname-$version.tar.xz"
 build_style=gnu-configure
@@ -10,6 +10,8 @@ configure_args="--disable-static --disable-schemas-compile
 depends="dbus sane"
 makedepends="pkg-config intltool gobject-introspection docbook2x sqlite-devel vala-devel libgudev-devel polkit-devel lcms2-devel libusb-devel dbus-devel libgusb-devel sane-devel"
 fulldepends="shared-color-profiles"
+conf_files="/etc/colord.conf"
+subpackages="$pkgname-devel"
 short_desc="Color daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ae102b93f1ebd9dc0a9f6787670860fdd12e45e955d268a6ae088b9146e24214
@@ -27,9 +29,3 @@ long_desc="
  colord itself is a system activated daemon called colord. Being system
  activated means that it's only started when the user is using a text mode
  or graphical tool."
-
-conf_files="/etc/colord.conf"
-subpackages="$pkgname-devel"
-systemd_services="colord.service on"
-
-
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index c83ed473609..0d292afdc8f 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,6 +1,7 @@
 # Template file for 'dbus'
 pkgname=dbus
 version=1.4.20
+revision=1
 homepage="http://dbus.freedesktop.org/"
 distfiles="${homepage}/releases/dbus/$pkgname-$version.tar.gz"
 build_style=gnu-configure
@@ -9,6 +10,9 @@ configure_args="--disable-selinux --enable-userdb-cache --with-xml=expat
 --disable-doxygen-docs --disable-xml-docs --disable-tests
 --with-systemdsystemunitdir=/lib/systemd/system"
 makedepends="pkg-config expat-devel libX11-devel"
+conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
+subpackages="dbus-devel dbus-libs dbus-x11"
+system_accounts="dbus"
 short_desc="Message bus system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -23,9 +27,3 @@ long_desc="
  messages are sent using a binary protocol, not using XML.  D-BUS also
  supports a method call mapping for its messages, but it is not required;
  this makes using the system quite simple."
-
-conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
-subpackages="dbus-devel dbus-libs dbus-x11"
-systemd_services="dbus.service off"
-system_accounts="dbus"
-
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index 527ca955b1a..f114597b04c 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,11 +1,13 @@
 # Template file for 'dnsmasq'
 pkgname=dnsmasq
 version=2.58
-revision=3
+revision=4
 homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 distfiles="http://www.thekelleys.org.uk/$pkgname/$pkgname-$version.tar.gz"
 depends="libcap libidn dbus"
 makedepends="dbus-devel libcap-devel libidn-devel"
+system_accounts="dnsmasq"
+conf_files="/etc/dnsmasq.conf /etc/conf.d/dnsmasq"
 short_desc="Lightweight, easy to configure DNS forwarder and DHCP server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -19,20 +21,12 @@ long_desc="
  each host or in a central configuration file. Dnsmasq supports static and
  dynamic DHCP leases and BOOTP/TFTP/PXE for network booting of diskless machines."
 
-system_accounts="dnsmasq"
-conf_files="/etc/dnsmasq.conf /etc/conf.d/dnsmasq"
-systemd_services="dnsmasq.service on"
-
-
-
-do_build()
-{
+do_build() {
 	echo '#define HAVE_DBUS' >> src/config.h
 	make ${makejobs}
 }
 
-do_install()
-{
+do_install() {
 	make PREFIX=/usr DESTDIR=${DESTDIR} install
 
 	vinstall dnsmasq.conf.example 644 etc dnsmasq.conf
diff --git a/srcpkgs/polkit/polkit-devel.template b/srcpkgs/polkit/polkit-devel.template
index 17ded2777c6..e85656baba9 100644
--- a/srcpkgs/polkit/polkit-devel.template
+++ b/srcpkgs/polkit/polkit-devel.template
@@ -1,16 +1,13 @@
 # Template file for 'polkit-devel'.
 #
-depends="pkg-config gobject-introspection glib-devel expat-devel pam-devel polkit"
+depends="glib-devel polkit>=$version"
+replaces="PolicyKit-devel>=0"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-replaces="PolicyKit-devel>=0"
-
-
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index a5f6e32abc9..5962dec8108 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -1,11 +1,13 @@
 # Template file for 'polkit'
 pkgname=polkit
 version=0.105
-revision=2
+revision=3
 distfiles="http://www.freedesktop.org/software/polkit/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static --enable-systemd=yes"
 makedepends="pkg-config intltool libxslt docbook-xsl glib-devel expat-devel pam-devel systemd-devel gobject-introspection"
+replaces="PolicyKit>=0"
+subpackages="polkit-devel"
 short_desc="Authorization Toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
@@ -19,14 +21,10 @@ long_desc="
  to granting access to privileged operations (like calling the HAL Mount()
  method) for unprivileged (desktop) applications."
 
-systemd_services="polkitd.service on"
-replaces="PolicyKit>=0"
-subpackages="polkit-devel"
 make_dirs="
 /etc/polkit-1/localauthority 700 root root
 /var/lib/polkit-1 700 root root"
 
-
 post_install() {
 	vinstall ${FILESDIR}/polkit-1.pam 644 etc/pam.d polkit-1
 	vinstall ${FILESDIR}/polkitd.service 644 lib/systemd/system
diff --git a/srcpkgs/rtkit/template b/srcpkgs/rtkit/template
index ead0166ddd8..e0cbb3daf14 100644
--- a/srcpkgs/rtkit/template
+++ b/srcpkgs/rtkit/template
@@ -1,12 +1,14 @@
 # Template file for 'rtkit'
 pkgname=rtkit
 version=0.10
-revision=4
+revision=5
 homepage="http://git.0pointer.de/?p=rtkit.git"
 distfiles="http://0pointer.de/public/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-systemdsystemunitdir=/lib/systemd/system"
 makedepends="pkg-config dbus-devel libcap-devel"
+system_accounts="rtkit"
+rtkit_homedir="/proc"
 short_desc="Realtime Policy and Watchdog Daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD, GPL-2"
@@ -17,13 +19,7 @@ long_desc="
  It is intended to be used as a secure mechanism to allow real-time scheduling
  to be used by normal user processes."
 
-system_accounts="rtkit"
-rtkit_homedir="/proc"
-systemd_services="rtkit-daemon.service on"
-
-
-post_install()
-{
+post_install() {
 	# DBus configuration
 	install -d ${DESTDIR}/usr/share/dbus-1/interfaces
 	./rtkit-daemon --introspect > \
diff --git a/srcpkgs/udisks/template b/srcpkgs/udisks/template
index b2200055745..dde7c28a107 100644
--- a/srcpkgs/udisks/template
+++ b/srcpkgs/udisks/template
@@ -1,13 +1,12 @@
 # Template file for 'udisks'
 pkgname=udisks
 version=1.0.4
-revision=7
+revision=8
 distfiles="http://hal.freedesktop.org/releases/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--disable-static --enable-lvm2"
 depends="udev"
 makedepends="pkg-config intltool libxslt docbook-xsl device-mapper-devel liblvm2app-devel libparted-devel libatasmart-devel polkit-devel dbus-glib-devel libgudev-devel>=183 sg3_utils-devel"
-systemd_services="udisks.service on"
 make_dirs="/var/lib/udisks 0750 root root"
 short_desc="Disk Management Service"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index 28dc5637a8d..fb229cc921c 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,11 +1,13 @@
 # Template file for 'upower'
 pkgname=upower
 version=0.9.16
+revision=1
 homepage="http://upower.freedesktop.org"
 distfiles="${homepage}/releases/$pkgname-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--with-backend=linux
---with-systemdsystemunitdir=/lib/systemd/system"
+configure_args="--with-backend=linux --with-systemdsystemunitdir=/lib/systemd/system"
+conf_files="/etc/UPower/UPower.conf"
+subpackages="upower-devel"
 depends="dbus"
 makedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection libusb-devel libgudev-devel dbus-glib-devel polkit-devel"
 fulldepends="udev pm-utils"
@@ -19,10 +21,3 @@ long_desc="
  the system can access the org.freedesktop.UPower service via the system
  message bus. Some operations (such as suspending the system) are restricted
  using PolicyKit."
-
-systemd_services="upower.service on"
-conf_files="/etc/UPower/UPower.conf"
-subpackages="upower-devel"
-
-
-
diff --git a/srcpkgs/upower/upower-devel.template b/srcpkgs/upower/upower-devel.template
index c57973eeb15..28d209f8560 100644
--- a/srcpkgs/upower/upower-devel.template
+++ b/srcpkgs/upower/upower-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'upower-devel'.
 #
-depends="pkg-config intltool libxslt docbook-xsl libusb-compat-devel glib-devel libgudev-devel dbus-devel dbus-glib-devel polkit-devel upower"
+depends="libusb-compat-devel libgudev-devel dbus-glib-devel polkit-devel upower>=$version"
 short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains the files needed for developing applications
  that use UPower."
 
-
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/{lib,share}
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index 02da7314008..c15a3c1a5a0 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,11 +1,12 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=0.7.3
-revision=8
+revision=9
 build_wrksrc=$pkgname
 homepage="http://hostap.epitest.fi"
 distfiles="$homepage/releases/$pkgname-$version.tar.gz"
 makedepends="libnl3-devel openssl-devel dbus-devel readline-devel"
+conf_files="/etc/${pkgname}.conf"
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -23,10 +24,6 @@ long_desc="
  $pkgname supports separate frontend programs and a text-based frontend
  (wpa_cli) and a GUI (wpa_gui) are included with $pkgname."
 
-conf_files="/etc/${pkgname}.conf"
-systemd_services="${pkgname}.service on"
-
-
 do_build() {
 	sed -i 's|/usr/local|$(PREFIX)|g' Makefile
 	cp -f ${FILESDIR}/config .config