diff --git a/profiles/base/package.keywords/depends b/profiles/base/package.keywords/depends
index 85845a829..36500e9eb 100644
--- a/profiles/base/package.keywords/depends
+++ b/profiles/base/package.keywords/depends
@@ -126,8 +126,8 @@
 ~dev-java/jackson-databind-2.8.5 amd64 x86
 ~dev-java/jna-4.2.2 amd64 x86
 ~dev-java/resin-servlet-api-4.0.46 amd64 x86
-~dev-lang/swig-3.0.10 amd64 x86
 ~dev-lang/lua-5.1.5 amd64 x86
+~dev-lang/swig-3.0.10 amd64 x86
 ~dev-libs/bglibs-1.106 amd64 x86
 ~dev-libs/crossguid-0_pre20150817 amd64 x86
 ~dev-libs/grantlee-5.1.0 amd64 x86
@@ -140,6 +140,7 @@
 ~dev-libs/libdbusmenu-12.10.2 amd64 x86
 ~dev-libs/libdbusmenu-qt-0.9.3_pre20140619 amd64 x86
 ~dev-libs/libdynd-0.7.2 amd64 x86
+~dev-libs/libevent-2.0.22 amd64 x86
 ~dev-libs/libgcrypt-1.7.3 amd64 x86
 ~dev-libs/libgpg-error-1.24 amd64 x86
 ~dev-libs/libical-1.0.1 amd64 x86
@@ -230,6 +231,7 @@
 ~media-sound/dcadec-0.2.0 amd64 x86
 ~media-sound/drumstick-1.0.2 amd64 x86
 ~net-dns/dnssec-tools-2.2 amd64 x86
+~net-fs/nfs-utils-1.3.4 amd64 x86
 ~net-fs/samba-4.2.14 amd64 x86
 ~net-irc/quassel-irssi-0_p20160412 amd64 x86
 ~net-libs/accounts-qt-1.13 amd64 x86
diff --git a/profiles/base/package.keywords/dev-python b/profiles/base/package.keywords/dev-python
index 7ad7854b0..0bc9a03f0 100644
--- a/profiles/base/package.keywords/dev-python
+++ b/profiles/base/package.keywords/dev-python
@@ -2,10 +2,9 @@
 ~dev-python/arrayterator-1.0.1 amd64 x86
 ~dev-python/babelfish-0.5.5 amd64 x86
 ~dev-python/backports-ssl-match-hostname-3.5.0.1 amd64 x86
-~dev-python/billiard-3.5.0.2 amd64 x86
 ~dev-python/blosc-1.2.8 amd64 x86
 ~dev-python/cached-property-1.3.0 amd64 x86
-~dev-python/celery-4.0.2 amd64 x86
+~dev-python/celery-3.1.24 amd64 x86
 ~dev-python/chardet-2.3.0 amd64 x86
 ~dev-python/cherrypy-3.8.0 amd64 x86
 ~dev-python/colorama-0.3.7 amd64 x86
@@ -32,7 +31,7 @@
 ~dev-python/kaa-display-0.1.0 amd64 x86
 ~dev-python/kaa-imlib2-0.2.3 amd64 x86
 ~dev-python/Kivy-1.9.1 amd64 x86
-~dev-python/kombu-4.0.2 amd64 x86
+~dev-python/kombu-3.0.37 amd64 x86
 ~dev-python/livereload-2.4.1 amd64 x86
 ~dev-python/lxml-3.4.2 amd64 x86
 ~dev-python/markups-2.0.0 amd64 x86
@@ -42,7 +41,7 @@
 ~dev-python/mkdocs-bootstrap-0.1.1 amd64 x86
 ~dev-python/mkdocs-bootswatch-0.4.0 amd64 x86
 ~dev-python/pivy-0.5_alpha20110303 amd64 x86
-~dev-python/py-amqp-2.1.4 amd64 x86
+~dev-python/py-amqp-1.4.9 amd64 x86
 ~dev-python/pycodestyle-2.0.0 amd64 x86
 ~dev-python/pycollada-0.4 amd64 x86
 ~dev-python/PyContracts-1.7.9 amd64 x86
diff --git a/profiles/base/package.mask/default b/profiles/base/package.mask/default
index 424a39cb1..9b68e19e5 100644
--- a/profiles/base/package.mask/default
+++ b/profiles/base/package.mask/default
@@ -41,3 +41,6 @@ dev-lang/ruby:2.0
 
 # blocking dev-util/pida-0.6.2-r1::gentoo
 =dev-python/bpython-0.16
+
+# <dev-python/billiard-3.4 required by dev-python/celery-3.1.24-r1
+=dev-python/billiard-3.5.0.0