2 files changed, 19 insertions, 75 deletions

diff --git a/ChangeLog b/ChangeLog
index d577aae..94da1ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
  (Format: Year/Month/Day)
-Changes for 1.1
+Changes for 1.1.1
 *08/09/14:
    * Fixed a minor pixmap resource leak (Henrik)
      FbTk/Menu.cc, FbTk/ImageControl.cc/hh
+*08/09/11:
+   * Fixed unshading crash (Mark)
+     src/FbWinFrame.cc
+   * Be aware of badly specified _NET_WM_ICONS (Mathias)
+     Ewmh.cc
+*08/09/03:
+   * Added windowmenu to distpackage (Mark)
+-----------------------------
+Changes for 1.1.0
 *08/09/01:
    * When the current menu item gets disabled, highlight its nearest neighbor
      and add separators to the focus model menu (Mark)
diff --git a/NEWS b/NEWS
index aaac123..c47b8d6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,78 +1,13 @@
-News in 1.1.0:
-    * Changed syntax for window cycling.
-      Instead of bitmask, the window cycling functions takes a list of
-      options enclosed in {} followed by pattern, similar to those used in 
-      the apps file.
-    * Added new placement policies {Row,Col}MinOverlapPlacement. They 
-      behave the same as {Row,Col}SmartPlacement when the window fits but
-      fall back on minimizing overlap with other windows instead of
-      CascadePlacement.
-    * New options to client patterns:
-      - focushidden
-      - fullscreen
-      - head
-      - iconhidden
-      - layer
-      - minimized
-      - maximized
-      - shaded
-      - stuck
-      - transient
-      - urgent
-      - workspace
-      - workspacename
-    * New commands:
-      - Attach
-      - ClientMenu
-      - Delay
-      - Focus
-      - ForEach
-      - GoToWindow
-      - If
-      - StartMoving
-      - StartResizing
-      - StartTabbing
-      - SetDecor
-      - SetTitle 
-      - SetTitleDialog
-      - SetLayer
-    * New modifiers to keys file:
-      - OnToolbar
-      - OnWindow
-      - OnTitlebar
-      - Double
-    * New resources:
-      - session.screen<N>.tabs.usePixmap: <boolean>
-      - session.screen<N>.maxIgnoreIncrement: <boolean>
-      - session.screen<N>.noFocusWhileTypingDelay: <int>
-      - session.screen<N>.maxDisable{Move,Resize}: <boolean>
-      - session.screen<N>.slit.acceptKdeDockapps: <boolean>
-    * New Resize modes:
-      NearestEdge, Left, Right, Top, Bottom.
-    * Style changes:
-      New window.label.(un)focused.{justify,border{Color,Width}},
-      which fallback to window.label.{justify,border{Color,Width}} before
-      - this has the backwards-incompatible effect that
-        toolbar.iconbar.(un)focused.* fallback first to toolbar.iconbar.* 
-        and then to window.label.* window.{justify,border{Color,Width}}
-      New style items: 
-      window.(un)focus.border{Width,Color}
-    * New or updated translations: 
-      - de_AT
-      - de_CH
-      - mk_MK
-      - zh_TW
-    * Added -list-commands command line option, which prints a list of 
-      valid fluxbox commands.
+News in 1.1.1:
+    * Opaque moving is now default.
 Bug fixes:
-    * #1809786, Fixed gcc 2.96 compile problem.
-    * #1787345, Fix crash when cycling focus and window closes.
-    * #1836182, Fix division by 0 error when resize increments are set to 
-      0 by an application.
-    * #1843325, Fix startup items in apps file with specified screen number
-    * #1786566, NLS entries for Mouse Tab Focus and Click Tab Focus were 
-      switched.
-    * #1806327, Fix `About' menu item with tcsh.
+    * Install issues.
+    * Maximize/Fullscreen for windows with non-northwest gravity.
+    * Randr < 1.2 checks.
+    * Workaround for badly specified _NET_WM_ICONS.
+    * Fixed unshade crash.
+    * Minor pixmap resource leak.
+
 See ChangeLog for more details.