diff --git a/conf/intel/portage/package.unmask b/conf/intel/portage/package.unmask
index f8798b0..7b8cead 100644
--- a/conf/intel/portage/package.unmask
+++ b/conf/intel/portage/package.unmask
@@ -14,14 +14,102 @@ net-fs/openafs
 # temp unmask
 =app-office/libreoffice-3.4.1
 
-# GNOME 3.0 stuff
->=gnome-base/gdm-3.0.4-r1
->=x11-wm/metacity-2.34
->=media-gfx/gthumb-2.13
->=gnome-extra/nautilus-open-terminal-0.19
->=x11-misc/notification-daemon-0.7
-net-misc/networkmanager::sabayon
-<gnome-base/gnome-shell-9999
-
 # it's broken, but we have it in repos
 >=x11-drivers/nvidia-drivers-275.21
+
+# Nirbheek Chauhan <nirbheek@gentoo.org> (29 Jul 2011)
+# GNOME 3.0 mask for upgrade packages, don't add new packages to this list
+# unless they pull in one of the masked packages
+# The "Better late than never!" release
+#
+# Libraries
+>=dev-libs/atk-2.0
+>=dev-cpp/libgdamm-4.99
+>=gnome-base/gnome-desktop-3.0
+>=gnome-base/gsettings-desktop-schemas-3.0
+>=gnome-base/libgnomekbd-3.0
+>=gnome-extra/gtkhtml-4.0
+>=gnome-extra/libgda-4.99
+=media-libs/libcanberra-0.28-r4
+>=net-libs/gtk-vnc-0.4.3-r300
+>=x11-libs/gdk-pixbuf-2.23
+>=x11-misc/notification-daemon-0.7
+# Core Applications
+>=app-accessibility/orca-3.0
+>=gnome-base/gdm-3.0
+>=gnome-base/gnome-applets-3.0
+>=gnome-base/gnome-keyring-3.0
+>=gnome-base/gnome-menus-3.0
+>=gnome-base/gnome-panel-3.0
+>=gnome-base/gnome-session-3.0
+>=gnome-base/gnome-settings-daemon-3.0
+>=gnome-base/gnome-shell-3.0
+>=gnome-base/gvfs-1.8
+>=gnome-base/libgnome-keyring-3.0
+>=gnome-base/nautilus-3.0
+>=x11-wm/metacity-2.34
+>=x11-wm/mutter-3.0
+# Extra Applications
+>=app-arch/file-roller-3.0
+>=app-cdr/brasero-3.0
+>=app-crypt/seahorse-3.0
+>=app-editors/gedit-3.0
+>=app-editors/gedit-plugins-3.0
+>=app-text/gtranslator-2.90
+>=app-text/evince-3.0
+>=dev-util/anjuta-3.0
+>=dev-util/devhelp-3.0
+>=gnome-extra/drwright-3.0
+>=gnome-extra/evolution-data-server-3.0
+>=gnome-extra/evolution-exchange-3.0
+>=gnome-extra/gcalctool-6.0
+>=gnome-extra/gconf-editor-3.0
+>=gnome-extra/gnome-color-manager-3.0
+>=gnome-extra/gnome-games-3.0
+>=gnome-extra/gnome-games-extra-data-3.0
+>=gnome-extra/gnome-media-2.32.0-r300
+>=gnome-extra/gnome-power-manager-3.0
+>=gnome-extra/gnome-screensaver-3.0
+>=gnome-extra/gnome-system-monitor-3.0
+>=gnome-extra/gnome-tweak-tool-3.0
+>=gnome-extra/gnome-utils-3.0
+>=gnome-extra/gucharmap-3.0
+>=gnome-extra/mousetweaks-3.0
+>=gnome-extra/zenity-3.0
+>=mail-client/evolution-3.0
+>=media-gfx/eog-3.0
+>=media-sound/sound-juicer-2.99
+>=media-video/cheese-3.0
+>=media-video/totem-3.0
+>=net-analyzer/gnome-nettool-3.0
+>=net-im/empathy-3.0
+>=net-misc/vinagre-3.0
+>=net-misc/vino-3.0
+>=net-wireless/gnome-bluetooth-3.0
+>=sys-apps/gnome-disk-utility-3.0
+>=www-client/epiphany-3.0
+>=www-client/epiphany-extensions-3.0
+>=x11-terms/gnome-terminal-3.0
+# Documentation
+>=gnome-extra/yelp-3.0
+>=gnome-extra/yelp-xsl-3.0
+>=dev-util/gnome-devel-docs-3.0
+>=gnome-extra/gnome-user-docs-3.0
+# NetworkManager
+>=net-misc/networkmanager-0.8.99
+>=net-misc/networkmanager-pptp-0.8.99
+>=net-misc/networkmanager-openvpn-0.8.99
+>=net-misc/networkmanager-openswan-0.8.99
+>=net-misc/networkmanager-vpnc-0.8.99
+>=net-misc/modemmanager-0.4.99
+>=gnome-extra/nm-applet-0.8.99
+# Meta packages
+>=gnome-base/gnome-core-apps-3.0
+>=gnome-base/gnome-extra-apps-3.0
+>=gnome-base/gnome-core-libs-3.0
+>=gnome-base/gnome-fallback-3.0
+>=gnome-base/gnome-light-3.0
+>=gnome-base/gnome-3.0
+# Misc applications
+>=media-gfx/gthumb-2.13
+>=gnome-extra/nautilus-open-terminal-0.19