diff --git a/profiles/server/make.defaults b/profiles/server/make.defaults
index f58048ef..86a6b03c 100644
--- a/profiles/server/make.defaults
+++ b/profiles/server/make.defaults
@@ -28,7 +28,7 @@ PORTAGE_ELOG_SYSTEM="save"
 RUBY_TARGETS="-*"
 
 # cpu
-USE="${USE} smp"
+USE="${USE} mpi smp"
 
 # fonts
 USE="${USE} -cairo"
@@ -43,4 +43,4 @@ USE="${USE} -debug -introspection vim-syntax"
 USE="${USE} daemon"
 
 # other
-USE="${USE} device-mapper -static-libs threads"
+USE="${USE} device-mapper natspec -static-libs threads"
diff --git a/profiles/server/package.use b/profiles/server/package.use
index 2ab6606a..764662bd 100644
--- a/profiles/server/package.use
+++ b/profiles/server/package.use
@@ -1,5 +1,3 @@
-app-arch/unzip natspec
-app-arch/zip natspec
 app-editors/vim cscope perl python vim-pager
 app-emulation/libvirt virt-network
 app-misc/mc samba sftp
@@ -7,7 +5,6 @@ app-misc/sphinx mysql
 app-portage/eix sqlite
 dev-lang/php cgi curl gd mysql mysqli pcntl pdo truetype
 dev-lang/python sqlite
-dev-libs/boost mpi
 dev-libs/gmp pgo
 dev-libs/libxml2 icu python
 dev-vcs/git -python
@@ -26,7 +23,6 @@ net-ftp/pure-ftpd sysquota
 net-im/ejabberd mod_muc mod_proxy65 mod_irc mod_pubsub
 net-misc/openvswitch -modules
 net-p2p/rtorrent xmlrpc
-sci-libs/fftw mpi
 sys-apps/util-linux tty-helpers
 sys-fs/lvm2 -thin
 sys-libs/glibc nscd