diff --git a/component/python-cffi/buildout.cfg b/component/python-cffi/buildout.cfg
index 89606454651efc15516ed2419f02d6ae4c9044a3..0662d91658bf2f4a4f58192929784e84d2f6ec5b 100644
--- a/component/python-cffi/buildout.cfg
+++ b/component/python-cffi/buildout.cfg
@@ -1,20 +1,20 @@
 [buildout]
 extends =
   ../libffi/buildout.cfg
+  ../pkgconfig/buildout.cfg
 
 parts =
   python-cffi
 
-[python-cffi-env]
-PKG_CONFIG_PATH=${libffi:location}/lib/pkgconfig
-
 [python-cffi]
 recipe = zc.recipe.egg:custom
 egg = cffi
-include-dirs =
-  ${libffi:location}/lib/libffi-3.0.13/include/
+environment = python-cffi-env
 library-dirs =
-  ${openssl:location}/lib/
+  ${libffi:location}/lib/
 rpath =
   ${libffi:location}/lib/
-environment = python-cffi-env
+
+[python-cffi-env]
+PATH = ${pkgconfig:location}/bin:%(PATH)s
+PKG_CONFIG_PATH = ${libffi:location}/lib/pkgconfig
diff --git a/component/python-cryptography/buildout.cfg b/component/python-cryptography/buildout.cfg
index 00d91593c64f6d090f7cbf557e751ef1df31cd66..b1f8ca604b6fb840e0c1a8ee037da1d83d3e36c3 100644
--- a/component/python-cryptography/buildout.cfg
+++ b/component/python-cryptography/buildout.cfg
@@ -1,22 +1,19 @@
 [buildout]
 extends =
-  ../python-cffi/buildout.cfg
   ../libffi/buildout.cfg
+  ../openssl/buildout.cfg
+  ../pkgconfig/buildout.cfg
 
 parts =
   python-cryptography
 
-[python-cryptography-env]
-PKG_CONFIG_PATH=${libffi:location}/lib/pkgconfig
-
 [python-cryptography]
-depends = ${python-cffi:egg}
 recipe = zc.recipe.egg:custom
 egg = cryptography
-include-dirs =
-  ${libffi:location}/lib/libffi-3.0.13/include/
-library-dirs =
-  ${openssl:location}/lib/
-rpath =
-  ${libffi:location}/lib/
 environment = python-cryptography-env
+
+[python-cryptography-env]
+PATH = ${pkgconfig:location}/bin:%(PATH)s
+PKG_CONFIG_PATH = ${libffi:location}/lib/pkgconfig
+LD_LIBRARY_PATH = ${libffi:location}/lib
+CPATH = ${openssl:location}/include
diff --git a/component/python-openssl/buildout.cfg b/component/python-openssl/buildout.cfg
deleted file mode 100644
index ab5922b458d1e375f6208c7b21f7e3ae4628cd03..0000000000000000000000000000000000000000
--- a/component/python-openssl/buildout.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-[buildout]
-extends =
-  ../openssl/buildout.cfg
-  ../python-cryptography/buildout.cfg
-
-parts =
-  python-openssl
-
-[python-openssl]
-depends = ${python-cryptography:egg}
-recipe = zc.recipe.egg:custom
-egg = pyOpenSSL
-include-dirs =
-  ${openssl:location}/include/
-library-dirs =
-  ${openssl:location}/lib/
-rpath =
-  ${openssl:location}/lib/
diff --git a/component/slapos/buildout.cfg b/component/slapos/buildout.cfg
index 46811ad3dd95fc043b9d1fdb2bcd78de61d9cdeb..986c6993c01a64871ba1e884aa99d64fe7e73d3e 100644
--- a/component/slapos/buildout.cfg
+++ b/component/slapos/buildout.cfg
@@ -17,7 +17,8 @@ extends =
   ../pkgconfig/buildout.cfg
   ../popt/buildout.cfg
   ../python-2.7/buildout.cfg
-  ../python-openssl/buildout.cfg
+  ../python-cffi/buildout.cfg
+  ../python-cryptography/buildout.cfg
   ../readline/buildout.cfg
   ../sqlite3/buildout.cfg
   ../swig/buildout.cfg
@@ -91,14 +92,19 @@ output = ${buildout:directory}/environment.sh
 [lxml-python]
 python = python2.7
 
-[python-openssl]
+[python-cffi]
+python = python2.7
+
+[python-cryptography]
 python = python2.7
 
 [slapos]
 recipe = z3c.recipe.scripts
 python = python2.7
 eggs =
-  ${python-openssl:egg}
+  ${python-cffi:egg}
+  ${python-cryptography:egg}
+  pyOpenSSL
   slapos.libnetworkcache
   zc.buildout
   ${lxml-python:egg}
@@ -150,14 +156,16 @@ MarkupSafe = 0.18
 Pygments = 1.6
 Werkzeug = 0.9.4
 buildout-versions = 1.7
+cffi = 0.8.1
 cmd2 = 0.6.7
 collective.recipe.template = 1.10
+cryptography = 0.2.1
 itsdangerous = 0.23
 lxml = 3.2.3
 meld3 = 0.6.10
 netaddr = 0.7.10
 prettytable = 0.7.2
-pyOpenSSL = 0.13.1
+pyOpenSSL = 0.14
 pyparsing = 2.0.1
 setuptools = 1.1.6
 slapos.libnetworkcache = 0.13.4
diff --git a/software/erp5testnode/software.cfg b/software/erp5testnode/software.cfg
index 23827d89419c0d5e961dfc4b46846578e5586f8d..4b897e09b9d8e493f6a4bdaadcc60e5a72ba96f5 100644
--- a/software/erp5testnode/software.cfg
+++ b/software/erp5testnode/software.cfg
@@ -6,6 +6,8 @@ find-links += http://dist.repoze.org
 extends =
   ../../stack/slapos.cfg
   ../../component/python-2.7/buildout.cfg
+  ../../component/python-cffi/buildout.cfg
+  ../../component/python-cryptography/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/zip/buildout.cfg
@@ -67,6 +69,12 @@ python = python2.7
 [lxml-python]
 python = python2.7
 
+[python-cffi]
+python = python2.7
+
+[python-cryptography]
+python = python2.7
+
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
@@ -196,7 +204,9 @@ PyXML = 0.8.5
 Pygments = 1.6
 Werkzeug = 0.9.4
 buildout-versions = 1.7
+cffi = 0.8.1
 cmd2 = 0.6.7
+cryptography = 0.2.1
 erp5.util = 0.4.36
 inotifyx = 0.2.0-1
 itsdangerous = 0.23
@@ -205,7 +215,7 @@ meld3 = 0.6.10
 netaddr = 0.7.10
 plone.recipe.command = 1.1
 psutil = 1.2.1
-pyOpenSSL = 0.13.1
+pyOpenSSL = 0.14
 pyparsing = 2.0.1
 pytz = 2013.9
 slapos.core = 1.0.2.1
diff --git a/software/seleniumrunner/software.cfg b/software/seleniumrunner/software.cfg
index 1a94f2b85eb979e9625b072c1156994011ce4841..ec5b110b647dce9b0238f83a3447ee2fed2cd682 100644
--- a/software/seleniumrunner/software.cfg
+++ b/software/seleniumrunner/software.cfg
@@ -5,6 +5,8 @@ extends =
    ../../component/xorg/buildout.cfg
    ../../component/lxml-python/buildout.cfg
    ../../component/python-2.7/buildout.cfg
+   ../../component/python-cffi/buildout.cfg
+   ../../component/python-cryptography/buildout.cfg
    ../../component/firefox/buildout.cfg
    ../../component/dash/buildout.cfg
    ../../stack/shacache-client.cfg
@@ -23,6 +25,15 @@ parts =
 
 unzip = true
 
+[lxml-python]
+python = python2.7
+
+[python-cffi]
+python = python2.7
+
+[python-cryptography]
+python = python2.7
+
 [instance-recipe]
 egg = slapos.cookbook
 module = seleniumrunner
@@ -54,70 +65,90 @@ output = ${buildout:directory}/template-selenium.cfg
 mode = 0644
 
 [versions]
-# Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-004
+# pin version of setuptools
+setuptools = 2.2
 
-Jinja2 = 2.6
-Werkzeug = 0.8.3
+Jinja2 = 2.7.2
+MarkupSafe = 0.18
+Werkzeug = 0.9.4
 buildout-versions = 1.7
-hexagonit.recipe.cmmi = 1.5.0
-meld3 = 0.6.8
-slapos.cookbook = 0.46
-slapos.recipe.build = 0.7
-slapos.recipe.template = 2.2
+cffi = 0.8.1
+cmd2 = 0.6.7
+cryptography = 0.2.1
+itsdangerous = 0.23
+meld3 = 0.6.10
+pyOpenSSL = 0.14
+pyparsing = 2.0.1
+slapos.cookbook = 0.85
+slapos.recipe.build = 0.12
+slapos.recipe.cmmi = 0.2
+slapos.recipe.template = 2.5
+
+# Required by:
+# slapos.core==1.0.3
+Flask = 0.10.1
 
 # Required by:
-# slapos.core==0.23
-Flask = 0.8
+# slapos.core==1.0.3
+cliff = 1.5.2
 
 # Required by:
-# slapos.cookbook==0.42
-PyXML = 0.8.4
+# slapos.cookbook==0.85
+inotifyx = 0.2.0-1
 
 # Required by:
-# slapos.cookbook==0.42
-inotifyx = 0.2.0
+# slapos.cookbook==0.85
+lock-file = 2.0
 
 # Required by:
-# slapos.cookbook==0.42
-# slapos.core==0.23
+# slapos.cookbook==0.85
+# slapos.core==1.0.3
 # xml-marshaller==0.9.7
-lxml = 2.3.4
+lxml = 3.3.1
 
 # Required by:
-# slapos.cookbook==0.42
-netaddr = 0.7.6
+# slapos.cookbook==0.85
+netaddr = 0.7.10
 
 # Required by:
-# slapos.core==0.23
-netifaces = 0.8
+# slapos.core==1.0.3
+netifaces = 0.8-1
 
 # Required by:
-# slapos.cookbook==0.42
-# slapos.core==0.23
-# zc.buildout==1.5.3-dev-SlapOS-010
-# zc.recipe.egg==1.3.2
-setuptools = 0.6c12dev-r88846
+# cffi==0.8.1
+pycparser = 2.10
 
 # Required by:
-# slapos.cookbook==0.42
-slapos.core = 0.23
+# slapos.cookbook==0.85
+pytz = 2013.9
 
 # Required by:
-# slapos.core==0.23
-supervisor = 3.0a12
+# slapos.core==1.0.3
+requests = 2.2.1
 
 # Required by:
-# slapos.cookbook==0.42
-xml-marshaller = 0.9.7
+# cliff==1.5.2
+six = 1.5.2
+
+# Required by:
+# slapos.cookbook==0.85
+slapos.core = 1.0.3
+
+# Required by:
+# cliff==1.5.2
+stevedore = 0.14.1
+
+# Required by:
+# slapos.core==1.0.3
+supervisor = 3.0
 
 # Required by:
-# slapos.cookbook==0.42
-zc.recipe.egg = 1.3.2
+# slapos.cookbook==0.85
+xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.core==0.23
-zope.interface = 3.8.0
+# slapos.core==1.0.3
+zope.interface = 4.1.0
 
 [networkcache]
 # signature certificates of the following uploaders.
diff --git a/stack/slapos.cfg b/stack/slapos.cfg
index 61f1321e675923c3462b96145136b7c04e0c5ac7..e769fc434b9f5b89b8c68c2111fbe02644975b2b 100644
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -12,7 +12,8 @@ extensions +=
 # Use shacache and lxml
 extends =
   ../component/lxml-python/buildout.cfg
-  ../component/python-openssl/buildout.cfg
+  ../component/python-cffi/buildout.cfg
+  ../component/python-cryptography/buildout.cfg
 
 # Separate from site eggs
 allowed-eggs-from-site-packages =
@@ -60,7 +61,9 @@ networkcache-section = networkcache
 recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
-  ${python-openssl:egg}
+  ${python-cffi:egg}
+  ${python-cryptography:egg}
+  pyOpenSSL
   slapos.cookbook
   cliff
   hexagonit.recipe.download