diff --git a/profiles/calculate/desktop/CLD/amd64/package.keywords/default b/profiles/calculate/desktop/CLD/amd64/package.keywords/default
index 438074f40..1217166f0 100644
--- a/profiles/calculate/desktop/CLD/amd64/package.keywords/default
+++ b/profiles/calculate/desktop/CLD/amd64/package.keywords/default
@@ -1,5 +1,4 @@
 app-cdr/k3b amd64
-app-emulation/wine amd64
 kde-misc/kgtk amd64
 media-gfx/digikam amd64
 media-plugins/kipi-plugins amd64
@@ -9,10 +8,12 @@ net-p2p/ktorrent amd64
 x11-themes/gtk-engines-qtcurve amd64
 
 app-emulation/wine amd64
+=app-emulation/wine-9999 -amd64
 =media-sound/amarok-2.2.0 amd64
 
 app-office/openoffice amd64
 dev-db/pgadmin3 amd64
 media-gfx/gimp amd64
+=media-gfx/gimp-9999 -amd64
 media-libs/libgphoto2 amd64
 net-print/gutenprint amd64
diff --git a/profiles/calculate/desktop/CLD/x86/package.keywords/default b/profiles/calculate/desktop/CLD/x86/package.keywords/default
index 3573a3e26..b035d17a5 100644
--- a/profiles/calculate/desktop/CLD/x86/package.keywords/default
+++ b/profiles/calculate/desktop/CLD/x86/package.keywords/default
@@ -1,5 +1,4 @@
 app-cdr/k3b x86
-app-emulation/wine x86
 kde-misc/kgtk x86
 media-gfx/digikam x86
 media-plugins/kipi-plugins x86
@@ -9,10 +8,12 @@ net-p2p/ktorrent x86
 x11-themes/gtk-engines-qtcurve x86
 
 app-emulation/wine x86
+=app-emulation/wine-9999 -x86
 =media-sound/amarok-2.2.0 x86
 
 app-office/openoffice x86
 dev-db/pgadmin3 x86
 media-gfx/gimp x86
+=media-gfx/gimp-9999 -x86
 media-libs/libgphoto2 x86
 net-print/gutenprint x86
diff --git a/profiles/calculate/desktop/CLDX/amd64/package.keywords/default b/profiles/calculate/desktop/CLDX/amd64/package.keywords/default
index c29038dc6..444f9c92c 100644
--- a/profiles/calculate/desktop/CLDX/amd64/package.keywords/default
+++ b/profiles/calculate/desktop/CLDX/amd64/package.keywords/default
@@ -4,5 +4,6 @@ xfce-base/xfce4 amd64
 app-office/openoffice amd64
 dev-db/pgadmin3 amd64
 media-gfx/gimp amd64
+=media-gfx/gimp-9999 -amd64
 media-libs/libgphoto2 amd64
 net-print/gutenprint amd64
diff --git a/profiles/calculate/desktop/CLDX/x86/package.keywords/default b/profiles/calculate/desktop/CLDX/x86/package.keywords/default
index fab2aeef9..2d20d1869 100644
--- a/profiles/calculate/desktop/CLDX/x86/package.keywords/default
+++ b/profiles/calculate/desktop/CLDX/x86/package.keywords/default
@@ -4,5 +4,6 @@ xfce-base/xfce4 x86
 app-office/openoffice x86
 dev-db/pgadmin3 x86
 media-gfx/gimp x86
+=media-gfx/gimp-9999 -x86
 media-libs/libgphoto2 x86
 net-print/gutenprint x86
diff --git a/profiles/calculate/package.keywords b/profiles/calculate/package.keywords
index dbc574614..0952a1c91 100644
--- a/profiles/calculate/package.keywords
+++ b/profiles/calculate/package.keywords
@@ -1,4 +1,5 @@
 sys-apps/openrc amd64 x86
+=sys-apps/openrc-9999 -amd64 -x86
 sys-apps/baselayout amd64 x86
 sys-apps/sysvinit amd64 x86
 =sys-apps/util-linux-2.16.1 amd64 x86