diff --git a/doc/history.txt b/doc/history.txt
index 0f2f8fe..230cdea 100644
--- a/doc/history.txt
+++ b/doc/history.txt
@@ -36,6 +36,22 @@ Issue #tracker at https://github.com/dpradov/keynote-nf/issues
 -------------
 
 
+v 1.7.9.6 Beta (03 jan 2016)
+--------------
+It includes the following issues:
+
+536 Various corrections and improvements (fixes also several bugs introduced in Beta 5)     
+217 Setting or Changing a node name using an Asian IME garble the name
+534 Corrections related to encoding (ANSI / UTF8)
+410 Unicode BOM characters randomly inserted into ANSI Virtual Node text files
+537 Possible elimination of images on a ReadOnly note (in W10)
+520 Scroll on note when switching notes (includes an important optimization, see issue)
+408 Show word count in status bar: makes keynote lag enormously with long texts
+495 Cannot display system file properties window
+328 Expression > Paste last result: Wrong behaviour after error in evaluation
+179 Should be 12PM not 12AM
+
+
 v 1.7.9.5 Beta (26 dec 2015)
 --------------
 It includes the following issues:
diff --git a/general/kn_Const.pas b/general/kn_Const.pas
index abff9f1..f9efcdf 100644
--- a/general/kn_Const.pas
+++ b/general/kn_Const.pas
@@ -92,9 +92,9 @@ procedure DefineConst;
 
 const
   Program_Name     = 'KeyNote NF';
-  Program_Version  = '1.7.9 Beta 5';
-  Program_Version_Number  = '1.7.9.5';
-  Program_Version_Date    = '26/12/2015';
+  Program_Version  = '1.7.9 Beta 6';
+  Program_Version_Number  = '1.7.9.6';
+  Program_Version_Date    = '03/01/2016';
   Program_License  = 'Free software, Open Source (Mozilla Public License 2.0)';
 
   Program_URL     = 'https://github.com/dpradov/keynote-nf'; //'http://keynote.prv.pl';
diff --git a/keynote.bdsproj b/keynote.bdsproj
index 174ac5d..78d9d5e 100644
--- a/keynote.bdsproj
+++ b/keynote.bdsproj
@@ -150,7 +150,7 @@
 			<VersionInfo Name="MajorVer">1</VersionInfo>
 			<VersionInfo Name="MinorVer">7</VersionInfo>
 			<VersionInfo Name="Release">9</VersionInfo>
-			<VersionInfo Name="Build">5</VersionInfo>
+			<VersionInfo Name="Build">6</VersionInfo>
 			<VersionInfo Name="Debug">False</VersionInfo>
 			<VersionInfo Name="PreRelease">False</VersionInfo>
 			<VersionInfo Name="Special">False</VersionInfo>
@@ -162,13 +162,13 @@
 		<VersionInfoKeys>
 			<VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
 			<VersionInfoKeys Name="FileDescription">KeyNote NF (New Features)</VersionInfoKeys>
-			<VersionInfoKeys Name="FileVersion">1.7.9.5</VersionInfoKeys>
+			<VersionInfoKeys Name="FileVersion">1.7.9.6</VersionInfoKeys>
 			<VersionInfoKeys Name="InternalName">KeyNote NF</VersionInfoKeys>
 			<VersionInfoKeys Name="LegalCopyright">(c) Daniel Prado 2007-15  (c) Marek Jedlinski, 2000-05</VersionInfoKeys>
 			<VersionInfoKeys Name="LegalTrademarks">Free software, MPL 2.0</VersionInfoKeys>
 			<VersionInfoKeys Name="OriginalFilename">keynote.exe</VersionInfoKeys>
 			<VersionInfoKeys Name="ProductName">KeyNote NF</VersionInfoKeys>
-			<VersionInfoKeys Name="ProductVersion">1.7.9 Beta 5</VersionInfoKeys>
+			<VersionInfoKeys Name="ProductVersion">1.7.9 Beta 6</VersionInfoKeys>
 			<VersionInfoKeys Name="Comments">Improvements over version 1.6.5 of Marek's KeyNote</VersionInfoKeys>
 			<VersionInfoKeys Name="X-Fnord"></VersionInfoKeys>
 			<VersionInfoKeys Name="X-URL">http://code.google.com/p/keynote-nf/</VersionInfoKeys>
diff --git a/keynote.res b/keynote.res
index 737ef09..106dac7 100644
Binary files a/keynote.res and b/keynote.res differ