diff --git a/.gitignore b/.gitignore
index 5a9f8a4628..8bb4e64464 100644
--- a/.gitignore
+++ b/.gitignore
@@ -268,6 +268,9 @@ libs/libpcap-*/
 libs/libpcap-*.zip
 libs/libpq-*/
 libs/libpq-*.zip
+libs/mariadb-connector-c-*/
+libs/mariadb-connector-c-*.zip
+libs/lua-*.zip
 libs/SharpZipLib.*/
 libs/SharpZipLib.*.nupkg
 libs/nasm-*/
diff --git a/w32/lua-version.props b/w32/lua-version.props
index cf26ce001c..019e16bf85 100644
--- a/w32/lua-version.props
+++ b/w32/lua-version.props
@@ -2,7 +2,8 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <LuaVersion>5.3.5</LuaVersion>
+    <LuaVersion>5.3.6</LuaVersion>
+    <LuaBuildNumber>1</LuaBuildNumber>
   </PropertyGroup>
   <PropertyGroup>
     <LuaVersionImported>true</LuaVersionImported>
diff --git a/w32/lua.props b/w32/lua.props
index 72dc226000..b047d0894d 100644
--- a/w32/lua.props
+++ b/w32/lua.props
@@ -5,7 +5,7 @@
     <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <LuaLibDir>$(SolutionDir)libs\lua-$(LuaVersion)</LuaLibDir>
+    <LuaLibDir>$(SolutionDir)libs\lua-$(LuaVersion)_$(LuaBuildNumber)</LuaLibDir>
   </PropertyGroup>
 
   <!-- 
@@ -30,7 +30,7 @@
 
   <Target Name="luaBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/lua/$(luaVersion)/lua-$(luaVersion)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
+           package="https://github.com/freeswitch/windows-deps/releases/download/lua-v$(LuaVersion)_$(LuaBuildNumber)/lua-$(LuaVersion)_$(LuaBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
            expectfileordirectory="$(LuaLibDir)\binaries\$(Platform)\$(Configuration)\lua53.dll" 
            outputfolder=""
            outputfilename="" 
@@ -39,7 +39,7 @@
   </Target> 
   <Target Name="luaHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/lua/$(luaVersion)/lua-$(luaVersion)-headers.zip"
+           package="https://github.com/freeswitch/windows-deps/releases/download/lua-v$(LuaVersion)_$(LuaBuildNumber)/lua-$(LuaVersion)_$(LuaBuildNumber)-headers.zip"
            expectfileordirectory="$(LuaLibDir)\include\lua.h" 
            outputfolder=""
            outputfilename="" 
diff --git a/w32/mariadb-connector-c-version.props b/w32/mariadb-connector-c-version.props
index e2cd36f0a3..c9be1f77e0 100644
--- a/w32/mariadb-connector-c-version.props
+++ b/w32/mariadb-connector-c-version.props
@@ -4,7 +4,8 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <mariadb-connector-cVersion>3.0.9</mariadb-connector-cVersion>
+    <mariadb-connector-cVersion>3.4.9</mariadb-connector-cVersion>
+    <mariadb-connector-cBuildNumber>1</mariadb-connector-cBuildNumber>
   </PropertyGroup>
   <PropertyGroup>
     <mariadb-connector-cVersionImported>true</mariadb-connector-cVersionImported>
diff --git a/w32/mariadb-connector-c.props b/w32/mariadb-connector-c.props
index e9da7030d7..2dfceb9b79 100644
--- a/w32/mariadb-connector-c.props
+++ b/w32/mariadb-connector-c.props
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="UserMacros">
-    <mariadb-connector-clibDir>$(BaseDir)libs\mariadb-connector-c-$(mariadb-connector-cVersion)</mariadb-connector-clibDir>
+    <mariadb-connector-clibDir>$(BaseDir)libs\mariadb-connector-c-$(mariadb-connector-cVersion)_$(mariadb-connector-cBuildNumber)</mariadb-connector-clibDir>
   </PropertyGroup>
 
   <!-- 
@@ -35,7 +35,7 @@
 
   <Target Name="mariadb-connector-cBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/mariadb-connector-c/$(mariadb-connector-cVersion)/mariadb-connector-c-$(mariadb-connector-cVersion)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
+           package="https://github.com/freeswitch/windows-deps/releases/download/mariadb-connector-c-v$(mariadb-connector-cVersion)_$(mariadb-connector-cBuildNumber)/mariadb-connector-c-$(mariadb-connector-cVersion)_$(mariadb-connector-cBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
            expectfileordirectory="$(mariadb-connector-clibDir)\binaries\$(Platform)\$(Configuration)\libmariadb.dll" 
            outputfolder=""
            outputfilename="" 
@@ -44,7 +44,7 @@
   </Target> 
   <Target Name="mariadb-connector-cHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
       <DownloadPackageTask 
-           package="http://files.freeswitch.org/windows/packages/mariadb-connector-c/$(mariadb-connector-cVersion)/mariadb-connector-c-$(mariadb-connector-cVersion)-headers.zip"
+           package="https://github.com/freeswitch/windows-deps/releases/download/mariadb-connector-c-v$(mariadb-connector-cVersion)_$(mariadb-connector-cBuildNumber)/mariadb-connector-c-$(mariadb-connector-cVersion)_$(mariadb-connector-cBuildNumber)-headers.zip"
            expectfileordirectory="$(mariadb-connector-clibDir)\include\mysql.h" 
            outputfolder=""
            outputfilename=""