diff --git a/srcpkgs/NetworkManager-devel b/srcpkgs/NetworkManager-devel
new file mode 120000
index 0000000000..494d576b33
--- /dev/null
+++ b/srcpkgs/NetworkManager-devel
@@ -0,0 +1 @@
+NetworkManager
\ No newline at end of file
diff --git a/srcpkgs/NetworkManager/NetworkManager-devel.template b/srcpkgs/NetworkManager/NetworkManager-devel.template
new file mode 100644
index 0000000000..82ae090bd8
--- /dev/null
+++ b/srcpkgs/NetworkManager/NetworkManager-devel.template
@@ -0,0 +1,31 @@
+# Template file for 'NetworkManager-devel'.
+#
+short_desc="${sourcepkg} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run pkg-config
+Add_dependency run libuuid-devel
+Add_dependency run nss-devel
+Add_dependency run nspr-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run dbus-devel
+Add_dependency run glib-devel
+Add_dependency run libgudev-devel
+Add_dependency run pkg-config
+Add_dependency run intltool
+Add_dependency run wireless_tools-devel
+Add_dependency run libnl-devel
+Add_dependency run polkit-devel
+Add_dependency run ppp-devel
+Add_dependency run iptables-devel
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/{lib,share}
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/NetworkManager/depends b/srcpkgs/NetworkManager/depends
new file mode 100644
index 0000000000..daa819845a
--- /dev/null
+++ b/srcpkgs/NetworkManager/depends
@@ -0,0 +1,2 @@
+abi_depends=">=0.8"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/NetworkManager/files/nm-system-settings.conf b/srcpkgs/NetworkManager/files/nm-system-settings.conf
new file mode 100644
index 0000000000..c37b596800
--- /dev/null
+++ b/srcpkgs/NetworkManager/files/nm-system-settings.conf
@@ -0,0 +1,2 @@
+[main]
+plugins=keyfile
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
new file mode 100644
index 0000000000..a870b36fc9
--- /dev/null
+++ b/srcpkgs/NetworkManager/template
@@ -0,0 +1,60 @@
+# Template file for 'NetworkManager'
+pkgname=NetworkManager
+version=0.8
+distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--localstatedir=/var --with-distro=gentoo
+--with-dhcp-client=dhcpcd --with-system-ca-path=/etc/ssl/certs
+--with-crypto=nss --disable-static"
+short_desc="Network Management daemon"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05
+long_desc="
+ This packages common libraries for the GNOME desktop."
+
+openrc_services="NetworkManager default"
+conf_files="/etc/NetworkManager/nm-system-settings.conf"
+subpackages="$pkgname-devel"
+
+CFLAGS="-I/usr/include/nspr -I/usr/include/nss"
+
+Add_dependency run glibc
+Add_dependency run wireless_tools
+Add_dependency run libnl
+Add_dependency run polkit
+Add_dependency run ppp
+Add_dependency run iptables
+Add_dependency run libuuid
+Add_dependency run nss
+Add_dependency run nspr
+Add_dependency run dbus-glib
+Add_dependency run dbus-libs
+Add_dependency run glib
+Add_dependency run libgudev
+Add_dependency build pkg-config
+Add_dependency build libuuid-devel
+Add_dependency build nss-devel
+Add_dependency build nspr-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build dbus-devel
+Add_dependency build glib-devel
+Add_dependency build libgudev-devel
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build wireless_tools-devel
+Add_dependency build libnl-devel
+Add_dependency build polkit-devel
+Add_dependency build ppp-devel
+Add_dependency build iptables-devel
+Add_dependency full iproute2
+Add_dependency full dhcpcd
+Add_dependency full wpa_supplicant
+
+post_install()
+{
+	# Fix path to pppd.
+	mv ${DESTDIR}/usr/lib/pppd/2.4.4 ${DESTDIR}/usr/lib/pppd/2.4.5
+	# Install config file.
+	install -d ${DESTDIR}/etc/NetworkManager
+	install -m644 ${FILESDIR}/*.conf ${DESTDIR}/etc/NetworkManager
+}
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 1ebf54bd74..93b0fb7675 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -561,3 +561,6 @@ libip6tc.so			iptables		iptables-devel
 libxtables.so			iptables		iptables-devel
 libip4tc.so			iptables		iptables-devel
 libipq.so			iptables		iptables-devel
+libnm-util.so			NetworkManager		NetworkManager-devel
+libnm-glib.so			NetworkManager		NetworkManager-devel
+libnm-glib-vpn.so		NetworkManager		NetworkManager-devel