diff --git a/GSv6Fwd/GSv6Fwd.vcxproj b/GSv6Fwd/GSv6Fwd.vcxproj
index 2bebbbe..ba82730 100644
--- a/GSv6Fwd/GSv6Fwd.vcxproj
+++ b/GSv6Fwd/GSv6Fwd.vcxproj
@@ -97,6 +97,9 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\libs\x86\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
+    <PostBuildEvent>
+      <Command>copy /Y  "$(SolutionDir)libs\x86\Debug\*" "$(TargetDir)"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -132,6 +135,9 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\libs\x86\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
+    <PostBuildEvent>
+      <Command>copy /Y  "$(SolutionDir)libs\x86\Release\*" "$(TargetDir)"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
diff --git a/GSv6FwdSetup/Product.wxs b/GSv6FwdSetup/Product.wxs
index 4888adf..3a14c97 100644
--- a/GSv6FwdSetup/Product.wxs
+++ b/GSv6FwdSetup/Product.wxs
@@ -30,7 +30,7 @@
 
   <Fragment>
     <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-      <Component Id="ProductComponent">
+      <Component Id="GSv6Fwd">
         <File Source="$(var.GSv6Fwd.TargetPath)" KeyPath="yes" Id="GSv6FwdExe">
           <fire:FirewallException Id="FwException"
                                   Scope="any"
@@ -52,6 +52,12 @@
         </ServiceInstall>
         <ServiceControl Id="StartService" Start="install" Stop="both" Remove="uninstall" Name="GSv6FwdSvc" Wait="yes" />
       </Component>
+      <Component Id="MiniupnpcDll">
+        <File Source="$(var.GSv6Fwd.TargetDir)\miniupnpc.dll" KeyPath="yes"/>
+      </Component>
+      <Component Id="LibnatpmpDll">
+        <File Source="$(var.GSv6Fwd.TargetDir)\libnatpmp.dll" KeyPath="yes"/>
+      </Component>
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/libs/include/miniupnpc/miniupnpc.h b/libs/include/miniupnpc/miniupnpc.h
index 8ddc282..e96e5bd 100644
--- a/libs/include/miniupnpc/miniupnpc.h
+++ b/libs/include/miniupnpc/miniupnpc.h
@@ -1,4 +1,4 @@
-/* $Id: miniupnpc.h,v 1.53 2018/05/07 11:05:16 nanard Exp $ */
+/* $Id: miniupnpc.h,v 1.55 2020/11/09 19:49:32 nanard Exp $ */
 /* vim: tabstop=4 shiftwidth=4 noexpandtab
  * Project: miniupnp
  * http://miniupnp.free.fr/
@@ -20,7 +20,7 @@
 #define UPNPDISCOVER_MEMORY_ERROR (-102)
 
 /* versions : */
-#define MINIUPNPC_VERSION	"2.1"
+#define MINIUPNPC_VERSION	"2.2.0"
 #define MINIUPNPC_API_VERSION	17
 
 /* Source port:
diff --git a/libs/include/miniupnpc/upnpdev.h b/libs/include/miniupnpc/upnpdev.h
index f4ae174..9b2cb43 100644
--- a/libs/include/miniupnpc/upnpdev.h
+++ b/libs/include/miniupnpc/upnpdev.h
@@ -1,8 +1,8 @@
-/* $Id: upnpdev.h,v 1.1 2015/08/28 12:14:19 nanard Exp $ */
+/* $Id: upnpdev.h,v 1.3 2020/05/29 15:57:42 nanard Exp $ */
 /* Project : miniupnp
- * Web : http://miniupnp.free.fr/
+ * Web : http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/
  * Author : Thomas BERNARD
- * copyright (c) 2005-2018 Thomas Bernard
+ * copyright (c) 2005-2020 Thomas Bernard
  * This software is subjet to the conditions detailed in the
  * provided LICENSE file. */
 #ifndef UPNPDEV_H_INCLUDED
@@ -20,7 +20,15 @@ struct UPNPDev {
 	char * st;
 	char * usn;
 	unsigned int scope_id;
-	char buffer[3];
+#if defined(__STDC_VERSION) && __STDC_VERSION__ >= 199901L
+	/* C99 flexible array member */
+	char buffer[];
+#elif defined(__GNUC__)
+	char buffer[0];
+#else
+	/* Fallback to a hack */
+	char buffer[1];
+#endif
 };
 
 /* freeUPNPDevlist()
diff --git a/libs/x86/Debug/miniupnpc.dll b/libs/x86/Debug/miniupnpc.dll
new file mode 100644
index 0000000..3a44254
Binary files /dev/null and b/libs/x86/Debug/miniupnpc.dll differ
diff --git a/libs/x86/Debug/miniupnpc.lib b/libs/x86/Debug/miniupnpc.lib
index 9caeb0a..4fd1092 100644
Binary files a/libs/x86/Debug/miniupnpc.lib and b/libs/x86/Debug/miniupnpc.lib differ
diff --git a/libs/x86/Debug/miniupnpc.pdb b/libs/x86/Debug/miniupnpc.pdb
index c656c19..6248595 100644
Binary files a/libs/x86/Debug/miniupnpc.pdb and b/libs/x86/Debug/miniupnpc.pdb differ
diff --git a/libs/x86/Release/miniupnpc.dll b/libs/x86/Release/miniupnpc.dll
new file mode 100644
index 0000000..f722e88
Binary files /dev/null and b/libs/x86/Release/miniupnpc.dll differ
diff --git a/libs/x86/Release/miniupnpc.lib b/libs/x86/Release/miniupnpc.lib
index 3964c29..c50065a 100644
Binary files a/libs/x86/Release/miniupnpc.lib and b/libs/x86/Release/miniupnpc.lib differ
diff --git a/libs/x86/Release/miniupnpc.pdb b/libs/x86/Release/miniupnpc.pdb
index 0e22b2c..6648361 100644
Binary files a/libs/x86/Release/miniupnpc.pdb and b/libs/x86/Release/miniupnpc.pdb differ