diff --git a/Versions/build.txt b/Versions/build.txt
index 696290484..af368af27 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-569
+584
diff --git a/distrib/Changes.txt b/distrib/Changes.txt
index a6c37bc9f..3fe16739e 100644
--- a/distrib/Changes.txt
+++ b/distrib/Changes.txt
@@ -2,6 +2,19 @@
 Rizonesoft Notepad3 CHANGES
 ==================================================
 
+--------------------------------------------------
+Version 2 Build 583 (11 October 2017)
+--------------------------------------------------
+~ Fix: syntax error on exit script.
+~ Cleanup AHK testing script, add test artifacts.
+~ Fix: Try to retrieve correct file version for Notepad3Portable creator.
+~ Fix: StatusBar Col display is not correct in case of Virtual Space Access.
+~ Generalized internal multi-byte codepage definitions (code cleanup).
+~ AHK test script for NP3 GUI tests.
+~ Fix: locale / language independant version patching batch for Notepad3Portable
+~ Fix: version patching for Notepad3 PortableApps build batch.
+~ Fix: Recode to ANSI (in case of Chinese ANSI code-page)
+
 --------------------------------------------------
 Version 2 Build 568 (8 October 2017)
 --------------------------------------------------
diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/appinfo.ini b/np3portableapp/Notepad3Portable/App/AppInfo/appinfo.ini
new file mode 100644
index 000000000..94beb39d1
--- /dev/null
+++ b/np3portableapp/Notepad3Portable/App/AppInfo/appinfo.ini
@@ -0,0 +1,25 @@
+[Format]
+Type=PortableAppsFormat
+Version=3.5
+[Details]
+Name=Notepad3Portable
+AppId=Notepad3Portable
+Publisher=Notepad3 Contibutors & Rizonesoft
+Homepage=https://rizonesoft.com
+Category=Development
+Description=A lightweight universal Texteditor
+Language=English
+[License]
+Shareable=true
+OpenSource=true
+Freeware=true
+CommercialUse=true
+[Dependencies]
+[Version]
+PackageVersion=2.17.1011.583
+DisplayVersion=2.17.1011.583
+[Control]
+Icons=1
+Start=Notepad3Portable.exe
+[Associations]
+FileTypes=txt,html,htm,xmp,php,asp,css,js,vb,vbs,c,cpp,h,rs,mak,java,pas,inc,bat,diff,ps1,ahk,au3,avs,cmake,iss,latex,lua,nsi,nsh,nfo,tcl,rb
diff --git a/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini b/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini
index c3d89a67a..3a5f01638 100644
Binary files a/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini and b/np3portableapp/Notepad3Portable/App/DefaultData/settings/Notepad3.ini differ
diff --git a/np3portableapp/Notepad3Portable/App/Notepad3/Notepad3.exe b/np3portableapp/Notepad3Portable/App/Notepad3/Notepad3.exe
new file mode 100644
index 000000000..ceee7fa86
Binary files /dev/null and b/np3portableapp/Notepad3Portable/App/Notepad3/Notepad3.exe differ
diff --git a/np3portableapp/Notepad3Portable/App/Notepad3/minipath.exe b/np3portableapp/Notepad3Portable/App/Notepad3/minipath.exe
new file mode 100644
index 000000000..a2a867522
Binary files /dev/null and b/np3portableapp/Notepad3Portable/App/Notepad3/minipath.exe differ
diff --git a/np3portableapp/Notepad3Portable/App/Notepad3/np3encrypt.exe b/np3portableapp/Notepad3Portable/App/Notepad3/np3encrypt.exe
new file mode 100644
index 000000000..fab1cbea5
Binary files /dev/null and b/np3portableapp/Notepad3Portable/App/Notepad3/np3encrypt.exe differ
diff --git a/np3portableapp/Notepad3Portable/App/Notepad3/x64/Notepad3.exe b/np3portableapp/Notepad3Portable/App/Notepad3/x64/Notepad3.exe
new file mode 100644
index 000000000..272ebfc65
Binary files /dev/null and b/np3portableapp/Notepad3Portable/App/Notepad3/x64/Notepad3.exe differ
diff --git a/np3portableapp/Notepad3Portable/App/Notepad3/x64/minipath.exe b/np3portableapp/Notepad3Portable/App/Notepad3/x64/minipath.exe
new file mode 100644
index 000000000..71ae7df2f
Binary files /dev/null and b/np3portableapp/Notepad3Portable/App/Notepad3/x64/minipath.exe differ
diff --git a/np3portableapp/Notepad3Portable/App/Notepad3/x64/np3encrypt.exe b/np3portableapp/Notepad3Portable/App/Notepad3/x64/np3encrypt.exe
new file mode 100644
index 000000000..e63b09bc3
Binary files /dev/null and b/np3portableapp/Notepad3Portable/App/Notepad3/x64/np3encrypt.exe differ
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 2824a3e7b..d9795e111 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="2.17.1008.568"
+    version="2.17.1011.583"
     type="win32"
   />
   <description>Notepad3</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index b293aaf65..9a54f0d83 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -1,5 +1,5 @@
 #define VERSION_MAJOR 2
 #define VERSION_MINOR 17
-#define VERSION_REV 1008
-#define VERSION_BUILD 568
+#define VERSION_REV 1011
+#define VERSION_BUILD 583
 #define SCINTILLA_VER 400