diff --git a/ChangeLog b/ChangeLog
index 179378f11..ef1bdf90b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-11  Christopher Aillon  <caillon@redhat.com>
+
+	Patch from Christian Persch <chpe@gnome.org>
+
+	* libnm-glib/Makefile.am:
+	* dispatcher-daemon/Makefile.am:
+	Use the correct variables, the correct paths, and correct ordering. (446315)
+
 2007-06-11  Tambet Ingo  <tambet@ximian.com>
 
 	* src/nm-device.c: Make the activation stage virtual functions take NMDevice
diff --git a/dispatcher-daemon/Makefile.am b/dispatcher-daemon/Makefile.am
index 933ab2b15..df2ad7c8b 100644
--- a/dispatcher-daemon/Makefile.am
+++ b/dispatcher-daemon/Makefile.am
@@ -1,26 +1,34 @@
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/include -I$(top_srcdir)/libnm-glib -I$(top_srcdir)/libnm-util
-
-
 NULL=
 
 sbin_PROGRAMS = NetworkManagerDispatcher
 
+NetworkManagerDispatcher_SOURCES =		\
+	NetworkManagerDispatcher.c		\
+	$(NULL)
+
 NetworkManagerDispatcher_CPPFLAGS = 		\
-	$(DBUS_CFLAGS)						\
-	$(GTHREAD_CFLAGS)					\
-	-Wall							\
-	-DDBUS_API_SUBJECT_TO_CHANGE			\
-	-DBINDIR=\"$(bindir)\"				\
-	-DDATADIR=\"$(datadir)\"				\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/utils			\
+	-I$(top_srcdir)/include			\
+	-I$(top_srcdir)/libnm-util		\
+	-I$(top_srcdir)/libnm-glib		\
+	-DDBUS_API_SUBJECT_TO_CHANGE		\
+	-DBINDIR=\"$(bindir)\"			\
+	-DDATADIR=\"$(datadir)\"		\
 	-DSYSCONFDIR=\"$(sysconfdir)\"		\
 	-DLOCALSTATEDIR=\"$(localstatedir)\"	\
 	$(NULL)
 
-NetworkManagerDispatcher_SOURCES =	NetworkManagerDispatcher.c
+NetworkManagerDispatcher_CFLAGS = 		\
+	$(DBUS_CFLAGS)				\
+	$(GTHREAD_CFLAGS)			\
+	-Wall					\
+	$(NULL)
 
 NetworkManagerDispatcher_LDADD =		\
-	$(DBUS_LIBS)	\
-	$(GTHREAD_LIBS)	\
-	$(top_builddir)/utils/libnmutils.la \
-	$(top_builddir)/libnm-glib/libnm-glib.la
-
+	$(top_builddir)/utils/libnmutils.la	\
+	$(top_builddir)/libnm-util/libnm-util.la\
+	$(top_builddir)/libnm-glib/libnm-glib.la\
+	$(DBUS_LIBS)				\
+	$(GTHREAD_LIBS)				\
+	$(NULL)
diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index 01acdec18..e8bc10583 100644
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -11,7 +11,7 @@ BUILT_SOURCES = \
 
 lib_LTLIBRARIES = libnm-glib.la
 
-libnm_glib_la_CPPFLAGS = \
+libnm_glib_la_CFLAGS = \
 	$(GLIB_CFLAGS)	\
 	$(DBUS_CFLAGS)
 
@@ -39,14 +39,16 @@ libnm_glib_la_SOURCES = \
 	nm-vpn-connection.c	\
 	nm-marshal-main.c
 
-libnm_glib_la_LDFLAGS = $(GLIB_LIBS) $(DBUS_LIBS) $(top_srcdir)/libnm-util/libnm-util.la
+libnm_glib_la_LIBADD = \
+	$(top_builddir)/libnm-util/libnm-util.la	\
+	$(GLIB_LIBS)					\
+	$(DBUS_LIBS)
 
 noinst_PROGRAMS = libnm-glib-test
 
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
-
 libnm_glib_test_SOURCES = libnm-glib-test.c
-libnm_glib_test_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) $(top_builddir)/libnm-glib/libnm-glib.la
+libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+libnm_glib_test_LDADD = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
 
 nm-marshal.h: Makefile.am nm-marshal.list
 	$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --header > \