diff --git a/autotests/settings/CMakeLists.txt b/autotests/settings/CMakeLists.txt
--- a/autotests/settings/CMakeLists.txt
+++ b/autotests/settings/CMakeLists.txt
@@ -15,6 +15,7 @@
     connectionsettingtest
     gsmsettingtest
     infinibandsettingtest
+    iptunnelsettingtest
     ipv4settingtest
     ipv6settingtest
     olpcmeshsettingtest
@@ -28,7 +29,6 @@
     wiredsettingtest
     wirelesssettingtest
     wirelesssecuritysettingtest
-    iptunnelsettingtest
 )
 
 if (${NETWORKMANAGER_VERSION} VERSION_EQUAL 1.1.92 OR ${NETWORKMANAGER_VERSION} VERSION_GREATER 1.1.92)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -59,6 +59,7 @@
     settings/cdmasetting.cpp
     settings/connectionsettings.cpp
     settings/gsmsetting.cpp
+    settings/iptunnelsetting.cpp
     settings/ipv4setting.cpp
     settings/ipv6setting.cpp
     settings/infinibandsetting.cpp
@@ -79,7 +80,6 @@
     settings/genericsetting.cpp
     settings/tunsetting.cpp
     settings/vxlansetting.cpp
-    settings/iptunnelsetting.cpp
 )
 
 set(DBUS_INTERFACE_SRCS
@@ -210,6 +210,7 @@
   GsmSetting
   GenericSetting
   InfinibandSetting
+  IpTunnelSetting
   Ipv4Setting
   Ipv6Setting
   OlpcMeshSetting
@@ -226,7 +227,6 @@
   WiredSetting
   WirelessSecuritySetting
   WirelessSetting
-  IpTunnelSetting
 
   RELATIVE settings
   REQUIRED_HEADERS NetworkManagerQt_SETTINGS_HEADERS
diff --git a/src/settings/iptunnelsetting.h b/src/settings/iptunnelsetting.h
--- a/src/settings/iptunnelsetting.h
+++ b/src/settings/iptunnelsetting.h
@@ -54,7 +54,7 @@
 public:
     typedef QSharedPointer<IpTunnelSetting> Ptr;
     typedef QList<Ptr> List;
-    enum Mode { DefaultMode, Ipip, Gre };
+    enum Mode { DefaultMode, Ipip, Gre, Sit, Isatap, Vti, Ip6ip6, Ipip6, Ip6gre, Vti6 };
 
     IpTunnelSetting();
     explicit IpTunnelSetting(const Ptr &other);