diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index da186393..f7f84c9b 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -701,7 +701,7 @@
       <packagereq>eog</packagereq>
       <packagereq>evince</packagereq>
       <packagereq>firefox</packagereq>
-      <packagereq>thunderbird</packagereq>
+      <packagereq>evolution</packagereq>
       <packagereq>brasero</packagereq>
       <packagereq>totem</packagereq>
       <packagereq>totem-mozplugin</packagereq>
@@ -4247,12 +4247,11 @@
       <packagereq>pidgin</packagereq>
       <packagereq>shotwell</packagereq>
       <packagereq>simple-scan</packagereq>
-      <packagereq>thunderbird</packagereq>
+      <packagereq>evolution</packagereq>
       <packagereq>tigervnc</packagereq>
       <packagereq>transmission-gtk</packagereq>
       <packagereq>vim-enhanced</packagereq>
       <packagereq>vinagre</packagereq>
-      <packagereq>whaawmp</packagereq>
       <packagereq>xterm</packagereq>
       <packagereq>yelp</packagereq>
       <packagereq>yumex</packagereq>