diff --git a/conf/intel/entropy/packages/packages.server.dep_rewrite b/conf/intel/entropy/packages/packages.server.dep_rewrite
index 0377882..619aae1 100644
--- a/conf/intel/entropy/packages/packages.server.dep_rewrite
+++ b/conf/intel/entropy/packages/packages.server.dep_rewrite
@@ -35,6 +35,7 @@ dev-ruby/ruby-poppler (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-glib\2
 # Fix enigmail deps, to point to our split pinentry packages
 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 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