diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 2b7e40d1ffa3..d8830c4e2496 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -1,14 +1,14 @@
 args : with args; 
 rec {
-  version = "0.9.28.2-0";
+  version = "0.9.30";
   src = fetchurl {
-    url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%200.9.28.2/lazarus-0.9.28.2-src.tar.bz2";
-    sha256 = "1zad1sylgvhpb210zxypdyng72fpjz1zdf3cpqj9dl94cwn3f4ap";
+    url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}-src.tar.bz2";
+    sha256 = "ee8ba358e996a6f436f70d15e64976789c2b8f28b2e2dbf1b737de593b4d23e3";
   };
 
   buildInputs = [fpc gtk glib libXi inputproto 
     libX11 xproto libXext xextproto pango atk
-    stdenv.gcc makeWrapper];
+    stdenv.gcc makeWrapper gdk_pixbuf];
   configureFlags = [];
   makeFlags = [
     "LAZARUS_INSTALL_DIR=$out/lazarus/"
@@ -21,7 +21,7 @@ rec {
   phaseNames = ["preBuild" "doMakeInstall" "postInstall"];
 
   preBuild = fullDepEntry (''
-    export NIX_LDFLAGS='-lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0'
+    export NIX_LDFLAGS='-lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo'
     export LCL_PLATFORM=gtk2
     ensureDir $out/share
     tar xf ${fpc.src} --strip-components=1 -C $out/share -m
diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
new file mode 100644
index 000000000000..211eecde4e43
--- /dev/null
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -0,0 +1,65 @@
+x@{builderDefsPackage
+  , gawk, alsaLib, ncurses
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="speech_tools";
+    version="2.1";
+    name="${baseName}-${version}";
+    url="http://www.festvox.org/packed/festival/${version}/${name}-release.tar.gz";
+    hash="1s9bkfgdgyas8v2cr7x3dg0ck1xf9mn1q6a73gwy524sjb6nfqgz";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doUnpack" "killUsrBin" "doConfigure" "doMakeInstall" "doDeploy" "fixPaths"];
+      
+  killUsrBin = a.fullDepEntry ''
+    sed -e s@/usr/bin/@@g -i $( grep -rl '/usr/bin/' . )
+    sed -re 's@/bin/(rm|printf|uname)@\1@g' -i $( grep -rl '/bin/' . )
+  '' ["minInit" "doUnpack"];
+
+  doDeploy = a.fullDepEntry ''
+    ensureDir "$out"/{bin,lib}
+    for d in bin lib; do
+      for i in ./$d/*; do
+        test "$(basename "$i")" = "Makefile" ||
+          cp -r "$(readlink -f $i)" "$out/$d"
+      done
+    done
+  '' ["doMakeInstall" "defEnsureDir"];
+
+  fixPaths = a.doPatchShebangs "$out/bin";
+
+  meta = {
+    description = "Text-to-speech engine";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = "free-noncopyleft";
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://www.festvox.org/packed/festival/";
+    };
+  };
+}) x
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b3603e67ff4..71dac6dee1a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2115,9 +2115,9 @@ let
 
   lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) {
     inherit makeWrapper;
-    inherit (gtkLibs) gtk glib pango atk;
+    inherit (gtkLibs) gtk glib pango atk gdk_pixbuf;
     inherit (xlibs) libXi inputproto libX11 xproto libXext xextproto;
-    fpc = fpc_2_4_0;
+    fpc = fpc;
   };
 
   llvm = callPackage ../development/compilers/llvm { };
@@ -4210,6 +4210,8 @@ let
 
   speechd = callPackage ../development/libraries/speechd { };
 
+  speech_tools = callPackage ../development/libraries/speech-tools {};
+
   speex = callPackage ../development/libraries/speex { };
 
   sphinxbase = callPackage ../development/libraries/sphinxbase { };