diff --git a/component/cloud9/buildout.cfg b/component/cloud9/buildout.cfg
index ba35587363f97eefaaeff5c40545a59d66592b45..252459127354781fdcf2d1dff637c61b55422c4c 100644
--- a/component/cloud9/buildout.cfg
+++ b/component/cloud9/buildout.cfg
@@ -28,7 +28,7 @@ environment =
 # NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
 recipe = plone.recipe.command
 stop-on-error = true
-commit = bd6dd16c9ccfe4e778b41e98090e959d1462c819
+commit = 5d18344936baf1d86b0fa5fc2c690051b4c77cb2
 repository = https://github.com/ajaxorg/cloud9.git
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 git-binary = ${git:location}/bin/git
diff --git a/component/fonts/buildout.cfg b/component/fonts/buildout.cfg
index a148657775cfe81feb8ffce88d170944d60df17e..feb8e7865af851da1a0c952fc4521070bac7257f 100644
--- a/component/fonts/buildout.cfg
+++ b/component/fonts/buildout.cfg
@@ -3,6 +3,7 @@ parts =
   liberation-fonts
   ipaex-fonts
   ipa-fonts
+  ocrb-fonts
 
 [fonts]
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
@@ -32,3 +33,10 @@ strip-top-level-dir = true
 url = http://info.openlab.ipa.go.jp/ipafont/fontdata/IPAfont00303.zip
 md5sum = 39a828acf27790adbe4944dfb4d94bb1
 destination = ${fonts:location}/${:_buildout_section_name_}
+
+[ocrb-fonts]
+recipe = hexagonit.recipe.download
+strip-top-level-dir = true
+url = http://sourceforge.jp/frs/redir.php?m=jaist&f=%2Ftsukurimashou%2F56948%2Focr-0.2.zip
+md5sum = 9f2acd83291a31dbe053912f4115db75
+destination = ${fonts:location}/${:_buildout_section_name_}
diff --git a/component/imagemagick/buildout.cfg b/component/imagemagick/buildout.cfg
index 815b210ec8e536f57410dfc6dabd55184b46ba1c..2448c5c4cebaf868a9c30305310537c6fa5080cd 100644
--- a/component/imagemagick/buildout.cfg
+++ b/component/imagemagick/buildout.cfg
@@ -28,7 +28,6 @@ filename = imagemagick-6.6.6-1-no-gsx-gsc-probe.patch
 
 [imagemagick]
 recipe = hexagonit.recipe.cmmi
-#url = ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.7.8-8.tar.bz2
 url = http://ftp.vim.org/ImageMagick/ImageMagick-6.7.8-8.tar.bz2
 md5sum = 4e5c8f102f3e7401587c924f5b4bca15
 depends =
diff --git a/component/libdmtx/buildout.cfg b/component/libdmtx/buildout.cfg
index 47c5d816d95e7152b7c42bab8c9d2ac17da0ac71..921862d6a3fd4b1287f515998321b29c2779cd5e 100644
--- a/component/libdmtx/buildout.cfg
+++ b/component/libdmtx/buildout.cfg
@@ -3,8 +3,10 @@
 
 [buildout]
 extends =
+  ../bzip2/buildout.cfg
   ../imagemagick/buildout.cfg
   ../jbigkit/buildout.cfg
+  ../zlib/buildout.cfg
 parts =
   libdmtx
   dmtx-utils
@@ -26,4 +28,4 @@ environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${imagemagick:location}/lib/pkgconfig:${libdmtx:location}/lib/pkgconfig
   CPPFLAGS=-I${libdmtx:location}/include
-  LDFLAGS=-Wl,-rpath=${jbigkit:location}/lib
+  LDFLAGS=-Wl,-rpath=${jbigkit:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib
diff --git a/component/librsvg/buildout.cfg b/component/librsvg/buildout.cfg
index e833ebe7ec67c5e72f5eb95a9a7890913c283e1f..4d025711723df367b68ca9520e32971b034fdd92 100644
--- a/component/librsvg/buildout.cfg
+++ b/component/librsvg/buildout.cfg
@@ -14,7 +14,8 @@ url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.3.tar.bz2
 md5sum = e1e93eeff4367c896f3959af34ba20eb
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
+  LDFLAGS=-Wl,-rpath=${zlib:location}/lib
 
 [librsvg]
 recipe = hexagonit.recipe.cmmi
@@ -36,4 +37,4 @@ configure-options =
 environment = 
   PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${cairo:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib
diff --git a/component/libtiff/buildout.cfg b/component/libtiff/buildout.cfg
index 801ab01832f7b6d9dd81f46a71afe6cc6f8be001..46551fc2fbc2f544ef289d367213c5719e7110a4 100644
--- a/component/libtiff/buildout.cfg
+++ b/component/libtiff/buildout.cfg
@@ -9,11 +9,9 @@ parts =
 
 [libtiff]
 recipe = hexagonit.recipe.cmmi
-version = 4.0.2
+version = 4.0.3
 url = http://download.osgeo.org/libtiff/tiff-${:version}.tar.gz
-# server is down - circumvent
-#url = http://www.imagemagick.org/download/delegates/tiff-${:version}.tar.gz
-md5sum = 04a08fa1e07e696e820a0c3f32465a13
+md5sum = 051c1068e6a0627f461948c365290410
 configure-options =
   --disable-static
   --without-x
diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..98f094d60715b61673d99b0f74c5b28b32b276e0
--- /dev/null
+++ b/software/slaprunner/common.cfg
@@ -0,0 +1,38 @@
+[buildout]
+extends =
+  ../../component/cloud9/buildout.cfg
+  ../../component/dash/buildout.cfg
+  ../../component/dropbear/buildout.cfg
+  ../../component/git/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../stack/flask.cfg
+  ../../stack/shacache-client.cfg
+  ../../stack/slapos.cfg
+
+parts =
+  template
+  slapos-cookbook
+  eggs
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/template.cfg
+mode = 0644
+md5sum = 5307e4200f044ae57b504ad68444491c
+
+[template-runner]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-runner.cfg
+output = ${buildout:directory}/template-runner.cfg
+md5sum = 91d6550c43b7a43a999724af4650ae40
+mode = 0644
+
+[eggs]
+recipe = z3c.recipe.scripts
+eggs =
+  ${lxml-python:egg}
+  slapos.libnetworkcache
+  slapos.toolbox[flask_auth]
+  slapos.core
+  cns.recipe.symlink
diff --git a/software/slaprunner/development.cfg b/software/slaprunner/development.cfg
index 9e8ed2280c4c828e402cce2c88a9986a41f3be71..21f0da315a57bcfc7fd92dacc1a80e339ca965a7 100644
--- a/software/slaprunner/development.cfg
+++ b/software/slaprunner/development.cfg
@@ -6,15 +6,9 @@
 # You'll need to run buildout twice for this profile.
 
 [buildout]
-extends = software.cfg
+extends = common.cfg
 
-parts =
-# Original parts
-  template
-  slapos-cookbook
-  eggs
-
-# Development parts
+parts +=
   slapos.cookbook-repository
   slapos.core-repository
   slapos.toolbox-repository
@@ -52,10 +46,3 @@ command =
   grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
   grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link &&
   grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
-
-
-# Unpin versions, in case it has been pinned in software.cfg
-[versions]
-slapos.cookbook =
-slapos.toolbox =
-slapos.core =
\ No newline at end of file
diff --git a/software/slaprunner/software.cfg b/software/slaprunner/software.cfg
index 9a1d6953d6f346a1a6d6aa32cb70ff122f9bdd40..98ef557797931d327502dca687a2699716c4fd29 100644
--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -1,42 +1,11 @@
-[buildout]
-
-extends =
-  ../../component/cloud9/buildout.cfg
-  ../../component/dash/buildout.cfg
-  ../../component/dropbear/buildout.cfg
-  ../../component/git/buildout.cfg
-  ../../component/lxml-python/buildout.cfg
-  ../../stack/flask.cfg
-  ../../stack/shacache-client.cfg
-  ../../stack/slapos.cfg
-
-parts =
-  template
-  slapos-cookbook
-  eggs
-
-[template]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance.cfg
-output = ${buildout:directory}/template.cfg
-mode = 0644
-md5sum = 5307e4200f044ae57b504ad68444491c
-
-[template-runner]
-recipe = slapos.recipe.template
-url = ${:_profile_base_location_}/instance-runner.cfg
-output = ${buildout:directory}/template-runner.cfg
-md5sum = 91d6550c43b7a43a999724af4650ae40
-mode = 0644
+# Production profile of slaprunner.
+# Exactly the same as common.cfg, but:
+# 1/ Use a defined set of Python eggs instead of using the latest available
+#    ones from Pypi, to ensure stability;
+# 2/ Define list of trusted certificates for the cache.
 
-[eggs]
-recipe = z3c.recipe.scripts
-eggs =
-  ${lxml-python:egg}
-  slapos.libnetworkcache
-  slapos.toolbox[flask_auth]
-  slapos.core
-  cns.recipe.symlink
+[buildout]
+extends = common.cfg
 
 [networkcache]
 # signature certificates of the following uploaders.
@@ -56,103 +25,82 @@ signature-certificate-list =
   If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
   -----END CERTIFICATE-----
 
-[versions]
-# Forced stable version of lxml - 3.0 alpha keeps appearing/diseappearing on
-# Pypi
-lxml = 2.3.6
 
 [versions]
 Flask-Auth = 0.85
 Jinja2 = 2.6
 Werkzeug = 0.8.3
-apache-libcloud = 0.11.3
+apache-libcloud = 0.11.4
 async = 0.6.1
 buildout-versions = 1.7
 cns.recipe.symlink = 0.2.3
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
-meld3 = 0.6.9
+inotifyx = 0.2.0
+lxml = 3.0.1
+meld3 = 0.6.10
+netaddr = 0.7.10
 plone.recipe.command = 1.1
 pycrypto = 2.6
+pytz = 2012h
 slapos.cookbook = 0.70
-slapos.libnetworkcache = 0.13.2
+slapos.core = 0.33.1
+slapos.libnetworkcache = 0.13.3
 slapos.recipe.build = 0.11.5
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.31.1
+slapos.toolbox = 0.32
 smmap = 0.8.2
+xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
 # slapos.core==0.33.1
-# slapos.toolbox==0.31.1
+# slapos.toolbox==0.32
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.31.1
+# slapos.toolbox==0.32
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.31.1
+# slapos.toolbox==0.32
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.31.1
-feedparser = 5.1.2
+# slapos.toolbox==0.32
+feedparser = 5.1.3
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.5.1
-
-# Required by:
-# slapos.cookbook==0.70
-inotifyx = 0.2.0
-
-# Required by:
-# slapos.cookbook==0.70
-netaddr = 0.7.10
+hexagonit.recipe.download = 1.6
 
 # Required by:
 # slapos.core==0.33.1
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.31.1
+# slapos.toolbox==0.32
 paramiko = 1.9.0
 
 # Required by:
-# slapos.toolbox==0.31.1
+# slapos.toolbox==0.32
 psutil = 0.6.1
 
-# Required by:
-# slapos.cookbook==0.70
-pytz = 2012h
-
 # Required by:
 # cns.recipe.symlink==0.2.3
 # slapos.cookbook==0.70
 # slapos.core==0.33.1
-# slapos.libnetworkcache==0.13.2
-# slapos.toolbox==0.31.1
+# slapos.libnetworkcache==0.13.3
+# slapos.toolbox==0.32
+# supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
-# zc.recipe.egg==1.3.2
+# zope.interface==4.0.2
 setuptools = 0.6c12dev-r88846
 
-# Required by:
-# slapos.cookbook==0.70
-slapos.core = 0.33.1
-
 # Required by:
 # slapos.core==0.33.1
 supervisor = 3.0b1
 
-# Required by:
-# slapos.cookbook==0.70
-xml-marshaller = 0.9.7
-
-# Required by:
-# slapos.cookbook==0.70
-zc.recipe.egg = 1.3.2
-
 # Required by:
 # slapos.core==0.33.1
-zope.interface = 4.0.1
+zope.interface = 4.0.2
diff --git a/stack/cloudooo.cfg b/stack/cloudooo.cfg
index b8461ac5ea7437c57120f64dac9fce276da2781f..445a8b6ae5505f56182932a21f8a2a41d88eb38f 100755
--- a/stack/cloudooo.cfg
+++ b/stack/cloudooo.cfg
@@ -69,6 +69,7 @@ parts =
 # fonts
   liberation-fonts
   ipaex-fonts
+  ocrb-fonts
 
 # Dependencies
   libpng12
diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index 03e99fa7efe2814adde18140ccaea922239ad24f..886b0c954ff794719d273fde81723e5e3e0c4341 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -117,6 +117,7 @@ parts =
 # fonts
   liberation-fonts
   ipaex-fonts
+  ocrb-fonts
 
 # Cloudooo specific part
   cloudooo
diff --git a/stack/slapos.cfg b/stack/slapos.cfg
index 1fd9a0dfd9c488a9dc4eb5eeb399625aaacbd973..1c4e8ee8d1272814afb2d9b4d9b04ff24a864aaa 100644
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -68,6 +68,9 @@ eggs =
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-010
 
+# zc.recipe.egg 2.0.0a is buggy
+zc.recipe.egg = 1.3.2
+
 [networkcache]
 download-cache-url = http://www.shacache.org/shacache
 download-dir-url = http://www.shacache.org/shadir