diff --git a/Version.ps1 b/Version.ps1
index 061ac12f0..aeae4aec1 100644
--- a/Version.ps1
+++ b/Version.ps1
@@ -33,7 +33,7 @@ try
 {
 	$Major = 3
 	$Minor = [int]$(Get-Date -format yy)
-	$Revis = [int]$(Get-Date -format Mdd)
+	$Revis = [int]$(Get-Date -format MMdd)
 	if ($AppVeyorEnv) {
 		$Build = [int]($env:appveyor_build_number)
 	}
diff --git a/Versions/build.txt b/Versions/build.txt
index 634a08341..114370ffb 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-783
+795
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 3517bc353..ceef685ba 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="3.17.1228.783"
+    version="3.18.0102.795"
     type="win32"
   />
   <description>Notepad3</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index b0cfe152e..4769b32fa 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -4,8 +4,8 @@
 //                                                         //
 // //////////////////////////////////////////////////////////
 #define VERSION_MAJOR 3
-#define VERSION_MINOR 17
-#define VERSION_REV 1228
-#define VERSION_BUILD 783
+#define VERSION_MINOR 18
+#define VERSION_REV 0102
+#define VERSION_BUILD 795
 #define SCINTILLA_VER 402
 #define ONIGMO_REGEX_VER 6.1.3
diff --git a/test/TestFileVersion.cmd b/test/TestFileVersion.cmd
index 46d9d33a3..58eebc4c8 100644
--- a/test/TestFileVersion.cmd
+++ b/test/TestFileVersion.cmd
@@ -57,7 +57,7 @@ goto:EOF
 for /f "tokens=2 delims==" %%a in ('
     wmic OS Get localdatetime /value
 ') do set "dt=%%a"
-set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~4,2%" & set "DD=%dt:~6,2%"
+set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~5,1%" & set "DD=%dt:~6,2%"
 set "HH=%dt:~8,2%" & set "Min=%dt:~10,2%" & set "Sec=%dt:~12,2%"
 ::set "datestamp=%YYYY%%MM%%DD%" & set "timestamp=%HH%%Min%%Sec%"
 ::set "fullstamp=%YYYY%-%MM%-%DD%_%HH%-%Min%-%Sec%"