diff --git a/build_scripts/Windows-msys2/build/env-base.bat b/build_scripts/Windows-msys2/build/env-base.bat
index 883884262..01a7a8f12 100644
--- a/build_scripts/Windows-msys2/build/env-base.bat
+++ b/build_scripts/Windows-msys2/build/env-base.bat
@@ -7,6 +7,7 @@ set ParamTor=0
 set ParamWebui=0
 set ParamClang=0
 set ParamIndexing=0
+set ParamFriendserver=0
 set ParamNoupdate=0
 set CoreCount=%NUMBER_OF_PROCESSORS%
 set RS_QMAKE_CONFIG=
@@ -58,6 +59,8 @@ if "%~1" NEQ "" (
 			set ParamClang=1
 		) else if "%%~a"=="indexing" (
 			set ParamIndexing=1
+		) else if "%%~a"=="friendserver" (
+			set ParamFriendserver=1
 		) else if "%%~a"=="noupdate" (
 			set ParamNoupdate=1
 		) else if "%%~a"=="CONFIG+" (
@@ -137,11 +140,15 @@ if "%ParamIndexing%"=="1" (
 	set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_deep_channels_index" "CONFIG+=rs_deep_files_index" "CONFIG+=rs_deep_files_index_ogg" "CONFIG+=rs_deep_files_index_flac" "CONFIG+=rs_deep_files_index_taglib"
 )
 
+if "%ParamFriendserver%"=="1" (
+	set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% "CONFIG+=rs_efs"
+)
+
 exit /B 0
 
 :usage
 echo.
-echo Usage: 32^|64^|other release^|debug [autologin plugins webui singlethread clang indexing noupdate] ["CONFIG+=..."]
+echo Usage: 32^|64^|other release^|debug [autologin plugins webui singlethread clang indexing friendserver noupdate] ["CONFIG+=..."]
 echo.
 echo Mandatory parameter
 echo 32^|64              32-bit or 64-bit version (same as mingw32 or mingw64)
@@ -157,6 +164,7 @@ echo webui              Enable JsonAPI and pack webui files
 echo singlethread       Use only 1 thread for building
 echo clang              Use clang compiler instead of GCC
 echo indexing           Build with deep channel and file indexing support
+echo friendserver       Enable friendserver support
 echo noupdate           Skip updating the libraries
 echo "CONFIG+=..."      Enable some extra features, you can find the almost complete list in retroshare.pri
 echo.
diff --git a/build_scripts/Windows-msys2/build/pack.bat b/build_scripts/Windows-msys2/build/pack.bat
index 4948c1541..ceefd0144 100644
--- a/build_scripts/Windows-msys2/build/pack.bat
+++ b/build_scripts/Windows-msys2/build/pack.bat
@@ -105,6 +105,9 @@ copy "%RsBuildPath%\retroshare-nogui\src\%RsBuildConfig%\retroshare*-nogui.exe"
 copy "%RsBuildPath%\retroshare-service\src\%RsBuildConfig%\retroshare*-service.exe" "%RsDeployPath%" %Quite%
 copy "%RsBuildPath%\supportlibs\cmark\build\src\libcmark.dll" "%RsDeployPath%" %Quite%
 if exist "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" copy "%RsBuildPath%\libretroshare\src\lib\retroshare.dll" "%RsDeployPath%" %Quite%
+if exist "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" (
+	copy "%RsBuildPath%\retroshare-friendserver\src\%RsBuildConfig%\retroshare-friendserver.exe" "%RsDeployPath%" %Quite%
+)
 
 echo copy extensions
 for /D %%D in ("%RsBuildPath%\plugins\*") do (
diff --git a/retroshare-friendserver/src/retroshare-friendserver.pro b/retroshare-friendserver/src/retroshare-friendserver.pro
index 61c604e43..a566a0927 100644
--- a/retroshare-friendserver/src/retroshare-friendserver.pro
+++ b/retroshare-friendserver/src/retroshare-friendserver.pro
@@ -44,6 +44,7 @@ unix {
 win32-g++|win32-clang-g++ {
     dLib = ws2_32 iphlpapi crypt32
     LIBS *= $$linkDynamicLibs(dLib)
+    CONFIG += console
 }
 
 ################################### COMMON stuff ##################################
diff --git a/retroshare-service/src/retroshare-service.pro b/retroshare-service/src/retroshare-service.pro
index 2c7a3d094..6458e03ed 100644
--- a/retroshare-service/src/retroshare-service.pro
+++ b/retroshare-service/src/retroshare-service.pro
@@ -87,12 +87,7 @@ macx {
 ################################# Windows ##########################################
 
 win32-g++|win32-clang-g++ {
-	CONFIG(debug, debug|release) {
-		# show console output
-		CONFIG += console
-	} else {
-		CONFIG -= console
-	}
+	CONFIG += console
 
 	CONFIG(debug, debug|release) {
 	} else {