diff --git a/miniupnpd/commonrdr.h b/miniupnpd/commonrdr.h
index 6d8ebab..f48009d 100644
--- a/miniupnpd/commonrdr.h
+++ b/miniupnpd/commonrdr.h
@@ -77,6 +77,7 @@ update_portmapping_desc_timestamp(const char * ifname,
 
 typedef enum {
 	RDR_TABLE_NAME,
+	RDR_NAT_TABLE_NAME,
 	RDR_NAT_PREROUTING_CHAIN_NAME,
 	RDR_NAT_POSTROUTING_CHAIN_NAME,
 	RDR_FORWARD_CHAIN_NAME,
diff --git a/miniupnpd/miniupnpd.c b/miniupnpd/miniupnpd.c
index 87661d9..34b2eda 100644
--- a/miniupnpd/miniupnpd.c
+++ b/miniupnpd/miniupnpd.c
@@ -1342,6 +1342,12 @@ init(int argc, char * * argv, struct runtime_vars * v)
 				break;
 #endif	/* ENABLE_MANUFACTURER_INFO_CONFIGURATION */
 #ifdef USE_NETFILTER
+			case UPNPTABLENAME:
+				set_rdr_name(RDR_TABLE_NAME, ary_options[i].value);
+				break;
+			case UPNPNATTABLENAME:
+				set_rdr_name(RDR_NAT_TABLE_NAME, ary_options[i].value);
+				break;
 			case UPNPFORWARDCHAIN:
 				set_rdr_name(RDR_FORWARD_CHAIN_NAME, ary_options[i].value);
 				break;
diff --git a/miniupnpd/netfilter_nft/nftnlrdr.c b/miniupnpd/netfilter_nft/nftnlrdr.c
index 724a87e..177dc43 100644
--- a/miniupnpd/netfilter_nft/nftnlrdr.c
+++ b/miniupnpd/netfilter_nft/nftnlrdr.c
@@ -84,12 +84,16 @@ init_redirect(void)
 						  nft_forward_chain, FILTER_CHAIN_TYPE, NF_INET_FORWARD, NF_IP_PRI_FILTER - 25);
 	}
 
+	if (result == 0 && strcmp(nft_nat_table, nft_table) != 0) {
+		result = table_op(NFT_MSG_NEWTABLE, NFPROTO_INET, nft_nat_table);
+	}
+
 	if (result == 0) {
-		result = chain_op(NFT_MSG_NEWCHAIN, NFPROTO_INET, nft_table,
+		result = chain_op(NFT_MSG_NEWCHAIN, NFPROTO_INET, nft_nat_table,
 						  nft_prerouting_chain, NAT_CHAIN_TYPE, NF_INET_PRE_ROUTING, NF_IP_PRI_NAT_DST);
 	}
 	if (result == 0) {
-		result = chain_op(NFT_MSG_NEWCHAIN, NFPROTO_INET, nft_table,
+		result = chain_op(NFT_MSG_NEWCHAIN, NFPROTO_INET, nft_nat_table,
 						  nft_postrouting_chain, NAT_CHAIN_TYPE, NF_INET_POST_ROUTING, NF_IP_PRI_NAT_SRC);
 	}
 
@@ -109,11 +113,14 @@ shutdown_redirect(void)
 					  nft_prerouting_chain, NAT_CHAIN_TYPE, NF_INET_PRE_ROUTING, NF_IP_PRI_NAT_DST);
 	}
 	if (result == 0) {
-		result = chain_op(NFT_MSG_DELCHAIN, NFPROTO_INET, nft_table,
+		result = chain_op(NFT_MSG_DELCHAIN, NFPROTO_INET, nft_nat_table,
 						  nft_postrouting_chain, NAT_CHAIN_TYPE, NF_INET_POST_ROUTING, NF_IP_PRI_NAT_SRC);
 	}
 	if (result == 0) {
-		result = table_op(NFT_MSG_DELTABLE, NFPROTO_INET, nft_table);
+		result = table_op(NFT_MSG_DELTABLE, NFPROTO_INET, nft_nat_table);
+	}
+	if (result == 0 && strcmp(nft_nat_table, nft_table) != 0) {
+		result = table_op(NFT_MSG_DELTABLE, NFPROTO_INET, nft_nat_table);
 	}
 
 	nft_mnl_disconnect();
@@ -136,6 +143,9 @@ set_rdr_name(rdr_name_type param, const char *string)
 	case RDR_TABLE_NAME:
 		nft_table = string;
 		break;
+	case RDR_NAT_TABLE_NAME:
+		nft_nat_table = string;
+		break;
 	case RDR_NAT_PREROUTING_CHAIN_NAME:
 		nft_prerouting_chain = string;
 		break;
diff --git a/miniupnpd/netfilter_nft/nftnlrdr_misc.c b/miniupnpd/netfilter_nft/nftnlrdr_misc.c
index 6b42c7d..88d5f79 100644
--- a/miniupnpd/netfilter_nft/nftnlrdr_misc.c
+++ b/miniupnpd/netfilter_nft/nftnlrdr_misc.c
@@ -64,6 +64,7 @@
 #define RULE_CACHE_VALID    1
 
 const char * nft_table = "miniupnpd";
+const char * nft_nat_table = "miniupnpd";
 const char * nft_prerouting_chain = "prerouting";
 const char * nft_postrouting_chain = "postrouting";
 const char * nft_forward_chain = "forward";
@@ -629,7 +630,7 @@ int
 refresh_nft_cache_peer(void)
 {
 	if (rule_list_peer_validate != RULE_CACHE_VALID) {
-		if (refresh_nft_cache(&head_peer, nft_table, nft_postrouting_chain, NFPROTO_INET, RULE_NAT) < 0)
+		if (refresh_nft_cache(&head_peer, nft_nat_table, nft_postrouting_chain, NFPROTO_INET, RULE_NAT) < 0)
 			return -1;
 		rule_list_peer_validate = RULE_CACHE_VALID;
 	}
@@ -640,7 +641,7 @@ int
 refresh_nft_cache_redirect(void)
 {
 	if (rule_list_redirect_validate != RULE_CACHE_VALID) {
-		if (refresh_nft_cache(&head_redirect, nft_table, nft_prerouting_chain, NFPROTO_INET, RULE_NAT) < 0)
+		if (refresh_nft_cache(&head_redirect, nft_nat_table, nft_prerouting_chain, NFPROTO_INET, RULE_NAT) < 0)
 			return -1;
 		rule_list_redirect_validate = RULE_CACHE_VALID;
 	}
@@ -877,7 +878,7 @@ rule_set_snat(uint8_t family, uint8_t proto,
 	}
 
 	nftnl_rule_set_u32(r, NFTNL_RULE_FAMILY, family);
-	nftnl_rule_set_str(r, NFTNL_RULE_TABLE, nft_table);
+	nftnl_rule_set_str(r, NFTNL_RULE_TABLE, nft_nat_table);
 	nftnl_rule_set_str(r, NFTNL_RULE_CHAIN, nft_postrouting_chain);
 
 	if (descr != NULL && *descr != '\0') {
@@ -955,7 +956,7 @@ rule_set_dnat(uint8_t family, const char * ifname, uint8_t proto,
 	}
 
 	nftnl_rule_set_u32(r, NFTNL_RULE_FAMILY, family);
-	nftnl_rule_set_str(r, NFTNL_RULE_TABLE, nft_table);
+	nftnl_rule_set_str(r, NFTNL_RULE_TABLE, nft_nat_table);
 	nftnl_rule_set_str(r, NFTNL_RULE_CHAIN, nft_prerouting_chain);
 
 	if (descr != NULL && *descr != '\0') {
diff --git a/miniupnpd/netfilter_nft/nftnlrdr_misc.h b/miniupnpd/netfilter_nft/nftnlrdr_misc.h
index 50f2358..1d1c7bf 100644
--- a/miniupnpd/netfilter_nft/nftnlrdr_misc.h
+++ b/miniupnpd/netfilter_nft/nftnlrdr_misc.h
@@ -11,6 +11,7 @@
 #include <sys/queue.h>
 
 extern const char * nft_table;
+extern const char * nft_nat_table;
 extern const char * nft_prerouting_chain;
 extern const char * nft_postrouting_chain;
 extern const char * nft_forward_chain;
diff --git a/miniupnpd/options.c b/miniupnpd/options.c
index 3a4efca..dd7293a 100644
--- a/miniupnpd/options.c
+++ b/miniupnpd/options.c
@@ -68,6 +68,8 @@ static const struct {
 	{ UPNPCLEANTHRESHOLD, "clean_ruleset_threshold"},
 	{ UPNPCLEANINTERVAL, "clean_ruleset_interval"},
 #ifdef USE_NETFILTER
+	{ UPNPTABLENAME, "upnp_table_name"},
+	{ UPNPNATTABLENAME, "upnp_nattable_name"},
 	{ UPNPFORWARDCHAIN, "upnp_forward_chain"},
 	{ UPNPNATCHAIN, "upnp_nat_chain"},
 	{ UPNPNATPOSTCHAIN, "upnp_nat_postrouting_chain"},
diff --git a/miniupnpd/options.h b/miniupnpd/options.h
index af4b831..bd193cb 100644
--- a/miniupnpd/options.h
+++ b/miniupnpd/options.h
@@ -57,6 +57,8 @@ enum upnpconfigoptions {
 	UPNPPCPMAXLIFETIME,		/* maximum lifetime for PCP mapping */
 	UPNPPCPALLOWTHIRDPARTY,		/* allow third-party requests */
 #ifdef USE_NETFILTER
+	UPNPTABLENAME,
+	UPNPNATTABLENAME,
 	UPNPFORWARDCHAIN,
 	UPNPNATCHAIN,
 	UPNPNATPOSTCHAIN,