diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog
index 8ce5637710..dd5766bc7c 100644
--- a/vpn-daemons/openvpn/ChangeLog
+++ b/vpn-daemons/openvpn/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-19  Dan Williams  <dcbw@redhat.com>
 
 	* properties/nm-openvpn.c
diff --git a/vpn-daemons/openvpn/Makefile.am b/vpn-daemons/openvpn/Makefile.am
index 1725afea96..43c3d9e8f2 100644
--- a/vpn-daemons/openvpn/Makefile.am
+++ b/vpn-daemons/openvpn/Makefile.am
@@ -22,10 +22,8 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = gnome-mime-application-x-openvpn-settings.png
 endif
 
-nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in Makefile
-	sed	-e 's|[@]BINDIR[@]|$(bindir)|g' \
-		< $(srcdir)/nm-openvpn-service.name.in \
-		> nm-openvpn-service.name
+nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
+	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
 
 EXTRA_DIST = nm-openvpn-service.name.in \
              $(dbusservice_DATA)  \
diff --git a/vpn-daemons/openvpn/nm-openvpn-service.name.in b/vpn-daemons/openvpn/nm-openvpn-service.name.in
index da11f3cce4..df7eb58a83 100644
--- a/vpn-daemons/openvpn/nm-openvpn-service.name.in
+++ b/vpn-daemons/openvpn/nm-openvpn-service.name.in
@@ -1,7 +1,7 @@
 [VPN Connection]
 name=openvpn
 service=org.freedesktop.NetworkManager.openvpn
-program=@BINDIR@/nm-openvpn-service
+program=@LIBEXECDIR@/nm-openvpn-service
 
 [GNOME]
 auth-dialog=nm-openvpn-auth-dialog
diff --git a/vpn-daemons/openvpn/properties/Makefile.am b/vpn-daemons/openvpn/properties/Makefile.am
index 3910aaaad2..daf00cc31c 100644
--- a/vpn-daemons/openvpn/properties/Makefile.am
+++ b/vpn-daemons/openvpn/properties/Makefile.am
@@ -1,6 +1,5 @@
-
-
-lib_LTLIBRARIES = libnm-openvpn-properties.la
+plugindir = $(libdir)/NetworkManager
+plugin_LTLIBRARIES = libnm-openvpn-properties.la
 
 libnm_openvpn_properties_la_SOURCES = \
 	nm-openvpn.c \
diff --git a/vpn-daemons/openvpn/src/Makefile.am b/vpn-daemons/openvpn/src/Makefile.am
index f19c144c6a..4a95da052c 100644
--- a/vpn-daemons/openvpn/src/Makefile.am
+++ b/vpn-daemons/openvpn/src/Makefile.am
@@ -1,7 +1,6 @@
 AM_CPPFLAGS =							\
 	$(DBUS_CFLAGS)						\
 	$(NETWORK_MANAGER_CFLAGS)				\
-	-Wall							\
 	-DDBUS_API_SUBJECT_TO_CHANGE				\
 	-DG_DISABLE_DEPRECATED					\
 	-DBINDIR=\"$(bindir)\"					\
@@ -13,7 +12,7 @@ AM_CPPFLAGS =							\
 	-DLOCALSTATEDIR=\""$(localstatedir)"\"		 	\
 	-DDATADIR=\"$(datadir)\"
 
-bin_PROGRAMS = nm-openvpn-service nm-openvpn-service-openvpn-helper
+libexec_PROGRAMS = nm-openvpn-service nm-openvpn-service-openvpn-helper
 
 nm_openvpn_service_SOURCES =				\
 				nm-openvpn-service.c	\
diff --git a/vpn-daemons/openvpn/src/nm-openvpn-service.c b/vpn-daemons/openvpn/src/nm-openvpn-service.c
index a053c5312a..fb9226aff9 100644
--- a/vpn-daemons/openvpn/src/nm-openvpn-service.c
+++ b/vpn-daemons/openvpn/src/nm-openvpn-service.c
@@ -53,7 +53,7 @@
 #include "nm-openvpn-service.h"
 #include "nm-utils.h"
 
-#define NM_OPENVPN_HELPER_PATH		BINDIR"/nm-openvpn-service-openvpn-helper"
+#define NM_OPENVPN_HELPER_PATH		LIBEXECDIR"/nm-openvpn-service-openvpn-helper"
 
 G_DEFINE_TYPE (NMOpenvpnPlugin, nm_openvpn_plugin, NM_TYPE_VPN_PLUGIN)