diff --git a/ChangeLog b/ChangeLog
index 12e8a6dce3..c1305db4ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-07  Behdad Esfahbod  <behdad@gnome.org>
+
+	Bug 563547 – Update gdkx11 atom precache table
+
+	* gdk/x11/gdkdisplay-x11.c: Add more atoms to precache.
+
 2008-12-05  Michael Natterer  <mitch@imendio.com>
 
 	Bug 546285 – Allow GtkEntry to draw progress
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 9f2dffcd04..0293f92c48 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -86,9 +86,16 @@ static const char *const precache_atoms[] = {
   "UTF8_STRING",
   "WM_CLIENT_LEADER",
   "WM_DELETE_WINDOW",
+  "WM_ICON_NAME",
   "WM_LOCALE_NAME",
+  "WM_NAME",
   "WM_PROTOCOLS",
   "WM_TAKE_FOCUS",
+  "WM_WINDOW_ROLE",
+  "_NET_ACTIVE_WINDOW",
+  "_NET_CURRENT_DESKTOP",
+  "_NET_FRAME_EXTENTS",
+  "_NET_STARTUP_ID",
   "_NET_WM_CM_S0",
   "_NET_WM_DESKTOP",
   "_NET_WM_ICON",
@@ -97,10 +104,15 @@ static const char *const precache_atoms[] = {
   "_NET_WM_PID",
   "_NET_WM_PING",
   "_NET_WM_STATE",
-  "_NET_WM_STATE_STICKY",
+  "_NET_WM_STATE_ABOVE",
+  "_NET_WM_STATE_BELOW",
+  "_NET_WM_STATE_FULLSCREEN",
+  "_NET_WM_STATE_MODAL",
   "_NET_WM_STATE_MAXIMIZED_VERT",
   "_NET_WM_STATE_MAXIMIZED_HORZ",
-  "_NET_WM_STATE_FULLSCREEN",
+  "_NET_WM_STATE_SKIP_TASKBAR",
+  "_NET_WM_STATE_SKIP_PAGER",
+  "_NET_WM_STATE_STICKY",
   "_NET_WM_SYNC_REQUEST",
   "_NET_WM_SYNC_REQUEST_COUNTER",
   "_NET_WM_WINDOW_TYPE",