diff --git a/Build/Changes.txt b/Build/Changes.txt
index 0a8442709..ac366f759 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -112,6 +112,7 @@ CHANGES:
 FIXES:
 --------------------------------------------------------
 [.xxx.x]- .
+[.218.2]- F/R: fixes some issues around RegEx zero-length match/findings.
 [.218.1]- ReplaceAll. avoid busy loop (infinity) while replacing zero-length-match (RegExpr).
 [.218.1]- F/R dialog don't change selection by typing search pattern.
 [.218.1]- F/R show wrap-around tooltip only if message boxes are hidden.
diff --git a/Versions/build.txt b/Versions/build.txt
index d00491fd7..0cfbf0888 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1
+2
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 61a33a8b6..06665dd08 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.21.218.1"
+    version="5.21.218.2"
     type="win32"
   />
   <description>Notepad3 rc</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 0db4f852e..5d4c2c359 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -9,7 +9,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 21
 #define VERSION_REV 218
-#define VERSION_BUILD 1
+#define VERSION_BUILD 2
 #define SCINTILLA_VER 446
 #define ONIGURUMA_REGEX_VER 6.9.6
 #define UCHARDET_VER 2018.09.27