diff --git a/build_scripts/Windows/build.bat b/build_scripts/Windows/build.bat
index 89179e22c..06e6909c6 100644
--- a/build_scripts/Windows/build.bat
+++ b/build_scripts/Windows/build.bat
@@ -13,8 +13,7 @@ call "%~dp0build-libs\build-libs.bat"
 if errorlevel 1 %cecho% error "Failed to build libraries." & exit /B %ERRORLEVEL%
 
 %cecho% info "Build %SourceName%"
-call "%~dp0build\build.bat" release autologin jsonapi
-rem plugins
+call "%~dp0build\build.bat" release autologin jsonapi plugins
 if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL%
 
 %cecho% info "Pack %SourceName%"
diff --git a/build_scripts/Windows/build/pack.bat b/build_scripts/Windows/build/pack.bat
index d48d93a65..ffd301965 100644
--- a/build_scripts/Windows/build/pack.bat
+++ b/build_scripts/Windows/build/pack.bat
@@ -96,6 +96,7 @@ copy nul "%RsDeployPath%\portable" %Quite%
 echo copy binaries
 copy "%RsBuildPath%\retroshare-gui\src\%RsBuildConfig%\retroshare*.exe" "%RsDeployPath%" %Quite%
 copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
+if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
 
 echo copy extensions
 for /D %%D in ("%RsBuildPath%\plugins\*") do (
@@ -108,6 +109,7 @@ copy "%BuildLibsPath%\libs\bin\*.dll" "%RsDeployPath%" %Quite%
 
 echo copy dependencies
 call :copy_dependencies "%RsDeployPath%\retroshare.exe" "%RsDeployPath%"
+if exist "%RsDeployPath%\retroshare.dll" call :copy_dependencies "%RsDeployPath%\retroshare.dll" "%RsDeployPath%"
 
 echo copy Qt DLL's
 copy "%QtPath%\Qt%QtMainVersion1%Svg%QtMainVersion2%.dll" "%RsDeployPath%" %Quite%
@@ -196,8 +198,8 @@ endlocal
 exit /B 1
 
 :copy_extension
-if exist "%~1\%RsBuildConfig%\%~n1.dll" (
-	copy "%~1\%RsBuildConfig%\%~n1.dll" %2 %Quite%
+if exist "%~1\lib\%~n1.dll" (
+	copy "%~1\lib\%~n1.dll" %2 %Quite%
 )
 goto :EOF
 
diff --git a/build_scripts/Windows/installer/retroshare-Qt5.nsi b/build_scripts/Windows/installer/retroshare-Qt5.nsi
index ba4f3d0d2..77334569d 100644
--- a/build_scripts/Windows/installer/retroshare-Qt5.nsi
+++ b/build_scripts/Windows/installer/retroshare-Qt5.nsi
@@ -192,8 +192,9 @@ Section $(Section_Main) Section_Main
 
   ; Main binaries
   SetOutPath "$INSTDIR"
-  File /oname=retroshare.exe "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe"
-  File /oname=retroshare-service.exe "${RELEASEDIR}\retroshare-service\src\release\retroshare-service.exe"
+  File "${RELEASEDIR}\retroshare-gui\src\release\retroshare.exe"
+  File "${RELEASEDIR}\retroshare-service\src\release\retroshare-service.exe"
+  File /nonfatal "${RELEASEDIR}\libretroshare\src\lib\retroshare.dll"
 
   ; Qt binaries
   File "${QTDIR}\bin\Qt5Core.dll"
@@ -290,8 +291,8 @@ SectionEnd
 !endif
 
 # Plugins
-${!defineifexist} PLUGIN_FEEDREADER_EXISTS "${RELEASEDIR}\plugins\FeedReader\release\FeedReader.dll"
-${!defineifexist} PLUGIN_VOIP_EXISTS "${RELEASEDIR}\plugins\VOIP\release\VOIP.dll"
+${!defineifexist} PLUGIN_FEEDREADER_EXISTS "${RELEASEDIR}\plugins\FeedReader\lib\FeedReader.dll"
+${!defineifexist} PLUGIN_VOIP_EXISTS "${RELEASEDIR}\plugins\VOIP\lib\VOIP.dll"
 
 !ifdef PLUGIN_FEEDREADER_EXISTS
 !define /ifndef PLUGIN_EXISTS
@@ -305,14 +306,14 @@ ${!defineifexist} PLUGIN_VOIP_EXISTS "${RELEASEDIR}\plugins\VOIP\release\VOIP.dl
   !ifdef PLUGIN_FEEDREADER_EXISTS
     Section $(Section_Plugin_FeedReader) Section_Plugin_FeedReader
       SetOutPath "$DataDir\extensions6"
-      File "${RELEASEDIR}\plugins\FeedReader\release\FeedReader.dll"
+      File "${RELEASEDIR}\plugins\FeedReader\lib\FeedReader.dll"
     SectionEnd
   !endif
 
   !ifdef PLUGIN_VOIP_EXISTS
     Section $(Section_Plugin_VOIP) Section_Plugin_VOIP
       SetOutPath "$DataDir\extensions6"
-      File "${RELEASEDIR}\plugins\VOIP\release\VOIP.dll"
+      File "${RELEASEDIR}\plugins\VOIP\lib\VOIP.dll"
     SectionEnd
   !endif
   SectionGroupEnd