diff --git a/component/giflib/buildout.cfg b/component/giflib/buildout.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..0033c9a7ddf95b66a76f8032659f11ae513bb2e9
--- /dev/null
+++ b/component/giflib/buildout.cfg
@@ -0,0 +1,15 @@
+[buildout]
+parts =
+  giflib
+
+[giflib]
+recipe = hexagonit.recipe.cmmi
+url = http://prdownloads.sourceforge.net/giflib/giflib-4.2.0.tar.bz2?download
+md5sum = 711ad48551ee14db7c200b5f402df849
+configure-options =
+  --disable-static
+
+# restrict building to libraries only, we don't care about binaries
+# and specially docs which would require more dependencies (e.g. xmlto):
+make-options =
+  SUBDIRS=lib
\ No newline at end of file
diff --git a/component/leptonica/buildout.cfg b/component/leptonica/buildout.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..f9a1c26a6cae22f4fc8a5672f1f17a026ca3d25b
--- /dev/null
+++ b/component/leptonica/buildout.cfg
@@ -0,0 +1,32 @@
+[buildout]
+parts = leptonica
+extends =
+  ../libtool/buildout.cfg
+  ../zlib/buildout.cfg
+  ../libjpeg/buildout.cfg
+  ../libpng/buildout.cfg
+  ../libtiff/buildout.cfg
+  ../webp/buildout.cfg
+  ../giflib/buildout.cfg
+
+[leptonica]
+recipe = hexagonit.recipe.cmmi
+url = http://leptonica.googlecode.com/files/leptonica-1.68.tar.gz
+md5sum = 5cd7092f9ff2ca7e3f3e73bfcd556403
+configure-command =
+  ./autogen.sh
+  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static
+patch-options = -p1
+patches =
+  ${leptonica-1.69-zlib-include.patch:location}/${leptonica-1.69-zlib-include.patch:filename}
+environment =
+  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
+  CPPFLAGS=-I${zlib:location}/include -I${libjpeg:location}/include -I${libpng:location}/include -I${libtiff:location}/include -I${webp:location}/include -I${giflib:location}/include
+  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${webp:location}/lib -Wl,-rpath=${webp:location}/lib -L${giflib:location}/lib -Wl,-rpath=${giflib:location}/lib
+
+[leptonica-1.69-zlib-include.patch]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = cff3dc942075190939b407c38e0d3201
+download-only = true
+filename = ${:_buildout_section_name_}
diff --git a/component/leptonica/leptonica-1.69-zlib-include.patch b/component/leptonica/leptonica-1.69-zlib-include.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7f907611d107723a572ed6abcad3f4793176d716
--- /dev/null
+++ b/component/leptonica/leptonica-1.69-zlib-include.patch
@@ -0,0 +1,22 @@
+This patch is originally taken from:
+
+http://leptonica.googlecode.com/issues/attachment?aid=560001000&name=zlib-include.patch&token=m2sugSYxB4xwAuNgrKXyHTxBYNg%3A1337345966091
+
+To fix the following issue with leptonica:
+
+http://code.google.com/p/leptonica/issues/detail?id=56
+
+diff -Nurd -x'*~' leptonica-1.68.orig/src/pngio.c leptonica-1.68/src/pngio.c
+--- leptonica-1.68.orig/src/pngio.c	2011-02-01 00:41:12.000000000 -0500
++++ leptonica-1.68/src/pngio.c	2011-07-09 09:17:17.000000000 -0400
+@@ -108,6 +108,10 @@
+ 
+ #include "png.h"
+ 
++#ifdef HAVE_LIBZ
++#include "zlib.h"
++#endif
++
+ /* ----------------Set defaults for read/write options ----------------- */
+     /* strip 16 bpp --> 8 bpp on reading png; default is for stripping */
+ static l_int32   var_PNG_STRIP_16_TO_8 = 1;
diff --git a/component/tesseract/buildout.cfg b/component/tesseract/buildout.cfg
index f9e149c72e929ff31c3cdd79d0bead0015e58169..4938b5692cd91acdc9d5a06785edfc2d14568715 100644
--- a/component/tesseract/buildout.cfg
+++ b/component/tesseract/buildout.cfg
@@ -1,10 +1,7 @@
 [buildout]
 extends =
-  ../jbigkit/buildout.cfg
-  ../libjpeg/buildout.cfg
-  ../libpng/buildout.cfg
-  ../libtiff/buildout.cfg
-  ../zlib/buildout.cfg
+  ../libtool/buildout.cfg
+  ../leptonica/buildout.cfg
 
 parts =
   tesseract-eng-traineddata-unzip
@@ -29,20 +26,19 @@ md5sum = ca80db3ec489c547b03f3ee48879c1b1
 
 [tesseract]
 recipe = hexagonit.recipe.cmmi
-url = http://tesseract-ocr.googlecode.com/files/tesseract-3.00.tar.gz
-md5sum = cc812a261088ea0c3d2da735be35d09f
+url = http://tesseract-ocr.googlecode.com/files/tesseract-3.01.tar.gz
+md5sum = 1ba496e51a42358fb9d3ffe781b2d20a
 patch-options =
   -p1
 patches =
   ${tesseract-gcc-4.7-build-patch:location}/${tesseract-gcc-4.7-build-patch:filename}
-depends =
-  ${libtiff:version}
-configure-options =
-  --disable-static
-  --datarootdir=${tesseract-share:location}
+configure-command =
+  ./autogen.sh
+  ./configure --prefix=${buildout:parts-directory}/${:_buildout_section_name_} --disable-static --datarootdir=${tesseract-share:location}
 environment =
-  CPPFLAGS=-I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include
-  LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib
+  ACLOCAL_ARGS=-I${libtool:location}/share/aclocal
+  CPPFLAGS=-I${leptonica:location}/include
+  LDFLAGS =-L${leptonica:location}/lib -Wl,-rpath=${leptonica:location}/lib
 
 [tesseract-eng-traineddata]
 recipe = hexagonit.recipe.download
diff --git a/component/webp/buildout.cfg b/component/webp/buildout.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..85bcd7dff466defbb60500e49896808ee46a3862
--- /dev/null
+++ b/component/webp/buildout.cfg
@@ -0,0 +1,10 @@
+[buildout]
+parts =
+  webp
+
+[webp]
+recipe = hexagonit.recipe.cmmi
+url = https://webp.googlecode.com/files/libwebp-0.1.3.tar.gz
+md5sum = 254d4670e14e9ed881f0536b006ab336
+configure-options =
+  --disable-static
diff --git a/software/tesseract/software.cfg b/software/tesseract/software.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..56ff8c4fe6812723ff6830283400562e892940f0
--- /dev/null
+++ b/software/tesseract/software.cfg
@@ -0,0 +1,5 @@
+# A simple software release to test if tesseract building works
+[buildout]
+extends =
+  ../../stack/slapos.cfg
+  ../../component/tesseract/buildout.cfg
\ No newline at end of file