diff --git a/comps-fe6.xml.in b/comps-fe6.xml.in
index 41d7f0b9..1623bd44 100644
--- a/comps-fe6.xml.in
+++ b/comps-fe6.xml.in
@@ -1111,12 +1111,12 @@
       <packagereq type="mandatory">libxfce4mcs</packagereq>
       <packagereq type="mandatory">libxfce4util</packagereq>
       <packagereq type="mandatory">libxfcegui4</packagereq>
+      <packagereq type="mandatory">Thunar</packagereq>
       <packagereq type="mandatory">xfce-utils</packagereq>
       <packagereq type="mandatory">xfce4-panel</packagereq>
       <packagereq type="mandatory">xfce4-session</packagereq>
       <packagereq type="mandatory">xfce4-session-engines</packagereq>
       <packagereq type="mandatory">xfdesktop</packagereq>
-      <packagereq type="mandatory">xffm</packagereq>
       <packagereq type="mandatory">xfwm4</packagereq>
       <packagereq type="default">xfce-mcs-manager</packagereq>
       <packagereq type="default">xfce-mcs-plugins</packagereq>
@@ -1124,15 +1124,15 @@
       <packagereq type="default">xfce4-icon-theme</packagereq>
       <packagereq type="default">xfce4-mailwatch-plugin</packagereq>
       <packagereq type="default">xfce4-mixer</packagereq>
-      <packagereq type="default">xffm-icons</packagereq>
       <packagereq type="default">xfprint</packagereq>
       <packagereq type="optional">mousepad</packagereq>
       <packagereq type="optional">orage</packagereq>
+      <packagereq type="optional">Terminal</packagereq>
       <packagereq type="optional">xfce4-battery-plugin</packagereq>
       <packagereq type="optional">xfce4-clipman-plugin</packagereq>
       <packagereq type="optional">xfce4-cpugraph-plugin</packagereq>
-      <packagereq type="optional">xfce4-diskperf-plugin</packagereq>
       <packagereq type="optional">xfce4-datetime-plugin</packagereq>
+      <packagereq type="optional">xfce4-diskperf-plugin</packagereq>
       <packagereq type="optional">xfce4-fsguard-plugin</packagereq>
       <packagereq type="optional">xfce4-genmon-plugin</packagereq>
       <packagereq type="optional">xfce4-minicmd-plugin</packagereq>