diff --git a/vpn-daemons/openvpn/ChangeLog b/vpn-daemons/openvpn/ChangeLog
index 7d58cb1921..b9a8a56609 100644
--- a/vpn-daemons/openvpn/ChangeLog
+++ b/vpn-daemons/openvpn/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-04  Tambet Ingo  <tambet@ximian.com>
+
+	* properties/nm-openvpn.c (impl_get_widget, impl_get_properties)
+        (import_from_file): s/tcp/tcp-client.
+
 2006-07-28  Christophe Merlet  <redfox@redfoxcenter.org>
 
 	* properties/nm-openvpn-dialog.glade.h: fixed typo.
diff --git a/vpn-daemons/openvpn/properties/nm-openvpn.c b/vpn-daemons/openvpn/properties/nm-openvpn.c
index a9cb3a2aaa..17ee3dba52 100644
--- a/vpn-daemons/openvpn/properties/nm-openvpn.c
+++ b/vpn-daemons/openvpn/properties/nm-openvpn.c
@@ -225,7 +225,7 @@ impl_get_widget (NetworkManagerVpnUI *self, GSList *properties, GSList *routes,
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_tap), TRUE);
       should_expand = TRUE;
     } else if ( (strcmp (key,   "proto") == 0) &&
-		(strcmp (value, "tcp") == 0) ) {
+		(strcmp (value, "tcp-client") == 0) ) {
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_tcp), TRUE);
       should_expand = TRUE;
     } else if (strcmp (key, "cipher") == 0) {
@@ -328,7 +328,7 @@ impl_get_properties (NetworkManagerVpnUI *self)
   data = g_slist_append (data, g_strdup ("remote"));
   data = g_slist_append (data, g_strdup (remote));
   data = g_slist_append (data, g_strdup ("proto"));
-  data = g_slist_append (data, use_tcp ? g_strdup ("tcp") : g_strdup("udp"));
+  data = g_slist_append (data, use_tcp ? g_strdup ("tcp-client") : g_strdup("udp"));
   data = g_slist_append (data, g_strdup ("ca"));
   data = g_slist_append (data, g_strdup (ca));
   data = g_slist_append (data, g_strdup ("cert"));
@@ -980,7 +980,7 @@ import_from_file (NetworkManagerVpnUIImpl *impl, const char *path)
 	should_expand = TRUE;
       }
 
-      if ( strcmp (proto, "tcp") == 0 ) {
+      if ( strcmp (proto, "tcp-client") == 0 ) {
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_tcp), TRUE);
 	should_expand = TRUE;
       }