diff --git a/pkgsel/Services/Mail/MTA.qmail-ldap.choice b/pkgsel/Services/Mail/MTA.qmail-ldap.choice
index dc7513a..2373b3d 100644
--- a/pkgsel/Services/Mail/MTA.qmail-ldap.choice
+++ b/pkgsel/Services/Mail/MTA.qmail-ldap.choice
@@ -1,4 +1,4 @@
 #Dependencies: LDAP NETWORK
+
 X qmail
-X bglibs
-X qmail-autoresponder
+X qmqtool
diff --git a/pkgsel/Services/Mail/MTA.qmail.choice b/pkgsel/Services/Mail/MTA.qmail.choice
index bafbc2d..71ebe85 100644
--- a/pkgsel/Services/Mail/MTA.qmail.choice
+++ b/pkgsel/Services/Mail/MTA.qmail.choice
@@ -1,6 +1,10 @@
 #Dependencies: NETWORK
+
 X qmail
+X qmqtool
+
 X checkpassword
-X bglibs
 X ezmlm
+
+X bglibs
 X qmail-autoresponder
diff --git a/pkgsel/Services/Mail/MTA.vmailmgr.choice b/pkgsel/Services/Mail/MTA.vmailmgr.choice
index 3315b45..3380784 100644
--- a/pkgsel/Services/Mail/MTA.vmailmgr.choice
+++ b/pkgsel/Services/Mail/MTA.vmailmgr.choice
@@ -1,8 +1,12 @@
 #Description: qmail + vmailmgr
 #Dependencies: NETWORK
+
 X qmail
+X qmqtool
+
+X ucspi-unix
+X vmailmgr
 X ezmlm
+
 X bglibs
 X qmail-autoresponder
-X ucspi-unix
-X vmailmgr
diff --git a/pkgsel/Services/Mail/SPAM.all b/pkgsel/Services/Mail/SPAM.all
new file mode 100644
index 0000000..c387adc
--- /dev/null
+++ b/pkgsel/Services/Mail/SPAM.all
@@ -0,0 +1,18 @@
+#Dependencies: MTA!=nullmailer
+
+X qmail-scanner
+X clamav
+X spamassassin
+X razor
+
+# needed by spamassassin
+X perl-io-zlib
+X perl-archive-tar
+X perl-libwww
+X perl-digest-sha1
+X perl-html-parser
+
+# needed by qmail-scanner
+X unzip
+X tnef
+X maildrop