diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 71af16ec6..d8109e1d0 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,24 +1,21 @@
-Notepad++ 7 new features and bug-fixes:
+Notepad++ 7.1 enhancements and bug-fixes:
+
+1.  Fix x64 crash on macro recording.
+2.  Fix x64 crash on new language dialog of UDL.
+3.  Check plugin architecture (32-bit or 64-bit) before loading.
+4.  Enhance Smart Highlighting feature: 1. match case 2. whole word only 3. use find dialog settings for both.
+5.  Fix poor performance of hex XML entities.
+6.  Reshow CallTip text on separator character.
+7.  Skip Auto-Complete self-closing HTML tags (<br>, <base>, <track>... etc).
+8.  Fix 2 UI issues for RTL layout.
+9.  Fix Folder as Workspace toolbar button inconsist behaviour.
+10. Add option to skip word completion on numbers (default: ON).
+11. Fix bookmarks toggled off's bug.
+12. Sort plugin menu by plugin name.
+13. Installer: Add 64-bit/32-bit old install detection, and old installation removal ability.
+14. Installer: Ask user for keeping user data during uninstallation.
+15. Installer: Fix uninstaller bug to not remove themes files from APPDATA.
 
-1.  64-bit build available.
-2.  Fix the DLL Hijacking Vulnerability of previous versions (by updating NSIS to v3.0).
-3.  Auto-updater improvement: periodical check can be disable via auto-update prompt dialog.
-4.  Installer enhancement: Check if Notepad++ is running and ask the user to close it before continue.
-5.  Enhancement: add conflict detection to Shortcut Mapper.
-6.  Fix auto-completion on XML comment <!-- comment --> and <?xml> tag bug.
-7.  Fix file saving crash which can be reproduced through a specific way to save file.
-8.  Fix a crash issue while UDL's user keyword list is too long.
-9.  Fix HDPI issues for some components (task list, margins and shortcut mapper).
-10. Add a new feature(optional) : Close the last document will quit Notepad++.
-11. Add more Change Case variants (Title Case, Sentence case, iVERT cASE, rANdOm caSe).
-12. Add Open file & open containing folder commands on selected file/folder name in text content.
-13. Add Search on Internet command on selected word(s) in text content.
-14. Add Scroll Tab Bar with mouse wheel capacity.
-15. Add commands for moving the current file tab Forward/Backward.
-16. Fix bug of monitoring not working for files under root.
-17. Ruby is supported by Function List.
-18. Added new option: Enable scrolling beyond last line.
-19. Add an option to restore old behaviour (open files in folder) while folder being dropped.
 
 Included plugins:
 
diff --git a/PowerEditor/installer/nsisInclude/gobalDef.nsh b/PowerEditor/installer/nsisInclude/gobalDef.nsh
index 6510946c7..c4749e118 100644
--- a/PowerEditor/installer/nsisInclude/gobalDef.nsh
+++ b/PowerEditor/installer/nsisInclude/gobalDef.nsh
@@ -29,10 +29,10 @@
 ; Define the application name
 !define APPNAME "Notepad++"
 
-!define APPVERSION "7"
+!define APPVERSION "7.1"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 7
-!define VERSION_MINOR 0
+!define VERSION_MINOR 1
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index b77f2b229..9441bd2bc 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -27,12 +27,12 @@
 #pragma once
 
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v7")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v7.1")
 
 // 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("7\0")
-#define VERSION_DIGITALVALUE 7, 0, 0, 0
+#define VERSION_VALUE TEXT("7.1\0")
+#define VERSION_DIGITALVALUE 7, 1, 0, 0