diff -up NetworkManager-0.7.0/configure.in.local-libnl NetworkManager-0.7.0/configure.in
--- NetworkManager-0.7.0/configure.in.local-libnl	2008-09-22 23:21:57.000000000 -0400
+++ NetworkManager-0.7.0/configure.in	2008-09-22 23:21:57.000000000 -0400
@@ -239,10 +239,6 @@ PKG_CHECK_MODULES(HAL, hal >= 0.5.0)
 AC_SUBST(HAL_CFLAGS)
 AC_SUBST(HAL_LIBS)
 
-PKG_CHECK_MODULES(LIBNL, libnl-1 >= 1.0-pre8)
-AC_SUBST(LIBNL_CFLAGS)
-AC_SUBST(LIBNL_LIBS)
-
 PKG_CHECK_MODULES(UUID, uuid)
 AC_SUBST(UUID_CFLAGS)
 AC_SUBST(UUID_LIBS)
diff -up NetworkManager-0.7.0/src/backends/Makefile.am.local-libnl NetworkManager-0.7.0/src/backends/Makefile.am
--- NetworkManager-0.7.0/src/backends/Makefile.am.local-libnl	2008-09-22 23:22:24.000000000 -0400
+++ NetworkManager-0.7.0/src/backends/Makefile.am	2008-09-22 23:23:29.000000000 -0400
@@ -3,7 +3,8 @@ INCLUDES = -I${top_srcdir}				\
 		 -I${top_srcdir}/src			\
 		 -I${top_srcdir}/src/vpn-manager	\
 		 -I${top_srcdir}/src/named-manager	\
-		 -I${top_srcdir}/libnm-util
+		 -I${top_srcdir}/libnm-util \
+		 -I${top_srcdir}/libnl-1.1/include
 
 noinst_LTLIBRARIES = libnmbackend.la
 
diff -up NetworkManager-0.7.0/src/Makefile.am.local-libnl NetworkManager-0.7.0/src/Makefile.am
--- NetworkManager-0.7.0/src/Makefile.am.local-libnl	2008-09-13 16:47:21.000000000 -0400
+++ NetworkManager-0.7.0/src/Makefile.am	2008-09-22 23:23:33.000000000 -0400
@@ -16,7 +16,8 @@ INCLUDES = -I${top_srcdir}              
            -I${top_srcdir}/src/supplicant-manager  \
            -I${top_srcdir}/src/dnsmasq-manager  \
            -I${top_srcdir}/libnm-util \
-           -I${top_srcdir}/callouts
+           -I${top_srcdir}/callouts \
+           -I${top_srcdir}/libnl-1.1/include
 
 sbin_PROGRAMS = NetworkManager
 
@@ -125,7 +126,6 @@ NetworkManager_CPPFLAGS = 							\
 	$(GTHREAD_CFLAGS)								\
 	$(HAL_CFLAGS)									\
 	$(OPENSSL_CFLAGS)								\
-	$(LIBNL_CFLAGS)								\
 	-DDBUS_API_SUBJECT_TO_CHANGE						\
 	-DG_DISABLE_DEPRECATED							\
 	-DBINDIR=\"$(bindir)\"							\
@@ -142,7 +142,7 @@ NetworkManager_LDADD = 							\
 			$(DBUS_LIBS)						\
 			$(GTHREAD_LIBS)					\
 			$(HAL_LIBS)						\
-			$(LIBNL_LIBS)						\
+			$(top_builddir)/libnl-1.1/lib/libnl.a -lm		\
 			$(top_builddir)/marshallers/libmarshallers.la	\
 			./named-manager/libnamed-manager.la	\
 			./vpn-manager/libvpn-manager.la		\
diff -up NetworkManager-0.7.0/src/named-manager/Makefile.am.foo NetworkManager-0.7.0/src/named-manager/Makefile.am
--- NetworkManager-0.7.0/src/named-manager/Makefile.am.foo	2008-11-19 17:23:20.000000000 -0500
+++ NetworkManager-0.7.0/src/named-manager/Makefile.am	2008-11-19 17:23:40.000000000 -0500
@@ -1,4 +1,4 @@
-INCLUDES = -I${top_srcdir}/libnm-util -I${top_srcdir}/src -I${top_srcdir}/include
+INCLUDES = -I${top_srcdir}/libnm-util -I${top_srcdir}/src -I${top_srcdir}/include -I${top_srcdir}/libnl-1.1/include
 
 noinst_LTLIBRARIES = libnamed-manager.la
 
diff -up NetworkManager-0.7.0/src/vpn-manager/Makefile.am.foo NetworkManager-0.7.0/src/vpn-manager/Makefile.am
--- NetworkManager-0.7.0/src/vpn-manager/Makefile.am.foo	2008-11-19 17:27:29.000000000 -0500
+++ NetworkManager-0.7.0/src/vpn-manager/Makefile.am	2008-11-19 17:27:36.000000000 -0500
@@ -5,8 +5,8 @@ INCLUDES = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/marshallers \
 	-I${top_srcdir}/src/named-manager \
-	-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"
-
+	-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\" \
+	-I${top_srcdir}/libnl-1.1/include
 
 noinst_LTLIBRARIES = libvpn-manager.la