diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 83a81da34..1951e4699 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,23 +1,11 @@
-Notepad++ v6.2 includes a new User Defined Languge (UDL2) system, the key features of UDL2 are:
+Notepad++ v6.2.1 fixed bugs:
 
-1.  More keyword groups were added (more syntax highlighting can be defined):
-  - 3 folding groups
-  - 8 keyword groups
-  - 2 comment groups
-  - 1 number definitons
-  - 2 operators groups
-  - 8 delimiter sets
-2.  Multipart keywords are supported (for example: "else if" can be defined as a single keyword)
-3.  Whitespace is no longer mandatory as keyword separator: Operators, Delimiters and Folding keywords can be recognized with or without whitespace separators.
-4.  Numbers recognition support is greatly improved (prefix, suffix, range and extra symbols supported).
-5.  Operators and delimiters can be longer than one character.
-6.  The same characters can be used as comments AND operators.
-7.  Comments and delimiters support nesting (even within each other).
-8.  Improvments to Comments include:
-  - Comment folding
-  - Comment continuation
-  - Comment only start at the beginning of line
-9.  In the case of several comment pairs defined, comment open symbols match only with comment close symbols of the same order. (for example: /* C comment */, /+ D comment +/, but not /* mixed comment +/)
+1.  Fix link hotspot colourising issue.
+2.  Fix a regression bug about Configurator GUI: font setting controls are disabled.
+3.  Fix a crash issue due to the inconsistent userDefineLang.xml.
+4.  Fixed bug of UDL2 where "Folder in code" keywords were detected even outside of commnets.
+5.  Fixed for the hex number detection bug of UDL2 (for example, 0xfece57 ok, but not 0xfe57ce).
+6.  Fix a crash bug while file path as argument and its length is more than 260 characters.
 
 
 Included plugins:
diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb
index e180537d9..873d44dec 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 f6e25e5a2..811e02230 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.2"
+!define APPVERSION "6.2.1"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 2
+!define VERSION_MINOR 21
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
index e455601d4..7f58ec6c6 100644
--- a/PowerEditor/installer/packageAll.bat
+++ b/PowerEditor/installer/packageAll.bat
@@ -129,7 +129,7 @@ If ErrorLevel 1 PAUSE
 If ErrorLevel 1 PAUSE
 "C:\Program Files\7-Zip\7z.exe" a -r .\build\npp.bin.7z .\zipped.package.release\*
 If ErrorLevel 1 PAUSE
-"C:\Program Files (x86)\NSIS\Unicode\makensis.exe" nppSetup.nsi
+"C:\Program Files\NSIS\Unicode\makensis.exe" nppSetup.nsi
 
 
 @echo off
diff --git a/PowerEditor/src/config.model.xml b/PowerEditor/src/config.model.xml
index 9157bf20a..33341ac69 100644
--- a/PowerEditor/src/config.model.xml
+++ b/PowerEditor/src/config.model.xml
@@ -71,7 +71,7 @@
         <GUIConfig name="noUpdate">no</GUIConfig>
         <GUIConfig name="MaitainIndent">yes</GUIConfig>
         <GUIConfig name="MRU">yes</GUIConfig>
-        <GUIConfig name="URL">0</GUIConfig>
+        <GUIConfig name="URL">2</GUIConfig>
         <GUIConfig name="globalOverride" fg="no" bg="no" font="no" fontSize="no" bold="no" italic="no" underline="no" />
         <GUIConfig name="auto-completion" autoCAction="0" triggerFromNbChar="1" />
         <GUIConfig name="sessionExt"></GUIConfig>
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index 97fb3f051..c4024d50e 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.2")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.2.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("6.2\0")
-#define VERSION_DIGITALVALUE 6, 2, 0, 0
+#define VERSION_VALUE TEXT("6.21\0")
+#define VERSION_DIGITALVALUE 6, 2, 1, 0
 
 #ifdef UNICODE
 #define UNICODE_ANSI_MODE TEXT("(UNICODE)")