diff --git a/components/lwip/Kconfig b/components/lwip/Kconfig
index f455c28fb7..d3be4246d0 100644
--- a/components/lwip/Kconfig
+++ b/components/lwip/Kconfig
@@ -227,6 +227,13 @@ menu "LWIP"
         help
             Enabling this option allows Network Address and Port Translation.
 
+    config LWIP_IPV4_NAPT_PORTMAP
+        bool "Enable NAT Port Mapping (new/experimental)"
+        depends on LWIP_IPV4_NAPT
+        default y
+        help
+            Enabling this option allows Port Forwarding or Port mapping.
+
     config LWIP_STATS
         bool "Enable LWIP statistics"
         default n
diff --git a/components/lwip/lwip b/components/lwip/lwip
index 7896c6cad0..90009cc2b0 160000
--- a/components/lwip/lwip
+++ b/components/lwip/lwip
@@ -1 +1 @@
-Subproject commit 7896c6cad020d17a986f7e850f603e084e319328
+Subproject commit 90009cc2b0b487ab12688778f5fffc27e9b2b8c3
diff --git a/components/lwip/port/include/lwipopts.h b/components/lwip/port/include/lwipopts.h
index 7dca4af288..183b7be80a 100644
--- a/components/lwip/port/include/lwipopts.h
+++ b/components/lwip/port/include/lwipopts.h
@@ -216,6 +216,13 @@ extern "C" {
  */
 #ifdef CONFIG_LWIP_IPV4_NAPT
 #define IP_NAPT                         1
+
+#ifdef CONFIG_LWIP_IPV4_NAPT_PORTMAP
+#define IP_NAPT_PORTMAP                 1
+#else
+#define IP_NAPT_PORTMAP                 0
+#endif
+
 #else
 #define IP_NAPT                         0
 #endif