diff -up NetworkManager-0.6.6/nm-applet-0.6.6/libnma/Makefile.am.buildfix NetworkManager-0.6.6/nm-applet-0.6.6/libnma/Makefile.am
--- NetworkManager-0.6.6/nm-applet-0.6.6/libnma/Makefile.am.buildfix	2008-02-20 11:08:06.000000000 -0500
+++ NetworkManager-0.6.6/nm-applet-0.6.6/libnma/Makefile.am	2008-03-06 18:11:26.000000000 -0500
@@ -1,7 +1,8 @@
 INCLUDES = \
 	-I$(top_srcdir) \
 	$(GTK_CFLAGS) \
-	$(NM_CFLAGS)
+	-I${top_srcdir}/../include \
+	-I${top_srcdir}/../libnm-util
 
 noinst_LTLIBRARIES = libnma.la
 
diff -up NetworkManager-0.6.6/nm-applet-0.6.6/configure.ac.buildfix NetworkManager-0.6.6/nm-applet-0.6.6/configure.ac
--- NetworkManager-0.6.6/nm-applet-0.6.6/configure.ac.buildfix	2008-03-06 16:50:35.000000000 -0500
+++ NetworkManager-0.6.6/nm-applet-0.6.6/configure.ac	2008-03-06 18:11:26.000000000 -0500
@@ -18,10 +18,10 @@ dnl
 dnl This doesn't depend on gnome support, only on gnome-common, autogen already
 dnl uses gnome-autogen
 dnl
-GNOME_COMMON_INIT
-GNOME_DEBUG_CHECK
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_MAINTAINER_MODE_DEFINES
+dnl GNOME_COMMON_INIT
+dnl GNOME_DEBUG_CHECK
+dnl GNOME_COMPILE_WARNINGS([maximum])
+dnl GNOME_MAINTAINER_MODE_DEFINES
 
 dnl
 dnl Required headers
@@ -111,10 +111,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
 AC_SUBST(GOBJECT_CFLAGS)
 AC_SUBST(GOBJECT_LIBS)
 
-PKG_CHECK_MODULES(NM, NetworkManager)
-AC_SUBST(NM_CFLAGS)
-AC_SUBST(NM_LIBS)
-
 AC_ARG_WITH(notify, AC_HELP_STRING([--with-notify], [Use libnotify]), enable_notify=$withval, enable_notify=auto)
 
 PKG_CHECK_MODULES(GTK, gtk+-2.0)
diff -up NetworkManager-0.6.6/nm-applet-0.6.6/src/Makefile.am.buildfix NetworkManager-0.6.6/nm-applet-0.6.6/src/Makefile.am
--- NetworkManager-0.6.6/nm-applet-0.6.6/src/Makefile.am.buildfix	2008-02-20 11:08:06.000000000 -0500
+++ NetworkManager-0.6.6/nm-applet-0.6.6/src/Makefile.am	2008-03-06 18:11:26.000000000 -0500
@@ -2,6 +2,9 @@ NULL=
 
 bin_PROGRAMS = nm-applet
 
+INCLUDES = -I${top_srcdir}/../include \
+           -I${top_srcdir}/../libnm-util
+
 nm_applet_CPPFLAGS =									\
 	-I$(top_srcdir)										\
 	$(DBUS_CFLAGS)										\
@@ -13,7 +16,6 @@ nm_applet_CPPFLAGS =									\
 	$(GCONF_CFLAGS)									\
 	$(LIBGNOMEUI_CFLAGS)								\
 	$(GNOME_KEYRING_CFLAGS)								\
-	$(NM_CFLAGS)									\
 	-DICONDIR=\""$(datadir)/icons"\"						\
 	-DGLADEDIR=\""$(gladedir)"\"							\
 	-DBINDIR=\""$(bindir)"\"								\
@@ -114,8 +116,8 @@ nm_applet_LDADD =						\
 	$(GCONF_LIBS)						\
 	$(LIBGNOMEUI_LIBS)					\
 	$(GNOME_KEYRING_LIBS)				\
-	$(NM_LIBS) \
-	 ../libnma/libnma.la \
+	-L${top_srcdir}/../libnm-util  $(top_builddir)/../libnm-util/libnm-util.la \
+	$(top_builddir)/libnma/libnma.la \
 	$(NULL)
 
 if WITH_NOTIFY
diff -up NetworkManager-0.6.6/nm-applet-0.6.6/editor/Makefile.am.buildfix NetworkManager-0.6.6/nm-applet-0.6.6/editor/Makefile.am
--- NetworkManager-0.6.6/nm-applet-0.6.6/editor/Makefile.am.buildfix	2008-03-06 18:13:34.000000000 -0500
+++ NetworkManager-0.6.6/nm-applet-0.6.6/editor/Makefile.am	2008-03-06 18:16:30.000000000 -0500
@@ -1,6 +1,8 @@
 NULL=
 
-INCLUDES = -I${top_srcdir}
+INCLUDES = -I${top_srcdir} \
+	-I${top_srcdir}/../include \
+	-I${top_srcdir}/../libnm-util
 
 bin_PROGRAMS = nm-editor
 
@@ -15,7 +17,6 @@ nm_editor_CPPFLAGS =									\
 	$(LIBGNOMEUI_CFLAGS)								\
 	$(PANEL_APPLET_CFLAGS)								\
 	$(GNOME_KEYRING_CFLAGS)								\
-	$(NM_CFLAGS)									\
 	-DICONDIR=\""$(datadir)/pixmaps"\"						\
 	-DGLADEDIR=\""$(datadir)/nm-applet"\"						\
 	-DBINDIR=\""$(bindir)"\"								\
@@ -57,8 +58,9 @@ nm_editor_LDADD =						\
 	$(GCONF_LIBS)						\
 	$(LIBGNOMEUI_LIBS)					\
 	$(GNOME_KEYRING_LIBS)				\
-	$(NM_LIBS) \
-	../libnma/libnma.la \
+	-L${top_srcdir}/../libnm-util \
+	$(top_builddir)/../libnm-util/libnm-util.la \
+	$(top_builddir)/libnma/libnma.la \
 	$(NULL)