diff --git a/ChangeLog b/ChangeLog
index f54807b7..38e9d0cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@ Changes since version 0.64.0:
 - Organized the inspector panel a bit better.
 - Replaced bags with arrays wherever appropriate. This will improve 
   performance a bit.
+- Made the Gnome tasklist skip the windows with the "Skip window list" flag
+  enabled. (Bastien Nocera <hadess@hadess.net>)
 
 
 Changes since version 0.63.1:
diff --git a/src/gnome.c b/src/gnome.c
index 2082d63b..cc0bc9a8 100644
--- a/src/gnome.c
+++ b/src/gnome.c
@@ -202,7 +202,8 @@ wGNOMEUpdateClientListHint(WScreen *scr)
     count = 0;
     wwin = scr->focused_window;
     while (wwin) {
-	if (!wwin->flags.internal_window) {
+        if (!wwin->flags.internal_window &&
+            !wwin->client_flags.skip_window_list) {
 
 	    windows[count++] = wwin->client_win;
 	}
diff --git a/src/workspace.c b/src/workspace.c
index 33da5bed..6499d8f0 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -525,19 +525,11 @@ wWorkspaceForceChange(WScreen *scr, int workspace)
 		    wWindowUnmap(tmp);
 		}
                 /* also unmap miniwindows not on this workspace */
-                if (tmp->flags.miniaturized && !IS_OMNIPRESENT(tmp)
-		    && tmp->icon) {
-                    if (!wPreferences.sticky_icons) {
-                        XUnmapWindow(dpy, tmp->icon->core->window);
-			tmp->icon->mapped = 0;
-		    }
-#if 0
-		    else {
-			tmp->icon->mapped = 1;
-			/* Why is this here? -Alfredo */
-                        XMapWindow(dpy, tmp->icon->core->window);
-		    }
-#endif
+                if (!wPreferences.sticky_icons && tmp->flags.miniaturized &&
+                    tmp->icon && !IS_OMNIPRESENT(tmp)) {
+
+                    XUnmapWindow(dpy, tmp->icon->core->window);
+                    tmp->icon->mapped = 0;
                 }
 		/* update current workspace of omnipresent windows */
 		if (IS_OMNIPRESENT(tmp)) {