diff --git a/srcpkgs/libnm-gtk b/srcpkgs/libnm-gtk
new file mode 120000
index 0000000000..f95007eeb0
--- /dev/null
+++ b/srcpkgs/libnm-gtk
@@ -0,0 +1 @@
+network-manager-applet
\ No newline at end of file
diff --git a/srcpkgs/network-manager-applet/depends b/srcpkgs/network-manager-applet/depends
index 6eedd31fbf..5888532967 100644
--- a/srcpkgs/network-manager-applet/depends
+++ b/srcpkgs/network-manager-applet/depends
@@ -1,2 +1,2 @@
-abi_depends=">=0.9.1.90"
+abi_depends=">=0.9.1.95"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/network-manager-applet/libnm-gtk.template b/srcpkgs/network-manager-applet/libnm-gtk.template
new file mode 100644
index 0000000000..94b885e76f
--- /dev/null
+++ b/srcpkgs/network-manager-applet/libnm-gtk.template
@@ -0,0 +1,28 @@
+# Template file for 'libnm-gtk'.
+#
+short_desc="${sourcepkg} - runtime library"
+long_desc="${long_desc}
+
+ This package contains the GTK+ runtime library."
+
+replaces="${sourcepkg}<0.9.1.95"
+
+Add_dependency run glibc
+Add_dependency run glib
+Add_dependency run dbus-libs
+Add_dependency run dbus-glib
+Add_dependency run atk
+Add_dependency run pango
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run gtk+3
+Add_dependency run libnm
+Add_dependency run libgnome-keyring
+Add_dependency run GConf
+
+do_install()
+{
+	vmove "usr/lib/*.so*" usr/lib
+}
diff --git a/srcpkgs/network-manager-applet/network-manager-applet-devel.template b/srcpkgs/network-manager-applet/network-manager-applet-devel.template
index 4fe8a8fd6a..2d493457b9 100644
--- a/srcpkgs/network-manager-applet/network-manager-applet-devel.template
+++ b/srcpkgs/network-manager-applet/network-manager-applet-devel.template
@@ -1,16 +1,13 @@
 # Template file for network-manager-applet-devel'.
 #
-short_desc="${sourcepkg} (development files)"
+short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run GConf-devel
-Add_dependency run libgnome-keyring-devel
+Add_dependency run gtk+3-devel
 Add_dependency run NetworkManager-devel
-Add_dependency run gnome-bluetooth-devel
-Add_dependency run libnotify-devel
-Add_dependency run ${sourcepkg}
+Add_dependency run libnm-gtk
 
 do_install()
 {
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 42cd3a0143..c4e0257e24 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,7 +1,6 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=0.9.1.90
-revision=2
+version=0.9.1.95
 distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 configure_args="--disable-schemas-install
@@ -10,8 +9,8 @@ configure_args="--disable-schemas-install
 short_desc="NetworkManager panel applet for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/NetworkManager/"
-license="GPL"
-checksum=e98d285cc75a331557551900ebd815c24cb3132027f981823af4fb76ec368d95
+license="GPL-2"
+checksum=6a0e1f72b5c9ad040451263f9b8723ac6a8dfb59772d8c8258cafc0d2b2390fc
 long_desc="
  NetworkManager attempts to keep an active network connection available at all
  times. It is intended only for the desktop use-case, and is not intended for
@@ -26,13 +25,17 @@ long_desc="
  them. For encrypted networks it will prompt the user for the key/passphrase
  and it can optionally store them in the gnome-keyring."
 
-subpackages="${pkgname}-devel"
+subpackages="libnm-gtk ${pkgname}-devel"
 gconf_schemas="${pkgname}.schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 # XXX: mobile-broadband-provier-info deps.
 Add_dependency run glibc
+Add_dependency run libnm-gtk
 Add_dependency run GConf
+Add_dependency run libnm
+Add_dependency run libgnome-keyring
+Add_dependency run gnome-bluetooth
 Add_dependency run gtk+3
 Add_dependency run atk
 Add_dependency run glib
@@ -41,11 +44,8 @@ Add_dependency run gdk-pixbuf
 Add_dependency run cairo
 Add_dependency run freetype
 Add_dependency run fontconfig
-Add_dependency run libnm
 Add_dependency run dbus-glib
 Add_dependency run dbus-libs
-Add_dependency run libgnome-keyring
-Add_dependency run gnome-bluetooth
 Add_dependency run libnotify
 
 Add_dependency run NetworkManager
@@ -60,6 +60,7 @@ Add_dependency build libgnome-keyring-devel
 Add_dependency build NetworkManager-devel
 Add_dependency build gnome-bluetooth-devel
 Add_dependency build libnotify-devel
+Add_dependency build polkit-devel
 
 Add_dependency full iso-codes
 
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index fac2f347a0..8600e15e5a 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -855,7 +855,7 @@ libsocialweb-keystore.so.0	libsocialweb		libsocialweb-devel
 libsocialweb-client.so.2	libsocialweb		libsocialweb-devel
 liblcms2.so.2			lcms2			lcms2-devel
 libcolord.so.1			colord			colord-devel
-libnm-gtk.so.0			network-manager-applet	network-manager-applet-devel
+libnm-gtk.so.0			libnm-gtk		network-manager-applet-devel
 libcaribou.so.0			caribou			caribou-devel
 libgdmgreeter.so.1		gdm			gdm-devel
 libgdmsimplegreeter.so.1	gdm			gdm-devel