3 files changed, 94 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 7c4350f..8c6b0ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,82 @@
  (Format: Year/Month/Day)
 
 -----------------------------
+Changes for 1.3.6
+
+*15/01/02:
+        * Bugfix: Corruption of fbrun-history
+          (closes #72, #73 and patch #162, thanks to Mattias Guns,
+           'Nable 80' and Ulrich Eckhardt)
+
+*14/09/29:
+        * Feature: Treat Windows having WM_CLASS == "DockApp" set like DockApps
+
+*14/09/28:
+        * Bugfix: Fix border width for relative resizes (Thanks to Arkadiusz Bokowy)
+
+*14/09/14:
+        * Bugfix: Check correct XClassHint property (Thanks to Arkadiusz Bokowy)
+
+*14/07/22:
+        * Bugfix: Fix _NET_MOVERESIZE_WINDOW resize issue, closes #1108
+
+*14/05/12:
+        * Bugfix: Fix clocktool and other entities lagging behind the systemclock.
+
+*14/04/11:
+        * Build-System: Modernized variant of the autotools-based build system
+          fluxbox uses. Many thanks to Sami Kerola.
+
+14/04/09:
+        * Bugfix: Fix excessive loading of the keys file caused by xmodmap
+
+14/02/18:
+        * Bugfix: Fix race condition on shutdown
+
+14/02/05:
+        * Translation: Fix encoding of the Bulgarian translation
+      (Thanks Peter Pentchev)
+
+13/09/15:
+        * Bugfix: Fix integer math which caused problems with Focus, Resize and
+          Move commands. (Thanks Amadeusz S¿awi¿ski)
+
+13/08/02:
+        * Feature: Add 'ArrangeWindowsStack' (Thanks John Sennesael)
+        * Bugfix: Fix lost keypresses after workspace change (#1067)
+
+13/07/14:
+        * Translation: Update to Japanese translation (Thanks Takeshi Hamasaki)
+
+13/06/29:
+        * Code cleanup: Adjust use of std::equal_to to be more portable
+          with other implementations of STL (Thanks Raphael Kubo da Costa)
+        * Bugfix: Fix detection of $HOME folder
+
+13/06/18:
+        * Speedup: Use binary search to find longest possible text
+          to render. A malignant webpage could set a document title with something
+          like this: document.title = new Array(4999).join(".") and then fluxbox
+          would waste lots of cycles upon detecting the renderable width for that
+          title. Closes #1090
+        * Bugfix: Fix maximum length for text. XGlyphInfo.xOff is a signed short 
+          and thus it handles "only" ~32k pixels. A monospace font with a font-size
+          of 10 pixels will overflow after ~ 3276 glyphs.
+
+13/05/16:
+        * Bugfix: Fix Window-Motion-Outline
+
+13/03/18:
+        * Translation: Update to Hebrew translation (Thanks Isratine Citizen)
+
+13/02/27:
+        * Feature: Workspace switching via toolbar
+
+13/02/26:
+        * Bugfix: Fix initial window placement for better head detection
+      (Thanks Peter Hercek)
+
+-----------------------------
 Changes for 1.3.5
 
 *13/02/13:
diff --git a/NEWS b/NEWS
index 8a635bf..5572be7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,19 @@
-Version 1.3.5 is a bug fix release.
+Version 1.3.6 is a bug fix release.
 
-Critical Bugfixes in 1.3.5:
-    * Reenabled 'If' 'Or' 'And' actions again
+Critical Bugfixes:
+    * Clocktool problems
+    * Rendering long text
+    * Race condition on shutdown
+    * Lost keypresses after workspace switch
+    * Corruption of fbrun-history
 
+Minor Bugfixes:
+    * Resize and Move problems
+
+Features:
+    * 'ArrangeWindowsStack' action
+    * Treat Windows with WM_CLASS == "DockApp" as DockApps
+
+Minor:
+    * Updated translations (Bulgarian, Hebrew, Japanese)
+    * Updated build system
diff --git a/configure.ac b/configure.ac
index de6db38..65ee23e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Initialize autoconf and automake
 AC_PREREQ([2.52])
 AC_INIT([fluxbox],
-        [1.3.5],
+        [1.3.6],
         [fluxbox-devel@lists.sourceforge.net], [],
         [http://fluxbox.org/])
 AC_CONFIG_SRCDIR([src/fluxbox.cc])