diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog
index 0fdffcc08a..26253495a2 100644
--- a/vpn-daemons/openvpn/ChangeLog
+++ b/vpn-daemons/openvpn/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-15  Tambet Ingo  <tambet@gmail.com>
+
+	* nm-openvpn-service.name.in: Use uppercase macros so that they get replaced
+	by the Makefile.
+
 2007-08-14  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-openvpn-service.c
diff --git a/vpn-daemons/openvpn/nm-openvpn-service.name.in b/vpn-daemons/openvpn/nm-openvpn-service.name.in
index 3b11d4d15b..d830aa1b82 100644
--- a/vpn-daemons/openvpn/nm-openvpn-service.name.in
+++ b/vpn-daemons/openvpn/nm-openvpn-service.name.in
@@ -1,8 +1,8 @@
 [VPN Connection]
 name=openvpn
 service=org.freedesktop.NetworkManager.openvpn
-program=@bindir@/nm-openvpn-service
+program=@BINDIR@/nm-openvpn-service
 
 [GNOME]
-auth-dialog=@libexecdir@/nm-openvpn-auth-dialog
-properties=@prefix@/${LIB}/libnm-openvpn-properties
+auth-dialog=@LIBEXECDIR@/nm-openvpn-auth-dialog
+properties=@LIBDIR@/libnm-openvpn-properties