diff --git a/Versions/build.txt b/Versions/build.txt
index f78b60d58..e9f960cf4 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-584
-=======
-586
->>>>>>> 652902a3d996c0e4b379c602bcccf72189f71df6
+600
diff --git a/distrib/Changes.txt b/distrib/Changes.txt
index 3fe16739e..15c00d0ab 100644
--- a/distrib/Changes.txt
+++ b/distrib/Changes.txt
@@ -2,6 +2,13 @@
 Rizonesoft Notepad3 CHANGES
 ==================================================
 
+--------------------------------------------------
+Version 2 Build 600 (15 October 2017)
+--------------------------------------------------
+~ Fix: Virtual space access: column indicator.
+~ Fix: Customize Schemes... Font... selection: bold/italic now detected 
+  (bold: if selection >= FW_SEMIBOLD)
+
 --------------------------------------------------
 Version 2 Build 583 (11 October 2017)
 --------------------------------------------------
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index d9795e111..1e59df875 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="2.17.1011.583"
+    version="2.17.1015.600"
     type="win32"
   />
   <description>Notepad3</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 9a54f0d83..0eea1ba8f 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -1,5 +1,5 @@
 #define VERSION_MAJOR 2
 #define VERSION_MINOR 17
-#define VERSION_REV 1011
-#define VERSION_BUILD 583
+#define VERSION_REV 1015
+#define VERSION_BUILD 600
 #define SCINTILLA_VER 400