diff --git a/[refs] b/[refs]
index a68dcb8aadf7..45e027eee34b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1b04c081e3fb0a08ac108737e4efa9f4830c916
+refs/heads/master: 1f494c0e040b001cf844280910d04ba7ebdc2898
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_core.c b/trunk/net/ipv4/netfilter/ip_conntrack_core.c
index 86f04e41dd8e..a7f0c821a9b2 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_core.c
@@ -512,6 +512,11 @@ init_conntrack(const struct ip_conntrack_tuple *tuple,
 		conntrack->master = exp->master;
 #ifdef CONFIG_IP_NF_CONNTRACK_MARK
 		conntrack->mark = exp->master->mark;
+#endif
+#if defined(CONFIG_IP_NF_TARGET_MASQUERADE) || \
+    defined(CONFIG_IP_NF_TARGET_MASQUERADE_MODULE)
+		/* this is ugly, but there is no other place where to put it */
+		conntrack->nat.masq_index = exp->master->nat.masq_index;
 #endif
 		nf_conntrack_get(&conntrack->master->ct_general);
 		CONNTRACK_STAT_INC(expect_new);