diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 6f3dc1445..9d6e227ef 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -1,12 +1,14 @@
-Notepad++ v4.5 fixed bugs and added features (from v4.4) :
+Notepad++ v4.6 fixed bugs and added features (from v4.5) :
 
-1. Fix crash issue while the launch the session file which contains the same file in 2 views (clone mode). 
-2. Add the session file extension association feature.
-3. Enhance the read/write config.xml to avoid crash.
-4. Add new -ro and -noSession command line parameters.
-5. Fix Russian display problem in the shortcut mapper.
-6. Fix NPPN_SHUTDOWN notification bug.
-7. Add NPPM_ACTIVATEDOCMENU message.
+1. Add Notepad++ self-update capacity (optional).
+2. Fix save file dialog crash issue.
+3. Fix the crash issue while the length of config.xml is zero.
+4. Change the behaviour : When file is deleted from outside and switch back to Notepad++, user will be asked if he want to keep this file. If he answer yes, he will not be asked in the next time.
+5. Change Window title from "Notepad++ - file path" to "file path - Notepad++"
+6. Fix Run dialog bug: the executable file won't be executed even it is between the double quot.
+7. Add open relative file path from command line feature.
+8. Fix the crash issue when open a file which does not exist anymore from RFL (if its path exceed certain length).
+9. Fix the bug that the title doesn't be updated while file status changed and updated.
 
 Included plugins :
 
@@ -18,3 +20,4 @@ Included plugins :
 6. Quick text v0.02
 7. Light Explorer v1.4
 8. Hex editor v0.84
+9. Base64 ecoder/decoder v1.2
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 108c77d5a..f60e43e79 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -17,7 +17,7 @@
 
 ; Define the application name
 !define APPNAME "Notepad++"
-!define APPNAMEANDVERSION "Notepad++ v4.5"
+!define APPNAMEANDVERSION "Notepad++ v4.6"
 
 !define VERSION_MAJOR 4
 !define VERSION_MINOR 5
@@ -26,7 +26,7 @@
 Name "${APPNAMEANDVERSION}"
 InstallDir "$PROGRAMFILES\Notepad++"
 InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "..\bin\npp.4.5.Installer.exe"
+OutFile "..\bin\npp.4.6.Installer.exe"
 
 
 
@@ -696,15 +696,13 @@ SubSection "Plugins" Plugins
 		SetOutPath "$INSTDIR\plugins\doc"
 		File "..\bin\plugins\doc\quickText_README.txt"
 	SectionEnd
-/*
-	Section "XMLTools" XMLTools
-		Delete "$INSTDIR\plugins\XMLTools.dll"
+
+	Section "NppTools" NppTools
+		Delete "$INSTDIR\plugins\NppTools.dll"
 		SetOutPath "$INSTDIR\plugins"
-		File "..\bin\plugins\XMLTools.dll"
-		SetOutPath "$INSTDIR\plugins\doc"
-		File "..\bin\plugins\doc\XMLToolsReadMe.txt"
+		File "..\bin\plugins\NppTools.dll"
 	SectionEnd
-*/
+
 SubSectionEnd
 
 Section /o "As default html viewer" htmlViewer
@@ -713,6 +711,16 @@ Section /o "As default html viewer" htmlViewer
 	WriteRegStr HKLM "SOFTWARE\Microsoft\Internet Explorer\View Source Editor\Editor Name" "" "$INSTDIR\nppIExplorerShell.exe"
 SectionEnd
 
+Section "Auto-Updater" AutoUpdater
+	SetOutPath "$INSTDIR\updater"
+	File "..\bin\updater\GUP.exe"
+	File "..\bin\updater\libcurl.dll"
+	File "..\bin\updater\gup.xml"
+	File "..\bin\updater\License.txt"
+	File "..\bin\updater\gpl.txt"
+	File "..\bin\updater\readme.txt"
+	File "..\bin\updater\getDownLoadUrl.php"
+SectionEnd
 
 ;--------------------------------
 ;Descriptions
@@ -726,6 +734,7 @@ SectionEnd
     !insertmacro MUI_DESCRIPTION_TEXT ${autoCompletionComponent} 'Install the API files you need for the auto-completion feature (Ctrl+Space).'
     !insertmacro MUI_DESCRIPTION_TEXT ${Plugins} 'You may need those plugins to extend the capacity of Notepad++.'
     !insertmacro MUI_DESCRIPTION_TEXT ${htmlViewer} 'Open the html file in Notepad++ while you choose <view source> from IE.'
+    !insertmacro MUI_DESCRIPTION_TEXT ${AutoUpdater} 'Keep your Notepad++ update: Check this option to install an update module which searches Notepad++ update on Internet and install it for you.'
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;--------------------------------
@@ -827,10 +836,8 @@ SubSectionEnd
 SubSection un.Plugins
 	Section un.NPPTextFX
 		Delete "$INSTDIR\plugins\NPPTextFX.dll"
-		
 		Delete "$INSTDIR\plugins\NPPTextFX.ini"
 		Delete "$APPDATA\Notepad++\NPPTextFX.ini"
-		
 		Delete "$INSTDIR\plugins\NPPTextFX\AsciiToEBCDIC.bin"
 		Delete "$INSTDIR\plugins\NPPTextFX\libTidy.dll"
 		Delete "$INSTDIR\plugins\NPPTextFX\NPPTextFXdemo.TXT"
@@ -879,6 +886,7 @@ SubSection un.Plugins
 		Delete "$INSTDIR\plugins\NppExec.dll"
 		Delete "$INSTDIR\plugins\doc\NppExec.txt"
 		Delete "$INSTDIR\plugins\doc\NppExec_TechInfo.txt"
+		Delete "$INSTDIR\plugins\Config\NppExec.ini"
 		RMDir "$INSTDIR\plugins\"
 	SectionEnd
 	
@@ -888,13 +896,12 @@ SubSection un.Plugins
 		Delete "$INSTDIR\plugins\doc\quickText_README.txt"
 		RMDir "$INSTDIR\plugins\"
 	SectionEnd
-/*
-	Section un.XMLTools
-		Delete "$INSTDIR\plugins\XMLTools.dll"
-		Delete "$INSTDIR\plugins\doc\XMLToolsReadMe.txt"
+
+	Section un.NppTools
+		Delete "$INSTDIR\plugins\NppTools.dll"
 		RMDir "$INSTDIR\plugins\"
 	SectionEnd
-*/
+
 SubSectionEnd
 
 Section un.htmlViewer
@@ -902,6 +909,17 @@ Section un.htmlViewer
 	Delete "$INSTDIR\nppIExplorerShell.exe"
 SectionEnd
 
+Section un.AutoUpdater
+	Delete "$INSTDIR\updater\GUP.exe"
+	Delete "$INSTDIR\updater\libcurl.dll"
+	Delete "$INSTDIR\updater\gup.xml"
+	Delete "$INSTDIR\updater\License.txt"
+	Delete "$INSTDIR\updater\gpl.txt"
+	Delete "$INSTDIR\updater\readme.txt"
+	Delete "$INSTDIR\updater\getDownLoadUrl.php"
+	RMDir "$INSTDIR\updater\"
+SectionEnd  
+
 Section un.explorerContextMenu
 	Exec 'regsvr32 /u /s "$INSTDIR\nppcm.dll"'
 	Delete "$INSTDIR\nppcm.dll"
diff --git a/PowerEditor/src/icons/npp.ico.new b/PowerEditor/src/icons/npp.ico.new
deleted file mode 100644
index 4db817fd9..000000000
Binary files a/PowerEditor/src/icons/npp.ico.new and /dev/null differ