diff --git a/app.js b/app.js
index ce0061ec5..1e45568cd 100644
--- a/app.js
+++ b/app.js
@@ -29,6 +29,11 @@ function init() {
         // for chrome, add multistream cap
     }
     connection.jingle.pc_constraints = RTC.pc_constraints;
+    if (config.useIPv6) {
+        // https://code.google.com/p/webrtc/issues/detail?id=2828
+        if (!connection.jingle.pc_constraints.optional) connection.jingle.pc_constraints.optional = [];
+        connection.jingle.pc_constraints.optional.push({googIPv6: true});
+    }
 
     var jid = document.getElementById('jid').value || config.hosts.domain || window.location.hostname;
 
diff --git a/config.js b/config.js
index ee99d5411..98dc30d7c 100644
--- a/config.js
+++ b/config.js
@@ -5,6 +5,8 @@ var config = {
         bridge: 'jitsi-videobridge.lambada.jitsi.net' // FIXME: use XEP-0030
     },
 //  getroomnode: function (path) { return 'someprefixpossiblybasedonpath'; },
+//  useStunTurn: true, // use XEP-0215 to fetch STUN and TURN server
+//  useIPv6: true, // ipv6 support. use at your own risk
     useNicks: false,
     bosh: '//lambada.jitsi.net/http-bind' // FIXME: use xep-0156 for that
 };