diff --git a/build_scripts/OBS b/build_scripts/OBS
index df16cb915..31fa63acb 160000
--- a/build_scripts/OBS
+++ b/build_scripts/OBS
@@ -1 +1 @@
-Subproject commit df16cb915465d058c75277678799ce4dadeae287
+Subproject commit 31fa63acb6394916ba605aa1a08e86ed47068708
diff --git a/build_scripts/Windows/build/build.bat b/build_scripts/Windows/build/build.bat
index 487647568..91ff71382 100644
--- a/build_scripts/Windows/build/build.bat
+++ b/build_scripts/Windows/build/build.bat
@@ -56,7 +56,7 @@ if "%ParamWebui%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_webui
 if "%ParamPlugins%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% retroshare_plugins
 if "%ParamUseNativeDialogs%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_use_native_dialogs
 if "%ParamService%" NEQ "1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% no_retroshare_service
-if "%ParamFriendServer%" NEQ "1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% no_rs_friendserver
+if "%ParamFriendServer%" NEQ "1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% no_retroshare_friendserver
 if "%ParamEmbeddedFriendServer%"=="1" set RS_QMAKE_CONFIG=%RS_QMAKE_CONFIG% rs_efs
 
 qmake "%SourcePath%\RetroShare.pro" -r -spec win32-g++ "CONFIG+=%RS_QMAKE_CONFIG%" "EXTERNAL_LIB_DIR=%BuildLibsPath%\libs"