diff --git a/.config b/.config
index a4177a6..7b75244 100644
--- a/.config
+++ b/.config
@@ -2202,6 +2202,11 @@ CONFIG_PACKAGE_kmod-rt2x00-usb=y
 #
 
 #
+# app
+#
+CONFIG_PACKAGE_network-manager=m
+
+#
 # libraries
 #
 # CONFIG_PACKAGE_orbit2 is not set
@@ -3271,7 +3276,7 @@ CONFIG_PACKAGE_libgpg-error=m
 CONFIG_PACKAGE_libiksemel=m
 # CONFIG_PACKAGE_libimobiledevice is not set
 # CONFIG_PACKAGE_libinklevel is not set
-CONFIG_PACKAGE_libintl=m
+CONFIG_PACKAGE_libintl=y
 # CONFIG_PACKAGE_libintl-full is not set
 CONFIG_PACKAGE_libiw=m
 CONFIG_PACKAGE_libiwinfo=y
@@ -3320,6 +3325,7 @@ CONFIG_PACKAGE_libnfnetlink=y
 # CONFIG_PACKAGE_libnids is not set
 CONFIG_PACKAGE_libnl=m
 CONFIG_PACKAGE_libnl-tiny=y
+CONFIG_PACKAGE_libnl3=m
 # CONFIG_PACKAGE_libnmeap is not set
 # CONFIG_PACKAGE_libogg is not set
 # CONFIG_PACKAGE_liboil is not set
diff --git a/package/libs/libnl3/Makefile b/package/libs/libnl3/Makefile
new file mode 100644
index 0000000..9093e1e
--- /dev/null
+++ b/package/libs/libnl3/Makefile
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libnl3
+PKG_VERSION:=3.2.7
+PKG_RELEASE:=1
+
+PKG_SOURCE:=libnl-$(PKG_VERSION).tar.gz
+PKG_BUILD_DIR:=$(BUILD_DIR)/libnl-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://www.infradead.org/~tgr/libnl/files/
+PKG_MD5SUM:=6a233a9dffa0ee3a7f6110c95c5410ab
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libnl3
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=netlink socket library
+  URL:=http://people.suug.ch/~tgr/libnl3/
+  DEPENDS:=+libpthread
+endef
+
+define Package/libnl3/description
+ This package contains a library for applications dealing with netlink sockets
+endef
+
+TARGET_CFLAGS += -ffunction-sections $(FPIC)
+
+define Build/Compile
+	$(call Build/Compile/Default)
+	make -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		install
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	mkdir -p $(1)/usr/include/libnl3
+	$(CP) $(PKG_BUILD_DIR)/include/linux $(1)/usr/include/libnl3/
+endef
+
+define Package/libnl3/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-route-3.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-genl-3.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-nf-3.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-cli-3.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl-3.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libnl3))
diff --git a/package/network/utils/network-manager/Makefile b/package/network/utils/network-manager/Makefile
new file mode 100644
index 0000000..463658a
--- /dev/null
+++ b/package/network/utils/network-manager/Makefile
@@ -0,0 +1,67 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=NetworkManager
+PKG_VERSION:=0.9.8.0
+PKG_RELEASE:=1
+
+#http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/NetworkManager-0.9.8.0.tar.xz
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/0.9/
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-0.9.8.0
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/nls.mk
+include $(INCLUDE_DIR)/package.mk
+
+PKG_INSTALL=1
+
+EXTRA_CFLAGS+= \
+	-I$(STAGING_DIR)/usr/lib/libintl-stub/include \
+	-I$(STAGING_DIR)/usr/lib/libiconv-stub/include
+
+EXTRA_LDFLAGS+= \
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+	-L$(STAGING_DIR)/usr/lib/libintl-stub/lib \
+	-L$(STAGING_DIR)/usr/lib/libiconv-stub/lib
+
+define Package/network-manager
+  SECTION:=xorg-apps
+  CATEGORY:=Xorg
+  SUBMENU:=app
+  TITLE:=Network Manager
+  URL:=http://network-manager.sourceforge.net/
+  DEPENDS:=+wireless-tools +hal +libnl +libgcrypt +libiw +libuuid +libgnutls +dbus +glib2 +libnl3 +libpthread +librt +libdbus-glib +modemmanager +systemd
+endef
+
+SITE_VARS+= enable_ifcfg_rh=no 
+SITE_VARS+= enable_ifcfg_suse=no 
+SITE_VARS+= enable_ifupdown=yes 
+SITE_VARS+= enable_ifnet=no 
+SITE_VARS+= with_netconfig=no 
+SITE_VARS+= enable_more_warnings=-Wunused
+
+define Build/Configure
+	$(call Build/Configure/Default, \
+		--with-crypto=gnutls \
+		--with-distro=debian \
+  		--without-gnome \
+		--with-ip=/bin/ip, \
+		$(SITE_VARS) \
+	)
+endef
+
+# omit var
+define Package/network-manager/install
+	mkdir -p $(1)
+	mkdir -p $(1)/etc
+	mkdir -p $(1)/lib
+	mkdir -p $(1)/usr
+	$(CP) $(PKG_INSTALL_DIR)/etc/* $(1)/etc
+	$(CP) $(PKG_INSTALL_DIR)/usr/* $(1)/usr
+	$(CP) $(PKG_INSTALL_DIR)/lib/* $(1)/lib
+endef
+
+$(eval $(call BuildPackage,network-manager))
+
+
diff --git a/package/network/utils/network-manager/patches/999-use-linux-if-not-libnl.patch b/package/network/utils/network-manager/patches/999-use-linux-if-not-libnl.patch
new file mode 100644
index 0000000..2896f14
--- /dev/null
+++ b/package/network/utils/network-manager/patches/999-use-linux-if-not-libnl.patch
@@ -0,0 +1,130 @@
+Index: NetworkManager-0.9.8.0/src/nm-device-ethernet.c
+===================================================================
+--- NetworkManager-0.9.8.0.orig/src/nm-device-ethernet.c
++++ NetworkManager-0.9.8.0/src/nm-device-ethernet.c
+@@ -29,7 +29,7 @@
+ #include <linux/ethtool.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+-#include <linux/if.h>
++#include <../include/linux/if.h>
+ #include <errno.h>
+ #include <netinet/ether.h>
+ 
+Index: NetworkManager-0.9.8.0/src/nm-device-olpc-mesh.c
+===================================================================
+--- NetworkManager-0.9.8.0.orig/src/nm-device-olpc-mesh.c
++++ NetworkManager-0.9.8.0/src/nm-device-olpc-mesh.c
+@@ -36,7 +36,7 @@
+ #include <sys/wait.h>
+ #include <signal.h>
+ #include <unistd.h>
+-#include <linux/if.h>
++#include <../include/linux/if.h>
+ #include <sys/ioctl.h>
+ #include <errno.h>
+ 
+Index: NetworkManager-0.9.8.0/src/nm-device-vlan.c
+===================================================================
+--- NetworkManager-0.9.8.0.orig/src/nm-device-vlan.c
++++ NetworkManager-0.9.8.0/src/nm-device-vlan.c
+@@ -24,7 +24,7 @@
+ #include <glib/gi18n.h>
+ 
+ #include <sys/socket.h>
+-#include <linux/if.h>
++#include <../include/linux/if.h>
+ #include <netinet/ether.h>
+ 
+ #include "nm-device-vlan.h"
+Index: NetworkManager-0.9.8.0/src/nm-device-wired.c
+===================================================================
+--- NetworkManager-0.9.8.0.orig/src/nm-device-wired.c
++++ NetworkManager-0.9.8.0/src/nm-device-wired.c
+@@ -22,7 +22,7 @@
+ #include "config.h"
+ #include <glib.h>
+ #include <sys/socket.h>
+-#include <linux/if.h>
++#include <../include/linux/if.h>
+ #include <linux/if_infiniband.h>
+ #include <netinet/ether.h>
+ #include <linux/sockios.h>
+Index: NetworkManager-0.9.8.0/src/nm-device.c
+===================================================================
+--- NetworkManager-0.9.8.0.orig/src/nm-device.c
++++ NetworkManager-0.9.8.0/src/nm-device.c
+@@ -35,7 +35,7 @@
+ #include <sys/wait.h>
+ #include <arpa/inet.h>
+ #include <fcntl.h>
+-#include <linux/if.h>
++#include <../include/linux/if.h>
+ 
+ #include "nm-glib-compat.h"
+ #include "nm-device.h"
+Index: NetworkManager-0.9.8.0/src/nm-system.c
+===================================================================
+--- NetworkManager-0.9.8.0.orig/src/nm-system.c
++++ NetworkManager-0.9.8.0/src/nm-system.c
+@@ -40,7 +40,7 @@
+ #include <resolv.h>
+ #include <netdb.h>
+ #include <glib.h>
+-#include <linux/if.h>
++#include <../include/linux/if.h>
+ #include <linux/sockios.h>
+ #include <linux/if_bonding.h>
+ #include <linux/if_vlan.h>
+Index: NetworkManager-0.9.8.0/src/ppp-manager/nm-ppp-manager.c
+===================================================================
+--- NetworkManager-0.9.8.0.orig/src/ppp-manager/nm-ppp-manager.c
++++ NetworkManager-0.9.8.0/src/ppp-manager/nm-ppp-manager.c
+@@ -32,7 +32,7 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <asm/types.h>
+-#include <linux/if.h>
++#include <../include/linux/if.h>
+ #include <sys/stat.h>
+ 
+ #include <linux/ppp_defs.h>
+Index: NetworkManager-0.9.8.0/src/wifi/wifi-utils-wext.c
+===================================================================
+--- NetworkManager-0.9.8.0.orig/src/wifi/wifi-utils-wext.c
++++ NetworkManager-0.9.8.0/src/wifi/wifi-utils-wext.c
+@@ -41,7 +41,7 @@
+ #include <sys/types.h>
+ #include <linux/types.h>
+ #include <sys/socket.h>
+-#include <linux/if.h>
++#include <../include/linux/if.h>
+ #include <linux/wireless.h>
+ 
+ 
+Index: NetworkManager-0.9.8.0/src/wimax/iwmxsdk.c
+===================================================================
+--- NetworkManager-0.9.8.0.orig/src/wimax/iwmxsdk.c
++++ NetworkManager-0.9.8.0/src/wimax/iwmxsdk.c
+@@ -28,7 +28,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/socket.h>
+-#include <linux/if.h>
++#include <../include/linux/if.h>
+ 
+ #include <glib.h>
+ 
+Index: NetworkManager-0.9.8.0/src/wimax/nm-device-wimax.c
+===================================================================
+--- NetworkManager-0.9.8.0.orig/src/wimax/nm-device-wimax.c
++++ NetworkManager-0.9.8.0/src/wimax/nm-device-wimax.c
+@@ -24,7 +24,7 @@
+ #include <sys/ioctl.h>
+ #include <net/ethernet.h>
+ #include <sys/socket.h>
+-#include <linux/if.h>
++#include <../include/linux/if.h>
+ #include <netinet/ether.h>
+ 
+ #include <WiMaxAPI.h>