diff --git a/conf/intel/repo/sabayon-hell/packages.db.system_mask b/conf/intel/repo/sabayon-hell/packages.db.system_mask
index 6b550d3..dfb7f11 100644
--- a/conf/intel/repo/sabayon-hell/packages.db.system_mask
+++ b/conf/intel/repo/sabayon-hell/packages.db.system_mask
@@ -2,11 +2,12 @@ app-admin/equo
 app-misc/sabayon-version
 dev-db/sqlite
 sys-apps/entropy
-sys-devel/gcc:4.5
+sys-devel/base-gcc:4.5
 sys-libs/db:4.8
 virtual/cron   
 # virtual/linux-binary
 sys-auth/pambase
+
 # glibc cannot be removed, it's part of the system
 # nowadays it's not even a system pkg because
 # virtual/libc wraps it.
diff --git a/conf/intel/repo/sabayon-limbo/packages.db.post_upgrade.sh b/conf/intel/repo/sabayon-limbo/packages.db.post_upgrade.sh
index fa58c1a..d3e1fe2 100644
--- a/conf/intel/repo/sabayon-limbo/packages.db.post_upgrade.sh
+++ b/conf/intel/repo/sabayon-limbo/packages.db.post_upgrade.sh
@@ -10,7 +10,7 @@ NEW_BRANCH=$4
 echo -e "
 >> requirements for this branch:
    app-admin/eselect-python
-   sys-devel/gcc:4.5
+   sys-devel/base-gcc:4.5
 >> Entropy post-upgrade migration script
 >> Repository: "${REPO_ID}"
 >> Root: "${ROOT}"
diff --git a/conf/intel/repo/sabayon-limbo/packages.db.system_mask b/conf/intel/repo/sabayon-limbo/packages.db.system_mask
index 6b550d3..dfb7f11 100644
--- a/conf/intel/repo/sabayon-limbo/packages.db.system_mask
+++ b/conf/intel/repo/sabayon-limbo/packages.db.system_mask
@@ -2,11 +2,12 @@ app-admin/equo
 app-misc/sabayon-version
 dev-db/sqlite
 sys-apps/entropy
-sys-devel/gcc:4.5
+sys-devel/base-gcc:4.5
 sys-libs/db:4.8
 virtual/cron   
 # virtual/linux-binary
 sys-auth/pambase
+
 # glibc cannot be removed, it's part of the system
 # nowadays it's not even a system pkg because
 # virtual/libc wraps it.
diff --git a/conf/intel/repo/sabayonlinux.org/packages.db.system_mask b/conf/intel/repo/sabayonlinux.org/packages.db.system_mask
index 7e4ab43..dfb7f11 100644
--- a/conf/intel/repo/sabayonlinux.org/packages.db.system_mask
+++ b/conf/intel/repo/sabayonlinux.org/packages.db.system_mask
@@ -2,7 +2,7 @@ app-admin/equo
 app-misc/sabayon-version
 dev-db/sqlite
 sys-apps/entropy
-sys-devel/gcc:4.5
+sys-devel/base-gcc:4.5
 sys-libs/db:4.8
 virtual/cron   
 # virtual/linux-binary