diff --git a/Build/Changes.txt b/Build/Changes.txt
index 51f3a402c..0a8442709 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -32,7 +32,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 ========================================================
-Current BETA/RC Version 5.21.215.(build_#) (2021-02-15)
+Current BETA/RC Version 5.21.218.(build_#) (2021-02-18)
 ========================================================
 
 --------------------------------------------------------
@@ -67,6 +67,7 @@ NEW:
 CHANGES:
 --------------------------------------------------------
 [.xxx.x]- .
+[.218.1]- Find/Repl dialog - refactoring and minor fixes.
 [.213.1]- JSON5 enhancements to Scintilla's original JSON-Lexer.
 [.211.1]- Statusbar Selection-Info: switch to byte (instead of character) counting for huge files.
 [.205.1]- Revert minor insert date/time format changes.
@@ -111,6 +112,9 @@ CHANGES:
 FIXES:
 --------------------------------------------------------
 [.xxx.x]- .
+[.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.
 [.215.1]- JSON5 string line continuation.
 [.212.1]- Context-Menu Handling in Release Mode.
 [.211.1]- Burndown some VS Analyze Mode Infos/Warnings.
diff --git a/Versions/day.txt b/Versions/day.txt
index c34a8046f..dc6f4a877 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-215
+218
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 5c66f3277..61a33a8b6 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.21.215.1"
+    version="5.21.218.1"
     type="win32"
   />
   <description>Notepad3 rc</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 24d731315..0db4f852e 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 21
-#define VERSION_REV 215
+#define VERSION_REV 218
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 446
 #define ONIGURUMA_REGEX_VER 6.9.6