diff --git a/conf/intel/entropy/packages/packages.server.dep_rewrite b/conf/intel/entropy/packages/packages.server.dep_rewrite
index 3718f88..01fd44c 100644
--- a/conf/intel/entropy/packages/packages.server.dep_rewrite
+++ b/conf/intel/entropy/packages/packages.server.dep_rewrite
@@ -38,9 +38,8 @@ www-apps/swish-e (.*)app-text/poppler-(.*)(\[.*\])? \1app-text/poppler-base-\2
 x11-plugins/enigmail (.*)app-crypt/pinentry(.*)\[gtk\] \1app-crypt/pinentry-gtk2\2
 x11-plugins/enigmail (.*)app-crypt/pinentry(.*)\[qt4\] \1app-crypt/pinentry-qt4\2
 mail-client/thunderbird (.*)app-crypt/pinentry(.*)\[gtk\] \1app-crypt/pinentry-gtk2\2
-# Fix me, I am broken and joost_op broke me! deps rewrote manually for now
-# app-crypt/gnupg (.*)app-crypt/pinentry(.*) \1app-crypt/pinentry-base\2
-mail-client/evolution (.*)app-crypt/pinentry(.*)\[gtk\] \1app-crypt/pinentry-gtk2\2
+app-crypt/gnupg (.*)app-crypt/pinentry(.*) app-crypt/pinentry-base
+mail-client/evolution (.*)app-crypt/pinentry(.*)(\[.*gtk.*\])? \1app-crypt/pinentry-gtk2\2
 
 # Fix virtualbox shitty dependencies
 app-emulation/virtualbox-guest-additions#2.6.31-sabayon (.*)x11-drivers/xf86-video-virtualbox-(.*) \1x11-drivers/xf86-video-virtualbox-\2#2.6.31-sabayon