diff --git a/profiles/pentoo/base/package.accept_keywords/app-portage b/profiles/pentoo/base/package.accept_keywords/app-portage
deleted file mode 100644
index fa4a062ae..000000000
--- a/profiles/pentoo/base/package.accept_keywords/app-portage
+++ /dev/null
@@ -1,2 +0,0 @@
-~app-portage/gentoolkit-0.4.8
-=app-portage/gemato-14*
diff --git a/profiles/pentoo/base/package.keywords/app-portage b/profiles/pentoo/base/package.keywords/app-portage
new file mode 100644
index 000000000..5108a840b
--- /dev/null
+++ b/profiles/pentoo/base/package.keywords/app-portage
@@ -0,0 +1 @@
+~app-portage/gentoopm-0.3.3 amd64 x86
diff --git a/profiles/pentoo/overlay/package.accept_keywords/app-office b/profiles/pentoo/overlay/package.accept_keywords/app-office
deleted file mode 120000
index b0cb01ad6..000000000
--- a/profiles/pentoo/overlay/package.accept_keywords/app-office
+++ /dev/null
@@ -1 +0,0 @@
-../../base/package.accept_keywords/app-office
\ No newline at end of file
diff --git a/profiles/pentoo/overlay/package.keywords/app-portage b/profiles/pentoo/overlay/package.keywords/app-portage
new file mode 120000
index 000000000..3b71b9ffa
--- /dev/null
+++ b/profiles/pentoo/overlay/package.keywords/app-portage
@@ -0,0 +1 @@
+../../base/package.keywords/app-portage
\ No newline at end of file