diff --git a/ChangeLog b/ChangeLog
index 2c97f638..aeb7364f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0.0:
+*07/09/13:
+   * Move dock windows to Dock layer and remove decorations (Mark)
+     Ewmh.cc
 *07/09/09:
    * Added support for Slovak language ( Thanks Martin Lukac )
      nls/sk_SK/*
diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 0c5e164e..de4377bf 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -278,6 +278,8 @@ void Ewmh::setupFrame(FluxboxWindow &win) {
                 // we also assume it shouldn't be visible in any toolbar
                 win.setFocusHidden(true);
                 win.setIconHidden(true);
+                win.setDecoration(FluxboxWindow::DECOR_NONE);
+                win.moveToLayer(Layer::DOCK);
             } else if (atoms[l] == m_net_wm_window_type_desktop) {
                 /*
                  * _NET_WM_WINDOW_TYPE_DESKTOP indicates a "false desktop" window