diff --git a/srcpkgs/NetworkManager/NetworkManager-devel.template b/srcpkgs/NetworkManager/NetworkManager-devel.template
index 1021284643a..1c30016013e 100644
--- a/srcpkgs/NetworkManager/NetworkManager-devel.template
+++ b/srcpkgs/NetworkManager/NetworkManager-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'NetworkManager-devel'.
 #
-depends="dbus-glib-devel libnm>=0.9.4.0"
+noarch=yes
+depends="dbus-glib-devel libnm>=$version"
 short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-noarch=yes
-
 do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
diff --git a/srcpkgs/NetworkManager/NetworkManager.rshlibs b/srcpkgs/NetworkManager/NetworkManager.rshlibs
index ae9b5eb6cbb..6ba51f619e6 100644
--- a/srcpkgs/NetworkManager/NetworkManager.rshlibs
+++ b/srcpkgs/NetworkManager/NetworkManager.rshlibs
@@ -26,3 +26,4 @@ libnspr4.so
 librt.so.1
 libnl-genl-3.so.200
 libsoup-2.4.so.1
+libsystemd-login.so.0
diff --git a/srcpkgs/NetworkManager/libnm.template b/srcpkgs/NetworkManager/libnm.template
index f7895865791..02b3d51e4bc 100644
--- a/srcpkgs/NetworkManager/libnm.template
+++ b/srcpkgs/NetworkManager/libnm.template
@@ -1,13 +1,12 @@
 # Template file for 'libnm'.
 #
+replaces="NetworkManager<0.9.1.90_1"
 short_desc="${sourcepkg} - shared libraries" 
 long_desc="${long_desc}
 
  This package contains a convenience library to ease the access to
  NetworkManager."
 
-replaces="NetworkManager<0.9.1.90_1"
-
 do_install() {
 	vmove "usr/lib/*.so*" usr/lib
 	vmove "usr/lib/girepository-*" usr/lib
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index a9d8b2b30fc..11f6c9cc5db 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,16 +1,20 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
 version=0.9.4.0
-revision=2
+revision=3
 distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--with-distro=gentoo
 --with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no --disable-wimax
 --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
 --with-crypto=nss --disable-static --enable-ppp --enable-concheck
---with-systemdsystemunitdir=/lib/systemd/system"
-makedepends="pkg-config intltool libuuid-devel nss-devel dbus-glib-devel libgudev-devel wireless_tools-devel libnl3-devel polkit-devel ppp-devel iptables-devel libsoup-devel"
+--with-systemdsystemunitdir=/lib/systemd/system
+--with-session-tracking=systemd"
+makedepends="pkg-config intltool libuuid-devel nss-devel dbus-glib-devel libgudev-devel wireless_tools-devel libnl3-devel polkit-devel ppp-devel iptables-devel libsoup-devel systemd-devel"
 fulldepends="dbus>=0 iproute2 dhcpcd>=5.5.4_1 wpa_supplicant"
+systemd_services="${pkgname}.service on"
+conf_files="/etc/${pkgname}/${pkgname}.conf"
+subpackages="$pkgname-devel libnm"
 short_desc="Network Management daemon"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/NetworkManager/"
@@ -24,12 +28,6 @@ long_desc="
  NetworkManager is _intended_ to replace default routes, obtain IP addresses
  from a DHCP server, and change nameservers whenever it sees fit."
 
-systemd_services="${pkgname}.service on"
-conf_files="/etc/${pkgname}/${pkgname}.conf"
-subpackages="$pkgname-devel libnm"
-
-
-
 post_install() {
 	# Install config file.
 	vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}