diff --git a/pri/vars.pri b/pri/vars.pri
index 309d4f3ba..a4669b587 100644
--- a/pri/vars.pri
+++ b/pri/vars.pri
@@ -13,7 +13,6 @@ APP_URL_ISSUES_NEW            = "https://github.com/martinrotter/rssguard/issues
 APP_URL_DOCUMENTATION         = "https://github.com/martinrotter/rssguard/blob/master/resources/docs/Documentation.md"
 APP_USERAGENT                 = "RSS Guard/$$APP_VERSION (github.com/martinrotter/rssguard)"
 APP_DONATE_URL                = "https://martinrotter.github.io/donate"
-APP_WIN_ARCH                  = "win64"
 
 message(rssguard: Welcome RSS Guard qmake script.)
 
diff --git a/src/librssguard/librssguard.pro b/src/librssguard/librssguard.pro
index 3be04e02d..41027c52b 100644
--- a/src/librssguard/librssguard.pro
+++ b/src/librssguard/librssguard.pro
@@ -13,6 +13,10 @@ APP_TYPE    = "core library"
 include(../../pri/vars.pri)
 include(../../pri/defs.pri)
 
+os2 {
+ LRELEASE = "lrelease-qt5"
+}
+
 message($$MSG_PREFIX: Shadow copy build directory \"$$OUT_PWD\".)
 message($$MSG_PREFIX: $$APP_NAME version is: \"$$APP_VERSION\".)
 message($$MSG_PREFIX: Detected Qt version: \"$$QT_VERSION\".)
diff --git a/src/rssguard/rssguard.pro b/src/rssguard/rssguard.pro
index 33992107a..e11bbef5b 100644
--- a/src/rssguard/rssguard.pro
+++ b/src/rssguard/rssguard.pro
@@ -9,11 +9,7 @@ include(../../pri/vars.pri)
 isEmpty(PREFIX) {
   message($$MSG_PREFIX: PREFIX variable is not set. This might indicate error.)
 
-  win32 {
-    PREFIX = $$OUT_PWD/app
-  }
-
-  android {
+  win32|os2|android {
     PREFIX = $$OUT_PWD/app
   }
 
@@ -52,7 +48,7 @@ unix: LIBS += -L$$OUT_PWD/../librssguard/ -lrssguard
 
 win32 {
   # Prepare files for NSIS.
-  SEDREPLACE = "| ForEach-Object { $_ -replace '@APP_VERSION@', '$$APP_VERSION' -replace '@APP_WIN_ARCH@', '$$APP_WIN_ARCH' -replace '@APP_REVISION@', '$$APP_REVISION' -replace '@APP_NAME@', '$$APP_NAME' -replace '@APP_LOW_NAME@', '$$APP_LOW_NAME' -replace '@EXE_NAME@', '$${APP_LOW_NAME}.exe' -replace '@PWD@', '$$replace(PWD, /, \\\\)' -replace '@OUT_PWD@', '$$replace(OUT_PWD, /, \\\\)' }"
+  SEDREPLACE = "| ForEach-Object { $_ -replace '@APP_VERSION@', '$$APP_VERSION' -replace '@APP_REVISION@', '$$APP_REVISION' -replace '@APP_NAME@', '$$APP_NAME' -replace '@APP_LOW_NAME@', '$$APP_LOW_NAME' -replace '@EXE_NAME@', '$${APP_LOW_NAME}.exe' -replace '@PWD@', '$$replace(PWD, /, \\\\)' -replace '@OUT_PWD@', '$$replace(OUT_PWD, /, \\\\)' }"
   message($$MSG_PREFIX: Sed replace string: \"$$SEDREPLACE\")
 
   FULLSEDCMD = "powershell -Command \"cat $$shell_path($$shell_quote($$PWD/../../resources/nsis/NSIS.definitions.nsh.in)) $$SEDREPLACE | Out-File $$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh))\""