diff --git a/[refs] b/[refs]
index c55dde15e473..9520d46cf032 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40e0cb004a6d4a7ad577724e451e8dbd6cba5a89
+refs/heads/master: 3e8219806c33b64a00b0013f96f735451f30c64c
diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig
index 2a2bcb303bfa..80107d4909c5 100644
--- a/trunk/net/netfilter/Kconfig
+++ b/trunk/net/netfilter/Kconfig
@@ -165,7 +165,7 @@ config NF_CONNTRACK_FTP
 
 config NF_CONNTRACK_H323
 	tristate "H.323 protocol support (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && NF_CONNTRACK
+	depends on EXPERIMENTAL && NF_CONNTRACK && (IPV6 || IPV6=n)
 	help
 	  H.323 is a VoIP signalling protocol from ITU-T. As one of the most
 	  important VoIP protocols, it is widely used by voice hardware and