diff -ruN /var/abs/extra/networkmanager/all-sessions.patch networkmanager/all-sessions.patch
--- /var/abs/extra/networkmanager/all-sessions.patch	1969-12-31 19:00:00.000000000 -0500
+++ networkmanager/all-sessions.patch	2012-10-07 17:01:56.000000000 -0400
@@ -0,0 +1,114 @@
+diff -ruN NetworkManager-0.9.6.0.orig/configure.ac NetworkManager-0.9.6.0/configure.ac
+--- NetworkManager-0.9.6.0.orig/configure.ac	2012-08-07 12:06:40.000000000 -0400
++++ NetworkManager-0.9.6.0/configure.ac	2012-10-07 16:56:50.000000000 -0400
+@@ -368,11 +368,12 @@
+ fi
+ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
+ 
+-AC_ARG_WITH(session-tracking, AS_HELP_STRING([--with-session-tracking=systemd|ck|none], [Build NetworkManager with specific session tracking support]))
+-if test "z$with_session_tracking" = "z"; then
+-    # Default to ConsoleKit session tracking like we used before
+-    with_session_tracking=ck
+-fi
++dnl AC_ARG_WITH(session-tracking, AS_HELP_STRING([--with-session-tracking=systemd|ck|none], [Build NetworkManager with specific session tracking support]))
++dnl if test "z$with_session_tracking" = "z"; then
++dnl     # Default to ConsoleKit session tracking like we used before
++dnl     with_session_tracking=ck
++dnl fi
++with_session_tracking=systemd
+ 
+ case $with_session_tracking in
+     ck|none|no) ;;
+diff -ruN NetworkManager-0.9.6.0.orig/data/NetworkManager.service.in NetworkManager-0.9.6.0/data/NetworkManager.service.in
+--- NetworkManager-0.9.6.0.orig/data/NetworkManager.service.in	2012-08-02 16:41:52.000000000 -0400
++++ NetworkManager-0.9.6.0/data/NetworkManager.service.in	2012-10-07 16:56:50.000000000 -0400
+@@ -7,7 +7,7 @@
+ [Service]
+ Type=dbus
+ BusName=org.freedesktop.NetworkManager
+-ExecStart=@sbindir@/NetworkManager --no-daemon
++ExecStart=@sbindir@/NetworkManager-systemd --no-daemon
+ # Suppress stderr to eliminate duplicated messages in syslog. NM calls openlog()
+ # with LOG_PERROR when run in foreground. But systemd redirects stderr to
+ # syslog by default, which results in logging each message twice.
+diff -ruN NetworkManager-0.9.6.0.orig/src/Makefile.am NetworkManager-0.9.6.0/src/Makefile.am
+--- NetworkManager-0.9.6.0.orig/src/Makefile.am	2012-08-06 18:16:50.000000000 -0400
++++ NetworkManager-0.9.6.0/src/Makefile.am	2012-10-07 16:58:05.000000000 -0400
+@@ -112,7 +112,7 @@
+ # NetworkManager
+ ###########################################
+ 
+-sbin_PROGRAMS = NetworkManager
++sbin_PROGRAMS = NetworkManager-ck NetworkManager-nosession NetworkManager-systemd
+ 
+ NetworkManager_SOURCES = \
+ 		nm-call-store.c \
+@@ -199,15 +199,9 @@
+ NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h
+ endif
+ 
+-if SESSION_TRACKING_SYSTEMD
+-NetworkManager_SOURCES += nm-session-monitor-systemd.c
+-else
+-if SESSION_TRACKING_CK
+-NetworkManager_SOURCES += nm-session-monitor-ck.c
+-else
+-NetworkManager_SOURCES += nm-session-monitor-null.c
+-endif
+-endif
++NetworkManager_ck_SOURCES = $(NetworkManager_SOURCES) nm-session-monitor-ck.c
++NetworkManager_nosession_SOURCES = $(NetworkManager_SOURCES) nm-session-monitor-null.c
++NetworkManager_systemd_SOURCES = $(NetworkManager_SOURCES) nm-session-monitor-systemd.c
+ 
+ nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
+ 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_access_point --mode=glib-server --output=$@ $<
+@@ -286,7 +280,6 @@
+ 	$(LIBNL_CFLAGS) \
+ 	$(GMODULE_CFLAGS) \
+ 	$(POLKIT_CFLAGS) \
+-	$(SYSTEMD_CFLAGS) \
+ 	-DG_DISABLE_DEPRECATED \
+ 	-DBINDIR=\"$(bindir)\" \
+ 	-DSBINDIR=\"$(sbindir)\" \
+@@ -296,13 +289,17 @@
+ 	-DLOCALSTATEDIR=\"$(localstatedir)\" \
+ 	-DNM_RUN_DIR=\"$(rundir)\" \
+ 	-DNMLOCALEDIR=\"$(datadir)/locale\" \
+-	-DNMPLUGINDIR=\"$(pkglibdir)\"
++	-DNMPLUGINDIR=\"$(pkglibdir)\" \
+ 	-DARP_DEBUG
+ 
+ if WITH_CONCHECK
+ NetworkManager_CPPFLAGS += $(LIBSOUP_CFLAGS)
+ endif
+ 
++NetworkManager_ck_CPPFLAGS = $(NetworkManager_CPPFLAGS)
++NetworkManager_nosession_CPPFLAGS = $(NetworkManager_CPPFLAGS)
++NetworkManager_systemd_CPPFLAGS = $(NetworkManager_CPPFLAGS) $(SYSTEMD_CFLAGS)
++
+ NetworkManager_LDADD = \
+ 	./generated/libnm-generated.la \
+ 	./logging/libnm-logging.la \
+@@ -327,7 +324,6 @@
+ 	$(LIBNL_LIBS) \
+ 	$(GMODULE_LIBS) \
+ 	$(POLKIT_LIBS) \
+-	$(SYSTEMD_LIBS) \
+ 	$(LIBM) \
+ 	$(LIBDL)
+ 
+@@ -335,7 +331,14 @@
+ NetworkManager_LDADD += $(LIBSOUP_LIBS)
+ endif
+ 
++NetworkManager_ck_LDADD = $(NetworkManager_LDADD)
++NetworkManager_nosession_LDADD = $(NetworkManager_LDADD)
++NetworkManager_systemd_LDADD = $(NetworkManager_LDADD) $(SYSTEMD_LIBS)
++
+ NetworkManager_LDFLAGS = -rdynamic
++NetworkManager_ck_LDFLAGS = $(NetworkManager_LDFLAGS)
++NetworkManager_nosession_LDFLAGS = $(NetworkManager_LDFLAGS)
++NetworkManager_systemd_LDFLAGS = $(NetworkManager_LDFLAGS)
+ 
+ libexec_PROGRAMS = nm-crash-logger
+ nm_crash_logger_SOURCES = nm-crash-logger.c
diff -ruN /var/abs/extra/networkmanager/PKGBUILD networkmanager/PKGBUILD
--- /var/abs/extra/networkmanager/PKGBUILD	2012-09-26 00:04:29.000000000 -0400
+++ networkmanager/PKGBUILD	2012-10-07 17:25:26.000000000 -0400
@@ -8,14 +8,14 @@
 pkgname=networkmanager
 _pkgname=NetworkManager
 pkgver=0.9.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org/projects/$_pkgname/"
 depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd'
          'libsoup')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
+makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection' 'systemd' 'autoconf' 'automake')
 optdepends=('modemmanager: for modem management service'
             'dhclient: alternative DHCP/DHCPv6 client'
             'iptables: Connection sharing'
@@ -27,21 +27,26 @@
 install=networkmanager.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
         NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch
-        nm-polkit-permissive.patch repair-signals.patch)
+        nm-polkit-permissive.patch repair-signals.patch all-sessions.patch)
 sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
             '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
             'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06'
-            'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6')
+            'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6'
+            '037b95c5efea31ffccbc9237d2fe6bfc1eafdf0c83252d05a8ba8331938808fb')
 
 build() {
-  cd $_pkgname-$pkgver
+  cd "$srcdir/$_pkgname-$pkgver"
 
   patch -Np1 -i ../disable_set_hostname.patch
   patch -Np1 -i ../dnsmasq-path.patch
   patch -Np1 -i ../nm-polkit-permissive.patch
   patch -Np1 -i ../repair-signals.patch # FS#31115
+  patch -Np1 -i ../all-sessions.patch
+
+  # all-sessions.patch alters an automake and autoconf files
+  autoreconf
 
   ./configure \
     --prefix=/usr \
@@ -56,7 +61,6 @@
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
     --with-udev-dir=/usr/lib/udev \
     --with-resolvconf=/usr/sbin/resolvconf \
-    --with-session-tracking=ck \
     --disable-static \
     --enable-more-warnings=no \
     --disable-wimax
@@ -65,8 +69,10 @@
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd "$srcdir/$_pkgname-$pkgver"
+
   make DESTDIR="$pkgdir" install
+  ln -s NetworkManager-ck "$pkgdir/usr/sbin/NetworkManager"
 
   install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"