diff --git a/build/release-x64.bat b/build/release-x64.bat
index 65f4c09b..333c761f 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -45,3 +45,5 @@ xcopy /S /I ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\
 xcopy %LUA_BIN%\lua51.dll %XCHAT_DEST%
 xcopy /S /I /Q ..\po\locale %XCHAT_DEST%\locale
 xcopy /S /I /Q %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale
+echo 2> portable-build
+move portable-build %XCHAT_DEST%
diff --git a/build/release-x86.bat b/build/release-x86.bat
index 2286894b..a8c19d1f 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -45,3 +45,5 @@ xcopy /S /I ..\plugins\xdcc\xcxdcc.dll %XCHAT_DEST%\plugins\
 xcopy %LUA_BIN%\lua51.dll %XCHAT_DEST%
 xcopy /S /I /Q ..\po\locale %XCHAT_DEST%\locale
 xcopy /S /I /Q %GTK_BIN%\..\share\locale %XCHAT_DEST%\share\locale
+echo 2> portable-build
+move portable-build %XCHAT_DEST%
diff --git a/build/xchat-wdk-x64.iss b/build/xchat-wdk-x64.iss
index bb301209..b72a954e 100644
--- a/build/xchat-wdk-x64.iss
+++ b/build/xchat-wdk-x64.iss
@@ -78,7 +78,7 @@ Source: "plugins\xcewc.dll"; DestDir: "{app}\plugins"; Components: libs
 Source: "plugins\xcxdcc.dll"; DestDir: "{app}\plugins"; Components: libs
 
 Source: "xchat.exe"; DestDir: "{app}"; Components: libs
-Source: "xchat-portable.exe"; DestDir: "{app}"; Components: libs
+Source: "portable-mode"; DestDir: "{app}"; Tasks: portablemode
 
 Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Components: plugins\lua
 Source: "lua51.dll"; DestDir: "{app}"; Components: plugins\lua\luawdk
diff --git a/build/xchat-wdk-x86.iss b/build/xchat-wdk-x86.iss
index 5eae02d4..64367316 100644
--- a/build/xchat-wdk-x86.iss
+++ b/build/xchat-wdk-x86.iss
@@ -77,7 +77,7 @@ Source: "plugins\xcewc.dll"; DestDir: "{app}\plugins"; Components: libs
 Source: "plugins\xcxdcc.dll"; DestDir: "{app}\plugins"; Components: libs
 
 Source: "xchat.exe"; DestDir: "{app}"; Components: libs
-Source: "xchat-portable.exe"; DestDir: "{app}"; Components: libs
+Source: "portable-mode"; DestDir: "{app}"; Tasks: portablemode
 
 Source: "plugins\xclua.dll"; DestDir: "{app}\plugins"; Components: plugins\lua
 Source: "lua51.dll"; DestDir: "{app}"; Components: plugins\lua\luawdk