diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog
index e7d20ee28..beec53d72 100644
--- a/vpn-daemons/vpnc/ChangeLog
+++ b/vpn-daemons/vpnc/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-17  Tambet Ingo  <tambet@gmail.com>
 
 	* properties/nm-vpnc.c (vpnc_plugin_ui_class_init): Don't add empty
diff --git a/vpn-daemons/vpnc/Makefile.am b/vpn-daemons/vpnc/Makefile.am
index fafcd1792..70d5ed35b 100644
--- a/vpn-daemons/vpnc/Makefile.am
+++ b/vpn-daemons/vpnc/Makefile.am
@@ -22,10 +22,8 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = gnome-mime-application-x-cisco-vpn-settings.png
 endif
 
-nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in Makefile
-	sed	-e 's|[@]BINDIR[@]|$(bindir)|g' \
-		< $(srcdir)/nm-vpnc-service.name.in \
-		> nm-vpnc-service.name
+nm-vpnc-service.name: $(srcdir)/nm-vpnc-service.name.in
+	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
 
 EXTRA_DIST = nm-vpnc-service.name.in \
              $(dbusservice_DATA)  \
diff --git a/vpn-daemons/vpnc/nm-vpnc-service.name.in b/vpn-daemons/vpnc/nm-vpnc-service.name.in
index bfe9d673d..3914b406b 100644
--- a/vpn-daemons/vpnc/nm-vpnc-service.name.in
+++ b/vpn-daemons/vpnc/nm-vpnc-service.name.in
@@ -1,7 +1,7 @@
 [VPN Connection]
 name=vpnc
 service=org.freedesktop.NetworkManager.vpnc
-program=@BINDIR@/nm-vpnc-service
+program=@LIBEXECDIR@/nm-vpnc-service
 
 [GNOME]
 auth-dialog=nm-vpnc-auth-dialog
diff --git a/vpn-daemons/vpnc/properties/Makefile.am b/vpn-daemons/vpnc/properties/Makefile.am
index b0a6261df..7758acc07 100644
--- a/vpn-daemons/vpnc/properties/Makefile.am
+++ b/vpn-daemons/vpnc/properties/Makefile.am
@@ -1,6 +1,5 @@
-
-
-lib_LTLIBRARIES = libnm-vpnc-properties.la
+plugindir = $(libdir)/NetworkManager
+plugin_LTLIBRARIES = libnm-vpnc-properties.la
 
 libnm_vpnc_properties_la_SOURCES = \
 	pcf-file.c \
diff --git a/vpn-daemons/vpnc/src/Makefile.am b/vpn-daemons/vpnc/src/Makefile.am
index 13aa2da07..197886c7a 100644
--- a/vpn-daemons/vpnc/src/Makefile.am
+++ b/vpn-daemons/vpnc/src/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
 	$(NM_UTILS_CFLAGS) \
-	-Wall \
 	-DDBUS_API_SUBJECT_TO_CHANGE \
 	-DG_DISABLE_DEPRECATED \
 	-DBINDIR=\"$(bindir)\" \
@@ -16,7 +15,7 @@ AM_CPPFLAGS = \
 	-DLOCALSTATEDIR=\""$(localstatedir)"\" \
 	-DDATADIR=\"$(datadir)\"
 
-bin_PROGRAMS = nm-vpnc-service nm-vpnc-service-vpnc-helper
+libexec_PROGRAMS = nm-vpnc-service nm-vpnc-service-vpnc-helper
 
 nm_vpnc_service_SOURCES = \
 				nm-vpnc-service.c \
diff --git a/vpn-daemons/vpnc/src/nm-vpnc-service.c b/vpn-daemons/vpnc/src/nm-vpnc-service.c
index bde1ade9e..ba03f03e5 100644
--- a/vpn-daemons/vpnc/src/nm-vpnc-service.c
+++ b/vpn-daemons/vpnc/src/nm-vpnc-service.c
@@ -30,7 +30,7 @@ static const char *vpnc_binary_paths[] =
 	NULL
 };
 
-#define NM_VPNC_HELPER_PATH		BINDIR"/nm-vpnc-service-vpnc-helper"
+#define NM_VPNC_HELPER_PATH		LIBEXECDIR"/nm-vpnc-service-vpnc-helper"
 #define NM_VPNC_UDP_ENCAPSULATION_PORT	0 /* random port */
 
 typedef struct {