diff --git a/profiles/server/package.accept_keywords b/profiles/server/package.accept_keywords
index ab7c43e0..74dfe1c4 100644
--- a/profiles/server/package.accept_keywords
+++ b/profiles/server/package.accept_keywords
@@ -36,10 +36,8 @@ app-antivirus/clamav ~amd64
 <games-fps/urbanterror-5 ~amd64
 <mail-filter/dovecot_deleted_to_trash-1 ~amd64
 <media-libs/freetype-2.7 ~amd64
-<media-libs/libmediainfo-1 ~amd64
 <media-libs/libpng-1.7 ~amd64
 <media-video/ffmpeg-2.9 ~amd64
-<media-video/mediainfo-1 ~amd64
 =net-analyzer/fail2ban-99999999 **
 <net-analyzer/nethogs-0.9 ~amd64
 <net-analyzer/ntop-6 ~amd64
diff --git a/profiles/server/package.use b/profiles/server/package.use
index e6832fbf..7c2a8474 100644
--- a/profiles/server/package.use
+++ b/profiles/server/package.use
@@ -11,6 +11,7 @@ dev-perl/GD png
 dev-vcs/git -python
 games-action/minetest leveldb
 games-fps/urbanterror dedicated -server
+mail-filter/amavisd-new clamav spamassassin
 mail-mta/postfix dovecot-sasl
 media-libs/gd fontconfig truetype jpeg png
 media-gfx/graphviz cairo