diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88cfbf5..31e3028 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,10 +82,8 @@ if(N2N_OPTION_USE_PORTMAPPING)
   ADD_DEFINITIONS("-DHAVE_MINIUPNP")
   include_directories(${THIRD_PARTY_DIR}/miniupnp/miniupnpc/include)
   include_directories(${PROJECT_BINARY_DIR}/lib_miniupnpc)
-  if(NOT DEFINED WIN32)
-    ADD_DEFINITIONS("-DHAVE_NATPMP")
-    include_directories(${THIRD_PARTY_DIR}/libnatpmp)
-  endif(NOT DEFINED WIN32)
+  ADD_DEFINITIONS("-DHAVE_NATPMP")
+  include_directories(${THIRD_PARTY_DIR}/libnatpmp)
 endif(N2N_OPTION_USE_PORTMAPPING)
 
 if(NOT DEFINED CMAKE_BUILD_TYPE)
@@ -173,11 +171,9 @@ if(N2N_OPTION_USE_PORTMAPPING)
   add_subdirectory(${THIRD_PARTY_DIR}/miniupnp/miniupnpc lib_miniupnpc)
   link_directories(${PROJECT_BINARY_DIR}/lib_miniupnpc)
   target_link_libraries(n2n libminiupnpc-static)
-  if(NOT DEFINED WIN32)
-    add_subdirectory(${THIRD_PARTY_DIR}/libnatpmp libnatpmp)
-    link_directories(${PROJECT_BINARY_DIR}/libnatpmp)
-    target_link_libraries(n2n natpmp)
-  endif(NOT DEFINED WIN32)
+  add_subdirectory(${THIRD_PARTY_DIR}/libnatpmp libnatpmp)
+  link_directories(${PROJECT_BINARY_DIR}/libnatpmp)
+  target_link_libraries(n2n natpmp)
 endif(N2N_OPTION_USE_PORTMAPPING)
 
 if(DEFINED WIN32)
diff --git a/thirdparty/libnatpmp b/thirdparty/libnatpmp
index 4536032..4b8b447 160000
--- a/thirdparty/libnatpmp
+++ b/thirdparty/libnatpmp
@@ -1 +1 @@
-Subproject commit 4536032ae32268a45c073a4d5e91bbab4534773a
+Subproject commit 4b8b4470d78af2c209824b3e5d0e06168532ee2c
diff --git a/thirdparty/miniupnp b/thirdparty/miniupnp
index 77876ae..78823d7 160000
--- a/thirdparty/miniupnp
+++ b/thirdparty/miniupnp
@@ -1 +1 @@
-Subproject commit 77876aea5fd926ef25dce9af6b264c7b53d2b134
+Subproject commit 78823d762e4f1a51a78a30f415de78fa3999ab7a