diff --git a/comps-fe6.xml.in b/comps-fe6.xml.in
index 73aaddeb..f3c5c097 100644
--- a/comps-fe6.xml.in
+++ b/comps-fe6.xml.in
@@ -460,10 +460,11 @@
mail-server
<_name>Mail Server
- <_description>These packages allow you to configure an IMAP or Postfix mail server.
+ <_description>These packages allow you to configure an IMAP or SMTP mail server.
false
true
+ amavisd-new
cyrus-imapd
enemies-of-carlotta
perl-Cyrus
@@ -562,7 +563,7 @@
kid3
kover
libvisual-plugins
- nomadsync
+ nomadsync
soundconverter
soundtracker
sweep
@@ -629,6 +630,7 @@
nagios
nfswatch
oddjob
+ p7zip
par2cmdline
pbzip2
puppet
@@ -687,7 +689,7 @@
ctrlproxy
dnsmasq
flumotion
- freenx
+ freenx
icecast
ipxripd
ircd-hybrid
@@ -695,11 +697,13 @@
kannel
l2tpd
nsd
+ oidentd
openvpn
puppet-server
rbldnsd
sobby
torque-server
+ ucarp
ushare
vnc-reflector
@@ -864,18 +868,6 @@
-
- mail-server
- <_name>Mail Server
- <_description>These packages allow you to configure an IMAP or SMTP mail server.
- false
- true
-
- amavisd-new
- clamav
-
-
-
base-x
<_name>X Window System