diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog
index 11c5c4112..fb21010b4 100644
--- a/vpn-daemons/openvpn/ChangeLog
+++ b/vpn-daemons/openvpn/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-03  Dan Williams  <dcbw@redhat.com>
+
+	* nm-openvpn-service.name.in
+	  Makefile.am
+		- Remove paths from .name file (requires applet r776 or later) to fix
+			issues with multilib and magic path substitution in glibc
+
 2008-07-02  Dan Williams  <dcbw@redhat.com>
 
 	* properties/auth-helpers.c
diff --git a/vpn-daemons/openvpn/Makefile.am b/vpn-daemons/openvpn/Makefile.am
index 6a09044a7..1725afea9 100644
--- a/vpn-daemons/openvpn/Makefile.am
+++ b/vpn-daemons/openvpn/Makefile.am
@@ -24,8 +24,6 @@ endif
 
 nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in Makefile
 	sed	-e 's|[@]BINDIR[@]|$(bindir)|g' \
-		-e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-		-e 's|[@]PREFIX[@]|$(prefix)|g' \
 		< $(srcdir)/nm-openvpn-service.name.in \
 		> nm-openvpn-service.name
 
diff --git a/vpn-daemons/openvpn/nm-openvpn-service.name.in b/vpn-daemons/openvpn/nm-openvpn-service.name.in
index 3aa16f8cd..da11f3cce 100644
--- a/vpn-daemons/openvpn/nm-openvpn-service.name.in
+++ b/vpn-daemons/openvpn/nm-openvpn-service.name.in
@@ -4,6 +4,6 @@ service=org.freedesktop.NetworkManager.openvpn
 program=@BINDIR@/nm-openvpn-service
 
 [GNOME]
-auth-dialog=@LIBEXECDIR@/nm-openvpn-auth-dialog
-properties=@PREFIX@/${LIB}/libnm-openvpn-properties
+auth-dialog=nm-openvpn-auth-dialog
+properties=libnm-openvpn-properties