diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index d56eb2bd2..ed2f2325f 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,14 +1,14 @@
-Notepad++ v6.1.6 new features and fixed bugs:
+Notepad++ v6.1.7 new features and fixed bugs:
 
-1.  Fix (Walk around) Notepad++ hanging on CJK input with ANSI document while enabling word completion.
-2.  Enhance folding performance on large documents.
-3.  Check update without elevating to Administrator right.
-4.  Add update auto-detection for the environment vista/windows 7/Windows 8.
-5.  Fix bug: Doc switcher icon state not refreshed after '"save all" action.
-6.  Make Document map togglable via menu.
-7.  Enhance Find/Replace dialog result messages.
-8.  Fix a issue that "max number of recent files" cannot be set to 0.
-9.  Add font size 5, 6 and 7 in Style Configurator.
+1.  Fix config.xml zero length bug after Windows' update (Notepad++ is forced to quit).
+2.  Fix a crash issue on save as command.
+3.  Fix saving file fails silently bug.
+4.  Fix a buffer overflow bug.
+5.  Add case sensitive option for smart highlighting feature.
+6.  Enhance the localization system.
+7.  Fix a behavior issue on Windows shutdown.
+8.  Enhance comment operations: add stream Uncomment command and cross-calling of block feature.
+9.  Enhance TAB to space and space to TAB commands.
 
 
 Included plugins:
diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb
index cbad656f3..5ff9a91fa 100644
Binary files a/PowerEditor/bin/npp.pdb and b/PowerEditor/bin/npp.pdb differ
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 6d7c128e5..2ca5eb8e3 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -28,10 +28,10 @@
 ; Define the application name
 !define APPNAME "Notepad++"
 
-!define APPVERSION "6.1.6"
+!define APPVERSION "6.1.7"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 16
+!define VERSION_MINOR 17
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index be9a41cc5..0086d50df 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -29,12 +29,12 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.1.6")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.1.7")
 
 // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 
 // ex : #define VERSION_VALUE TEXT("5.63\0")
-#define VERSION_VALUE TEXT("6.16\0")
-#define VERSION_DIGITALVALUE 6, 1, 6, 0
+#define VERSION_VALUE TEXT("6.17\0")
+#define VERSION_DIGITALVALUE 6, 1, 7, 0
 
 #ifdef UNICODE
 #define UNICODE_ANSI_MODE TEXT("(UNICODE)")