diff --git a/vpn-daemons/pptp/ChangeLog b/vpn-daemons/pptp/ChangeLog
index 66c2067904ae5ffc319e5f732bfc25aa9201588b..530f610ac2ec3e07cc909d085c3511421c4a2fa7 100644
--- a/vpn-daemons/pptp/ChangeLog
+++ b/vpn-daemons/pptp/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-27  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Michael Biebl <biebl@debian.org>
+
+	* Move service to $LIBEXECDIR, remove unneeded compilation flags, move
+		properties plugin to $LIBDIR/NetworkManager
+
 2008-07-21  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-pptp-service.c
diff --git a/vpn-daemons/pptp/Makefile.am b/vpn-daemons/pptp/Makefile.am
index 10e60c3c5e07ef8be82987cd8f2d615834f9a0fe..df8e8f57badfaf23fb65c990b53264d425333495 100644
--- a/vpn-daemons/pptp/Makefile.am
+++ b/vpn-daemons/pptp/Makefile.am
@@ -22,10 +22,8 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = gnome-mime-application-x-pptp-settings.png
 endif
 
-nm-pptp-service.name: $(srcdir)/nm-pptp-service.name.in Makefile
-	sed	-e 's|[@]BINDIR[@]|$(bindir)|g' \
-		< $(srcdir)/nm-pptp-service.name.in \
-		> nm-pptp-service.name
+nm-pptp-service.name: $(srcdir)/nm-pptp-service.name.in
+	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
 
 EXTRA_DIST = nm-pptp-service.name.in \
              $(dbusservice_DATA)  \
diff --git a/vpn-daemons/pptp/nm-pptp-service.name.in b/vpn-daemons/pptp/nm-pptp-service.name.in
index 8fcb1139364f7d5a0abefad71dc61ab194519fe7..b0cf2b0176b6dbf1d576e498a539dd4d428844e4 100644
--- a/vpn-daemons/pptp/nm-pptp-service.name.in
+++ b/vpn-daemons/pptp/nm-pptp-service.name.in
@@ -1,7 +1,7 @@
 [VPN Connection]
 name=pptp
 service=org.freedesktop.NetworkManager.pptp
-program=@BINDIR@/nm-pptp-service
+program=@LIBEXECDIR@/nm-pptp-service
 
 [GNOME]
 auth-dialog=nm-pptp-auth-dialog
diff --git a/vpn-daemons/pptp/properties/Makefile.am b/vpn-daemons/pptp/properties/Makefile.am
index f5453afc003fb90b39007d66a9da285f7d5ce030..3cf7472fef09925eee8122420cff01e9d6b04b62 100644
--- a/vpn-daemons/pptp/properties/Makefile.am
+++ b/vpn-daemons/pptp/properties/Makefile.am
@@ -1,4 +1,5 @@
-lib_LTLIBRARIES = libnm-pptp-properties.la
+plugindir = $(libdir)/NetworkManager
+plugin_LTLIBRARIES = libnm-pptp-properties.la
 
 libnm_pptp_properties_la_SOURCES = \
 	nm-pptp.c \
diff --git a/vpn-daemons/pptp/src/Makefile.am b/vpn-daemons/pptp/src/Makefile.am
index b2d01c1418f54b750932ef5db83daf6992834329..8bbbcc542aa2cd04c4204e150dc9a9552e077139 100644
--- a/vpn-daemons/pptp/src/Makefile.am
+++ b/vpn-daemons/pptp/src/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS =							\
 	$(DBUS_GLIB_CFLAGS)						\
 	$(GTHREAD_CFLAGS)					\
 	$(NM_UTILS_CFLAGS)				\
-	-Wall							\
 	-DDBUS_API_SUBJECT_TO_CHANGE				\
 	-DG_DISABLE_DEPRECATED					\
 	-DBINDIR=\"$(bindir)\"					\
@@ -15,10 +14,9 @@ AM_CPPFLAGS =							\
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
 	-DLOCALSTATEDIR=\""$(localstatedir)"\"		 	\
 	-DDATADIR=\"$(datadir)\"				\
-	-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\" \
-	-fPIC
+	-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\" 
 
-bin_PROGRAMS = nm-pptp-service
+libexec_PROGRAMS = nm-pptp-service
 
 nm_pptp_service_SOURCES = \
 				nm-pptp-service.c \