diff --git a/ChangeLog b/ChangeLog
index 66064b8a8b..f1cc526943 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-12-04  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Michael Biebl <biebl@debian.org>
+
+	* system-settings/plugins/ifcfg/Makefile.am
+	  system-settings/src/main.c
+	  system-settings/src/Makefile.am
+		- Put system settings plugins in NM plugins dir
+
+	* src/ppp-manager/Makefile.am
+	  src/ppp-manager/nm-ppp-manager.c
+		- Move pppd plugin to NM plugins dir
+
 2007-12-04  Dan Williams  <dcbw@redhat.com>
 
 	* libnm-util/nm-setting-vpn-properties.h
diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index 5290f4dd08..d211fbaddf 100644
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -17,14 +17,15 @@ libppp_manager_la_CPPFLAGS = \
 	$(HAL_CFLAGS) \
 	-DG_DISABLE_DEPRECATED \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBDIR=\"$(libdir)\"
+	-DLIBDIR=\"$(libdir)\" \
+	-DPLUGINDIR=\"$(pkglibdir)\"
 
 libppp_manager_la_LIBADD = \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
 	$(top_builddir)/src/marshallers/libmarshallers.la
 
-lib_LTLIBRARIES = nm-pppd-plugin.la
+pkglib_LTLIBRARIES = nm-pppd-plugin.la
 
 nm_pppd_plugin_la_SOURCES = \
 	nm-pppd-plugin.c \
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index 0fc7adad6a..837119c10d 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -11,7 +11,7 @@
 #include "nm-utils.h"
 #include "nm-marshal.h"
 
-#define NM_PPPD_PLUGIN LIBDIR "/nm-pppd-plugin.so"
+#define NM_PPPD_PLUGIN PLUGINDIR "/nm-pppd-plugin.so"
 #define NM_PPP_WAIT_PPPD 10000 /* 10 seconds */
 
 typedef struct {
diff --git a/system-settings/plugins/ifcfg/Makefile.am b/system-settings/plugins/ifcfg/Makefile.am
index 3d65a06d3b..0ae42befab 100644
--- a/system-settings/plugins/ifcfg/Makefile.am
+++ b/system-settings/plugins/ifcfg/Makefile.am
@@ -1,5 +1,5 @@
 
-lib_LTLIBRARIES = libnm-settings-plugin-ifcfg.la
+pkglib_LTLIBRARIES = libnm-settings-plugin-ifcfg.la
 
 libnm_settings_plugin_ifcfg_la_SOURCES = \
 	shvar.c \
@@ -19,6 +19,7 @@ libnm_settings_plugin_ifcfg_la_CPPFLAGS = \
 	-I$(top_srcdir)/libnm-util \
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
+libnm_settings_plugin_ifcfg_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_ifcfg_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(GMODULE_LIBS) \
diff --git a/system-settings/src/Makefile.am b/system-settings/src/Makefile.am
index dc7ea24cf9..82ab8cd09e 100644
--- a/system-settings/src/Makefile.am
+++ b/system-settings/src/Makefile.am
@@ -13,18 +13,19 @@ nm_system_settings_SOURCES = \
 	nm-system-config-interface.h
 
 nm_system_settings_CPPFLAGS = \
-	$(DBUS_CFLAGS)									\
-	$(GTHREAD_CFLAGS)								\
+	$(DBUS_CFLAGS) \
+	$(GTHREAD_CFLAGS) \
 	$(GMODULE_CFLAGS) \
-	-DDBUS_API_SUBJECT_TO_CHANGE						\
-	-DG_DISABLE_DEPRECATED							\
-	-DBINDIR=\"$(bindir)\"							\
-	-DSBINDIR=\"$(sbindir)\"							\
-	-DLIBEXECDIR=\"$(libexecdir)\"					\
-	-DDATADIR=\"$(datadir)\"							\
-	-DSYSCONFDIR=\"$(sysconfdir)\"					\
-	-DLOCALSTATEDIR=\"$(localstatedir)\"				\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"
+	-DDBUS_API_SUBJECT_TO_CHANGE \
+	-DG_DISABLE_DEPRECATED	\
+	-DBINDIR=\"$(bindir)\" \
+	-DSBINDIR=\"$(sbindir)\" \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	-DDATADIR=\"$(datadir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DLOCALSTATEDIR=\"$(localstatedir)\" \
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+	-DPLUGINDIR=\"$(pkglibdir)\"
 
 nm_system_settings_LDADD = \
 	$(DBUS_LIBS) \
diff --git a/system-settings/src/main.c b/system-settings/src/main.c
index abc67c8950..d84f4ed4b5 100644
--- a/system-settings/src/main.c
+++ b/system-settings/src/main.c
@@ -149,7 +149,7 @@ load_plugins (Application *app, const char *plugins, GError **error)
 			continue;
 
 		full_name = g_strdup_printf ("nm-settings-plugin-%s", *pname);
-		path = g_module_build_path (NULL, full_name);
+		path = g_module_build_path (PLUGINDIR, full_name);
 
 		plugin = g_module_open (path, G_MODULE_BIND_LOCAL);
 		if (!plugin) {