diff --git a/Docs/src/history.but b/Docs/src/history.but
index 52332a4c..0b1947db 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -1,5 +1,33 @@
 \A{history} Changelog and Release Notes
 
+\H{v2.0rc4} 2.0 Release Candidate 4
+
+Released on February 2nd, 2004
+
+\S1{v2.0rc4-cl} Changelog
+
+\S2{} Major Changes
+
+\b Fixed MBCS mishandling in exehead, InstallOptions and nsExec
+
+\S2{} Minor Changes
+
+\b Language files updates and fixes
+
+\b Fixed logging (NSIS_CONFIG_LOG)
+
+\b Fixed compile errors caused by removing some config.h options
+
+\b NSIS compiles without PSDK again
+
+\b Documentation fixes
+
+\S2{} Utilities and Plug-ins
+
+\b \L{../Contrib/NSISdl/ReadMe.txt}{NSISdl}: All potential and rare crashes should be completely fixed now
+
+\b \L{../Contrib/InstallOptions/Readme.html}{InstallOptions}: Fixed a rare crash related to ListItems and a small memory leak when using ValidateText
+
 \H{v2.0rc3} 2.0 Release Candidate 3
 
 Released on January 26th, 2004
diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi
index 6dbc1bc6..ad62d791 100644
--- a/Examples/makensis.nsi
+++ b/Examples/makensis.nsi
@@ -4,10 +4,10 @@
 !define VER_MAJOR 2
 !define VER_MINOR 0
 !define VER_REVISION 0
-!define VER_BUILD 16
+!define VER_BUILD 17
 
-!define VER_FILE "20rc3"
-!define VER_DISPLAY "2.0 release candidate 3"
+!define VER_FILE "20rc4"
+!define VER_DISPLAY "2.0 release candidate 4"
 
 ;--------------------------------
 ;Compile CVS Data Setup
diff --git a/Source/makenssi.cpp b/Source/makenssi.cpp
index ad402745..b1681e55 100644
--- a/Source/makenssi.cpp
+++ b/Source/makenssi.cpp
@@ -1,4 +1,4 @@
-const char *NSIS_VERSION="v2.0rc3";
+const char *NSIS_VERSION="v2.0rc4";
 
 /* 
   Nullsoft Scriptable Install System (NSIS)
diff --git a/Source/script.cpp b/Source/script.cpp
index 2e4c94ac..ff530f45 100644
--- a/Source/script.cpp
+++ b/Source/script.cpp
@@ -2073,7 +2073,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
         if (k == -1) PRINTHELP()
         SCRIPT_MSG("XPStyle: %s\n", line.gettoken_str(1));
         init_res_editor();
-        char* szXPManifest = k ? 0 : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\"><assemblyIdentity version=\"1.0.0.0\" processorArchitecture=\"X86\" name=\"Nullsoft.NSIS.exehead\" type=\"win32\"/><description>Nullsoft Install System v2.0rc3</description><dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" version=\"6.0.0.0\" processorArchitecture=\"X86\" publicKeyToken=\"6595b64144ccf1df\" language=\"*\" /></dependentAssembly></dependency></assembly>";
+        char* szXPManifest = k ? 0 : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\"><assemblyIdentity version=\"1.0.0.0\" processorArchitecture=\"X86\" name=\"Nullsoft.NSIS.exehead\" type=\"win32\"/><description>Nullsoft Install System v2.0rc4</description><dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" version=\"6.0.0.0\" processorArchitecture=\"X86\" publicKeyToken=\"6595b64144ccf1df\" language=\"*\" /></dependentAssembly></dependency></assembly>";
         res_editor->UpdateResource(MAKEINTRESOURCE(24), MAKEINTRESOURCE(1), MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), (unsigned char*)szXPManifest, k ? 0 : lstrlen(szXPManifest));
       }
       catch (exception& err) {