diff --git a/vpn-daemons/openvpn/.cvsignore b/vpn-daemons/openvpn/.cvsignore
index f9cb8cd4e7..c9230f9a5e 100644
--- a/vpn-daemons/openvpn/.cvsignore
+++ b/vpn-daemons/openvpn/.cvsignore
@@ -23,10 +23,8 @@ libtool
 ltmain.sh
 missing
 mkinstalldirs
-nm-vpnc.desktop
-nm-vpnc-service
-nm-vpnc-service-vpnc-helper
-nm-vpnc-service.name
+nm-openvpn-service.name
+nm-openvpn.desktop
 stamp-h1
-COPYING
+COPYIN
 INSTALL
diff --git a/vpn-daemons/openvpn/auth-dialog/.cvsignore b/vpn-daemons/openvpn/auth-dialog/.cvsignore
index 9470bec570..8db5933547 100644
--- a/vpn-daemons/openvpn/auth-dialog/.cvsignore
+++ b/vpn-daemons/openvpn/auth-dialog/.cvsignore
@@ -1,3 +1,3 @@
 Makefile.in
 Makefile
-nm-vpnc-auth-dialog
+nm-openvpn-auth-dialog
diff --git a/vpn-daemons/openvpn/src/.cvsignore b/vpn-daemons/openvpn/src/.cvsignore
index 8f1636d8fb..ecd7517520 100644
--- a/vpn-daemons/openvpn/src/.cvsignore
+++ b/vpn-daemons/openvpn/src/.cvsignore
@@ -1,4 +1,4 @@
 Makefile.in
 Makefile
-nm-vpnc-service
-nm-vpnc-service-vpnc-helper
+nm-openvpn-service
+nm-openvpn-service-openvpn-helper
diff --git a/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c b/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
index 7fec499e78..587879135b 100644
--- a/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
+++ b/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
@@ -89,7 +89,6 @@ static gboolean send_config_info (DBusConnection *con,
   guint32		uint_ip4_nbns_len = 0;
   guint32		num_valid = 0, i = 0;
   gboolean        success = FALSE;
-  int             exit_code = 0;
 
   g_return_val_if_fail (con != NULL, FALSE);