diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.18.3-r2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.18.3-r2.ebuild
index ab4c22666..3d3582dc2 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.18.3-r2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.18.3-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+caps pam selinux +ssh-agent test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
 RDEPEND="
diff --git a/profiles/pentoo/base/package.accept_keywords/gnome-base b/profiles/pentoo/base/package.accept_keywords/gnome-base
index c41600e1c..c4dd90d9d 100644
--- a/profiles/pentoo/base/package.accept_keywords/gnome-base
+++ b/profiles/pentoo/base/package.accept_keywords/gnome-base
@@ -1 +1,4 @@
 ~gnome-base/gnome-menus-3.6.2
+
+#get rid of keychain, bug #570512
+=gnome-base/gnome-keyring-3.18.3-r2
diff --git a/profiles/pentoo/base/package.use/app-crypt b/profiles/pentoo/base/package.use/app-crypt
index 5a1eccf22..a1abe57c4 100644
--- a/profiles/pentoo/base/package.use/app-crypt
+++ b/profiles/pentoo/base/package.use/app-crypt
@@ -2,7 +2,6 @@ app-crypt/gnupg smartcard
 app-crypt/johntheripper mmx mpi sse2 custom-cflags
 app-crypt/ophcrack -tables
 
-#We disable keyring in gnome-base/libgnomeui
-#which isn't good enough because libsecret pulls in gnome-keyring which is needed by nm-applet etc
-#if you want to disable this, disable it locally or open a bug to make a plasma profile option
-app-crypt/pinentry gnome-keyring
+#Make keyring optional by hacking gnome-base/libgnomeui and =gnome-base/gnome-keyring-3.18.3-r2
+#For more details, see bugs #570512 and #768754
+#app-crypt/pinentry gnome-keyring