diff --git a/Version.ps1 b/Version.ps1
index 3b3f11109..e0bb5166d 100644
--- a/Version.ps1
+++ b/Version.ps1
@@ -4,7 +4,8 @@
 # - adapt $Build number in case of local machine builds
 # ------------------------------------------------------------
 param(
-	[switch]$AppVeyorEnv = $false
+	[switch]$AppVeyorEnv = $false,
+	[string]$VerPatch = ""
 )
 # ------------------------------------------------------------
 Set-StrictMode -Version Latest
@@ -34,15 +35,11 @@ try
 	$Major = 3
 	$Minor = [int]$(Get-Date -format yy)
 	$Revis = [int]$(Get-Date -format MMdd)
-	$BetaVer = 'L" "'
-	$BetaVerA = '" "'
 	if ($AppVeyorEnv) {
 		$Build = [int]($env:appveyor_build_number)
 	}
 	else {
 		$Build = [int](Get-Content "Versions\build.txt") + 1
-		#$BetaVer  = 'L" develop "'
-		#$BetaVerA = '" develop "'
 	}
 	if (!$Build) { $Build = 0 }
 	$SciVer = [int](Get-Content "scintilla\version.txt")
@@ -51,7 +48,9 @@ try
 	if (!$OnigmoVer) { $OnigmoVer = "0.0.0" }
 	
 	$CompleteVer = "$Major.$Minor.$Revis.$Build"
-	DebugOutput("Version number: '$CompleteVer'")
+	DebugOutput("Version number: '$VerPatch v$CompleteVer'")
+
+if ($VerPatch) { $VerPatch = " $VerPatch" }  # ensure space in front of string
 
 	Copy-Item -LiteralPath "Versions\VersionEx.h.tpl" -Destination "src\VersionEx.h" -Force
 	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$MAJOR\$', "$Major" } | Set-Content "src\VersionEx.h"
@@ -60,8 +59,8 @@ try
 	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$BUILD\$', "$Build" } | Set-Content "src\VersionEx.h"
 	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$SCIVER\$', "$SciVer" } | Set-Content "src\VersionEx.h"
 	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$ONIGMOVER\$', "$OnigmoVer" } | Set-Content "src\VersionEx.h"
-	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$BETAVER\$', "$BetaVer" } | Set-Content "src\VersionEx.h"
-	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$BETAVERA\$', "$BetaVerA" } | Set-Content "src\VersionEx.h"
+	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "src\VersionEx.h"
+	(Get-Content "src\VersionEx.h") | ForEach-Object { $_ -replace '\$VERPATCH\$', "$VerPatch" } | Set-Content "src\VersionEx.h"
 	
 	Copy-Item -LiteralPath "Versions\Notepad3.exe.manifest.tpl" -Destination "res\Notepad3.exe.manifest.conf" -Force
 	(Get-Content "res\Notepad3.exe.manifest.conf") | ForEach-Object { $_ -replace '\$VERSION\$', $CompleteVer } | Set-Content "res\Notepad3.exe.manifest.conf"
diff --git a/Version_RC.cmd b/Version_RC.cmd
new file mode 100644
index 000000000..f821f134a
--- /dev/null
+++ b/Version_RC.cmd
@@ -0,0 +1,2 @@
+@echo off
+Version -VerPatch "RC"
diff --git a/Version_develop.cmd b/Version_develop.cmd
new file mode 100644
index 000000000..224eff83d
--- /dev/null
+++ b/Version_develop.cmd
@@ -0,0 +1,2 @@
+@echo off
+Version -VerPatch "develop"
diff --git a/Versions/VersionEx.h.tpl b/Versions/VersionEx.h.tpl
index 319d1f967..7182471bc 100644
Binary files a/Versions/VersionEx.h.tpl and b/Versions/VersionEx.h.tpl differ
diff --git a/Versions/build.txt b/Versions/build.txt
index f0a9f26fc..6a21a128a 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-916
+918
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 13aaeb291..51a0f6a10 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="3.18.303.916"
+    version="3.18.307.918"
     type="win32"
   />
   <description>Notepad3</description>
diff --git a/src/Notepad3.rc b/src/Notepad3.rc
index 2c0eef07b..7575de808 100644
--- a/src/Notepad3.rc
+++ b/src/Notepad3.rc
@@ -638,7 +638,7 @@ END
 // Dialog
 //
 
-IDD_ABOUT DIALOGEX 0, 0, 400, 275
+IDD_ABOUT DIALOGEX 0, 0, 400, 274
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About Notepad3"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -653,7 +653,7 @@ BEGIN
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,190,55,100,10
     CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZEIMAGE,305,7,130,20,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copy Version Text",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
-    CONTROL         "",IDC_RICHEDITABOUT,"RichEdit20W",WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
+    CONTROL         "",IDC_RICHEDITABOUT,"RichEdit20W",WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,168
 END
 
 IDD_FIND DIALOGEX 0, 0, 273, 129
diff --git a/src/Version.h b/src/Version.h
index 4e4027716..613caad23 100644
Binary files a/src/Version.h and b/src/Version.h differ
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 9156b81af..29bb6435f 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -5,9 +5,9 @@
 // //////////////////////////////////////////////////////////
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 18
-#define VERSION_REV 303
-#define VERSION_BUILD 916
+#define VERSION_REV 307
+#define VERSION_BUILD 918
 #define SCINTILLA_VER 403
 #define ONIGMO_REGEX_VER 6.1.3
-#define VERSION_BETA L" "
-#define VERSIONA_BETA " "
+#define VERSION_PATCH L""
+#define VERSIONA_PATCH ""