diff -urNp NetworkManager-openswan-0.9.3.995-patched/src/nm-openswan-service.h NetworkManager-openswan-0.9.3.995-current/src/nm-openswan-service.h
--- NetworkManager-openswan-0.9.3.995-patched/src/nm-openswan-service.h	2012-10-18 12:46:37.007411996 -0400
+++ NetworkManager-openswan-0.9.3.995-current/src/nm-openswan-service.h	2012-12-13 14:59:40.872675723 -0500
@@ -54,6 +54,10 @@
 #define NM_OPENSWAN_PW_TYPE_ASK    "ask"
 #define NM_OPENSWAN_PW_TYPE_UNUSED "unused"
 
+#ifndef NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV_NONE
+#define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV_NONE "_none_"
+#endif
+
 typedef struct {
 	NMVPNPlugin parent;
 } NMOPENSWANPlugin;
diff -urNp NetworkManager-openswan-0.9.3.995-patched/src/nm-openswan-service-helper.c NetworkManager-openswan-0.9.3.995-current/src/nm-openswan-service-helper.c
--- NetworkManager-openswan-0.9.3.995-patched/src/nm-openswan-service-helper.c	2012-10-18 12:46:49.758445398 -0400
+++ NetworkManager-openswan-0.9.3.995-current/src/nm-openswan-service-helper.c	2012-12-13 14:59:07.560696232 -0500
@@ -266,13 +266,15 @@ main (int argc, char *argv[])
 	else
 		helper_failed (connection, "Openswan Pluto Right Peer (VPN Gateway)");
 
-	/* Tunnel device */
-	//val = str_to_gvalue (getenv ("TUNDEV"), FALSE);
-	val = str_to_gvalue ("tun0", FALSE);
-	if (val)
-		g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val);
-	else
-		helper_failed (connection, "Tunnel Device");
+	/* 
+	 * Tunnel device
+	 * Indicate that openswan plugin doesn't use tun/tap device
+	 */
+	val = g_slice_new0 (GValue);
+	g_value_init (val, G_TYPE_STRING);
+	g_value_set_string (val, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV_NONE);
+	g_hash_table_insert (config, NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV, val);
+
 
 	/* IP address */
 	val = addr_to_gvalue (getenv ("PLUTO_MY_SOURCEIP"));