diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 751d44c70..7c06afe98 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,9 +1,10 @@
-Notepad++ v6 new features and enhancement:
-
-1.  PCRE (Perl Compatible Regular Expressions) is supported.
-2.  Add Document Map feature (via Menu "View->Document Map").
-3.  Enhance the loading performance for the large file.
+Notepad++ v6.1 fixed bugs:
 
+1.  Fix search/replace bug while Doc Map is opened.
+2.  Fix User Defined Language syntax highlighting problem while Doc Map is opened.
+3.  Fix Chinese characters showing problem while Doc Map is opened.
+4.  The old behaviour of comment/uncomment w/o selection is restored.
+5.  Fix selecting all the text in doc map while clicking on doc map dialog caption.
 
 Included plugins:
 
diff --git a/PowerEditor/bin/npp.pdb b/PowerEditor/bin/npp.pdb
index bf5eca866..1e8efed1d 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 6b016379f..b3b00d7db 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -18,10 +18,10 @@
 ; Define the application name
 !define APPNAME "Notepad++"
 
-!define APPVERSION "6.0"
+!define APPVERSION "6.1"
 !define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
 !define VERSION_MAJOR 6
-!define VERSION_MINOR 0
+!define VERSION_MINOR 1
 
 !define APPWEBSITE "http://notepad-plus-plus.org/"
 
diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
index a64e8ec81..e455601d4 100644
--- a/PowerEditor/installer/packageAll.bat
+++ b/PowerEditor/installer/packageAll.bat
@@ -62,14 +62,7 @@ mkdir .\zipped.package.release\unicode\plugins
 mkdir .\zipped.package.release\unicode\plugins\APIs
 mkdir .\zipped.package.release\unicode\plugins\Config
 mkdir .\zipped.package.release\unicode\plugins\doc
-mkdir .\zipped.package.release\ansi
-mkdir .\zipped.package.release\ansi\updater
-mkdir .\zipped.package.release\ansi\themes
-mkdir .\zipped.package.release\ansi\user.manual
-mkdir .\zipped.package.release\ansi\plugins
-mkdir .\zipped.package.release\ansi\plugins\APIs
-mkdir .\zipped.package.release\ansi\plugins\Config
-mkdir .\zipped.package.release\ansi\plugins\doc
+
 
 copy /Y ..\bin\license.txt .\zipped.package.release\unicode\
 If ErrorLevel 1 PAUSE
@@ -130,61 +123,6 @@ If ErrorLevel 1 PAUSE
 
 
 
-rem Notepad++ ANSI package
-del /F /S /Q .\zipped.package.release\ansi\*.*
-
-copy /Y ..\bin\SciLexer.dll .\zipped.package.release\ansi\
-If ErrorLevel 1 PAUSE
-copy /Y ..\bin\license.txt .\zipped.package.release\ansi\
-If ErrorLevel 1 PAUSE
-copy /Y ..\bin\readme.txt .\zipped.package.release\ansi\
-If ErrorLevel 1 PAUSE
-copy /Y ..\bin\change.log .\zipped.package.release\ansi\
-If ErrorLevel 1 PAUSE
-copy /Y ..\src\config.model.xml .\zipped.package.release\ansi\
-If ErrorLevel 1 PAUSE
-copy /Y ..\src\langs.model.xml .\zipped.package.release\ansi\
-If ErrorLevel 1 PAUSE
-copy /Y ..\src\stylers.model.xml .\zipped.package.release\ansi\
-If ErrorLevel 1 PAUSE
-copy /Y ..\src\contextMenu.xml .\zipped.package.release\ansi\
-If ErrorLevel 1 PAUSE
-copy /Y ..\src\shortcuts.xml .\zipped.package.release\ansi\
-If ErrorLevel 1 PAUSE
-copy /Y ..\bin\doLocalConf.xml .\zipped.package.release\ansi\
-If ErrorLevel 1 PAUSE
-copy /Y ..\bin-ansi\"notepad++.exe" .\zipped.package.release\ansi\
-If ErrorLevel 1 PAUSE
-
-rem Plugins
-copy /Y "..\bin-ansi\plugins\NppTextFXA.dll" .\zipped.package.release\ansi\plugins\
-If ErrorLevel 1 PAUSE
-copy /Y "..\bin-ansi\plugins\SpellChecker.dll" .\zipped.package.release\ansi\plugins\
-If ErrorLevel 1 PAUSE
-copy /Y "..\bin-ansi\plugins\NppExportA.dll" .\zipped.package.release\ansi\plugins\
-If ErrorLevel 1 PAUSE
-copy /Y "..\bin-ansi\plugins\LightExplorer.dll" .\zipped.package.release\ansi\plugins\
-If ErrorLevel 1 PAUSE
-copy /Y "..\bin-ansi\plugins\ComparePlugin.dll" .\zipped.package.release\ansi\plugins\
-If ErrorLevel 1 PAUSE
-copy /Y "..\bin-ansi\plugins\PluginManager.dll" .\zipped.package.release\ansi\plugins\
-If ErrorLevel 1 PAUSE
-copy /Y "..\bin-ansi\updater\gpup.exe" .\zipped.package.release\ansi\updater\
-If ErrorLevel 1 PAUSE
-
-rem document
-xcopy /Y /S ..\bin\user.manual\*.* .\zipped.package.release\ansi\user.manual\
-If ErrorLevel 1 PAUSE
-
-rem files API
-copy /Y ".\APIs\*.xml" .\zipped.package.release\ansi\plugins\APIs\
-If ErrorLevel 1 PAUSE
-
-rem theme
-copy /Y ".\themes\*.xml" .\zipped.package.release\ansi\themes\
-If ErrorLevel 1 PAUSE
-
-
 "C:\Program Files\7-Zip\7z.exe" a -r .\build\npp.bin.minimalist.7z .\minimalist\*
 If ErrorLevel 1 PAUSE
 "C:\Program Files\7-Zip\7z.exe" a -tzip -r .\build\npp.bin.zip .\zipped.package.release\*
diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h
index 0e216d052..653ff0b01 100644
--- a/PowerEditor/src/resource.h
+++ b/PowerEditor/src/resource.h
@@ -18,12 +18,12 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.0")
+#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.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.0\0")
-#define VERSION_DIGITALVALUE 6, 0, 0, 0
+#define VERSION_VALUE TEXT("6.1\0")
+#define VERSION_DIGITALVALUE 6, 1, 0, 0
 
 #ifdef UNICODE
 #define UNICODE_ANSI_MODE TEXT("(UNICODE)")