diff --git a/srcpkgs/network-manager-applet-devel b/srcpkgs/network-manager-applet-devel
new file mode 120000
index 0000000000..f95007eeb0
--- /dev/null
+++ b/srcpkgs/network-manager-applet-devel
@@ -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
new file mode 100644
index 0000000000..6eedd31fbf
--- /dev/null
+++ b/srcpkgs/network-manager-applet/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.9.1.90"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/network-manager-applet/network-manager-applet-devel.template b/srcpkgs/network-manager-applet/network-manager-applet-devel.template
new file mode 100644
index 0000000000..4fe8a8fd6a
--- /dev/null
+++ b/srcpkgs/network-manager-applet/network-manager-applet-devel.template
@@ -0,0 +1,19 @@
+# Template file for network-manager-applet-devel'.
+#
+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 NetworkManager-devel
+Add_dependency run gnome-bluetooth-devel
+Add_dependency run libnotify-devel
+Add_dependency run ${sourcepkg}
+
+do_install()
+{
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+}
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 1aff3d4a8c..1899702df0 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,7 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=0.9.0
-distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.bz2"
+version=0.9.1.90
+distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --localstatedir=/var
 --with-gconf-schema-file-dir=/usr/share/gconf/schemas --with-bluetooth
@@ -10,7 +10,7 @@ short_desc="NetworkManager panel applet for GNOME"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/NetworkManager/"
 license="GPL"
-checksum=bb34653b7524bf36c79f86545a255d05c076367a2461389a7512b9e0ef0df38f
+checksum=e98d285cc75a331557551900ebd815c24cb3132027f981823af4fb76ec368d95
 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
@@ -25,50 +25,41 @@ 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."
 
-gconf_schemas="nm-applet.schemas"
+subpackages="${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 GConf
+Add_dependency run gtk+3
+Add_dependency run atk
 Add_dependency run glib
-Add_dependency run dbus-libs
-Add_dependency run dbus-glib
 Add_dependency run pango
 Add_dependency run gdk-pixbuf
 Add_dependency run cairo
-Add_dependency run atk
-Add_dependency run libpng
 Add_dependency run freetype
 Add_dependency run fontconfig
-Add_dependency run gtk+3
 Add_dependency run NetworkManager
-Add_dependency run libnotify
-Add_dependency run GConf
+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 polkit-gnome
+Add_dependency run notification-daemon
+Add_dependency run hicolor-icon-theme
 
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build GConf-devel
 Add_dependency build libgnome-keyring-devel
-Add_dependency build gtk+3-devel
 Add_dependency build NetworkManager-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
-Add_dependency build glib-devel
-Add_dependency build libnotify-devel
-Add_dependency build pango-devel
-Add_dependency build gdk-pixbuf-devel
-Add_dependency build cairo-devel
 Add_dependency build gnome-bluetooth-devel
-Add_dependency build atk-devel
-Add_dependency build libpng-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
+Add_dependency build libnotify-devel
 
-Add_dependency full notification-daemon
-Add_dependency full hicolor-icon-theme
-Add_dependency full polkit-gnome
+Add_dependency full iso-codes
 
 post_install()
 {
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index e86b892298..43f76aee97 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -850,3 +850,4 @@ libsocialweb-keystore.so	libsocialweb		libsocialweb-devel
 libsocialweb-client.so		libsocialweb		libsocialweb-devel
 liblcms2.so			lcms2			lcms2-devel
 libcolord.so			colord			colord-devel
+libnm-gtk.so			network-manager-applet	network-manager-applet-devel