diff --git a/Versions/build.txt b/Versions/build.txt
index 00750edc0..b8626c4cf 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-3
+4
diff --git a/grepWinNP3/.editorconfig b/grepWinNP3/.editorconfig
index 5a252c432..15fd032c6 100644
--- a/grepWinNP3/.editorconfig
+++ b/grepWinNP3/.editorconfig
@@ -28,7 +28,7 @@ charset = utf-8
 charset = utf-8-sig
 
 [**.{rc}]
-charset = utf-16
+charset = latin1
 
 [src/resource.h]
-charset = utf-16
+charset = latin1
diff --git a/grepWinNP3/src/Resources/grepWin.rc b/grepWinNP3/src/Resources/grepWin.rc
index 85ea15d42..14fa7cb52 100644
--- a/grepWinNP3/src/Resources/grepWin.rc
+++ b/grepWinNP3/src/Resources/grepWin.rc
@@ -1,5 +1,5 @@
 // Microsoft Visual C++ generated resource script.
-//
+// encoding: CP-1252
 #include "..\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -21,6 +21,7 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -36,10 +37,11 @@ IDI_GREPWIN             ICON                    "grepWinNP3.ico"
 
 
 /////////////////////////////////////////////////////////////////////////////
-// Englisch (USA) resources
+// English (United States) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -159,8 +161,8 @@ BEGIN
     ICON            IDI_GREPWIN,IDC_STATIC,17,18,20,20,SS_CENTERIMAGE
     LTEXT           "",IDC_VERSIONINFO,50,18,206,8
     LTEXT           "",IDC_DATE,50,30,206,8
-    LTEXT           "Notepad3's grepWin(NP3)-mod of Stefan Küng's great tool!",IDC_NP3_DISCLAIMER,50,47,198,8
-    LTEXT           "Visit Stefan Küng's website",IDC_WEBLINK,50,68,150,8
+    LTEXT           "Notepad3's grepWin(NP3)-mod of Stefan K\xFCng's great tool!",IDC_NP3_DISCLAIMER,50,47,198,8
+    LTEXT           "Visit Stefan K\xFCng's website",IDC_WEBLINK,50,68,150,8
 END
 
 IDD_MULTILINEEDIT DIALOGEX 0, 0, 317, 135
@@ -399,15 +401,16 @@ BEGIN
     IDS_ERR_PATHNOTEXIST    "Path does not exist or is not accessible!"
 END
 
-#endif    // Englisch (USA) resources
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// Deutsch (Schweiz) resources
+// German (Switzerland) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DES)
 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_SWISS
+#pragma code_page(1252)
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -438,7 +441,7 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // Deutsch (Schweiz) resources
+#endif    // German (Switzerland) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/grepWinNP3/src/last/version.h b/grepWinNP3/src/last/version.h
index d14b6a6f3..9d34b8bea 100644
--- a/grepWinNP3/src/last/version.h
+++ b/grepWinNP3/src/last/version.h
@@ -6,13 +6,13 @@
 
 //#pragma message(__LOC__"Run the NAnt script to get proper version info")
 
-#define FILEVER         2, 1, 0, 7
-#define PRODUCTVER      2, 1, 0, 7
-#define STRFILEVER      "2.1.0.7\0"
-#define STRPRODUCTVER   "2.1.0.7\0"
+#define FILEVER         2, 1, 0, 8
+#define PRODUCTVER      2, 1, 0, 8
+#define STRFILEVER      "2.1.0.8\0"
+#define STRPRODUCTVER   "2.1.0.8\0"
 
 #define GREPWIN_VERMAJOR     2
 #define GREPWIN_VERMINOR     1
 #define GREPWIN_VERMICRO     0
-#define GREPWIN_VERBUILD     7
+#define GREPWIN_VERBUILD     8
 #define GREPWIN_VERDATE      "2020-05-04"
diff --git a/grepWinNP3/src/resource.h b/grepWinNP3/src/resource.h
index d8b6ce3a1..20e9be7f8 100644
Binary files a/grepWinNP3/src/resource.h and b/grepWinNP3/src/resource.h differ
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 0a1038493..3023508ac 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.504.3"
+    version="5.20.504.4"
     type="win32"
   />
   <description>Notepad3 BETA</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 9ca0c707c..5e7032c69 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -9,7 +9,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
 #define VERSION_REV 504
-#define VERSION_BUILD 3
+#define VERSION_BUILD 4
 #define SCINTILLA_VER 433
 #define ONIGURUMA_REGEX_VER 6.9.5
 #define UCHARDET_VER 2018.09.27