diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh
index 2b1fd75187f..edeb0e99760 100644
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@@ -1,23 +1,29 @@
 source $stdenv/setup
 
-configurePhase() {
+export nodep=TRUE
+export NO_HIDS=TRUE
 
-  cd config_office/;
-  ./configure --disable-epm --disable-odk --with-java=no --disable-cups --with-system-python \
-  --disable-mozilla --without-nas --disable-pasf --disable-gnome-vfs \
-  --with-system-libs;
+export PATH=$icu/sbin:$PATH
 
-  cd ..
+preConfigure=preConfigure
+preConfigure() {
+    for i in \
+	sysui/desktop/share/makefile.mk \
+	; do 
+	substituteInPlace $i --replace /bin/bash /bin/sh
+    done
+
+    cd config_office/
 }
 
-configurePhase=configurePhase
+postConfigure="cd .."
 
+buildPhase=buildPhase
 buildPhase() {
+  source LinuxX86Env.Set.sh
   ./bootstrap
-  source LinuxIntelEnv.Set.sh 
+
   dmake
 }
 
-buildPhase=buildPhase
-
 genericBuild
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index cf142e3ad74..f2f3050e785 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -1,19 +1,57 @@
 { stdenv, fetchurl, pam, python, tcsh, libxslt, perl, perlArchiveZip
 , perlCompressZlib, zlib, libjpeg, expat, pkgconfig, freetype, libwpd
 , libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
-, bison, flex, zip, unzip, gtk, libmspack, getopt, file, jre }:
+, bison, flex, zip, unzip, gtk, libmspack, getopt, file, jre, cairo, which
+, icu, boost
+}:
 
 stdenv.mkDerivation {
-  name = "openoffice.org-2.0.0";
+  name = "openoffice.org-2.2.1";
   builder = ./builder.sh;
-  src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/office/openoffice/stable/2.0.0/OOo_2.0.0_src.tar.gz;
-    md5 = "a68933afc2bf432d11b2043ac99ba0aa";
-    #url = http://ftp.snt.utwente.nl/pub/software/openoffice/stable/2.2.1/OOo_2.2.1_src_core.tar.bz2;
-    #sha256 = "adc54c88892f5ced9887945709856efeb628fe5f7b5b2f2aa7797c5391b9c7d6";
-  };
-  buildInputs = [ pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib 
-                  libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl 
-                  libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack getopt file jre ];
 
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/pub/office/openoffice/stable/2.2.1/OOo_2.2.1_src_core.tar.bz2;
+    sha256 = "1mn7p68m6z3rlwm2ynvvbzz2idpyds2hjmwlhycfsp1gi644ridd";
+  };
+
+  configureFlags = "
+    --with-package-format=native
+    --disable-cups
+    --disable-epm
+    --disable-fontooo
+    --disable-gnome-vfs
+    --disable-gnome-vfs
+    --disable-mathmldtd
+    --disable-mozilla
+    --disable-odk
+    --disable-pasf
+    --disable-qadevooo
+    --with-cairo
+    --with-system-libs
+    --with-system-python
+    --with-system-boost
+    --without-afms
+    --without-dict
+    --without-fonts
+    --without-java
+    --without-myspell-dicts
+    --without-nas
+    --without-ppds
+    --without-system-agg
+    --without-system-beanshell
+    --without-system-hsqldb
+    --without-system-xalan
+    --without-system-xerces
+    --without-system-xml-apis
+    --without-system-xt
+  ";
+
+  buildInputs = [ 
+    pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib 
+    libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl 
+    libXaw fontconfig libsndfile neon bison flex zip unzip gtk libmspack 
+    getopt file jre cairo which icu boost
+  ];
+
+  inherit icu;
 }
diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix
new file mode 100644
index 00000000000..df8cfc5c04d
--- /dev/null
+++ b/pkgs/development/libraries/agg/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, autoconf, automake, libtool, pkgconfig}:
+
+stdenv.mkDerivation {
+  name = "agg-2.5";
+  src = fetchurl {
+    url = http://www.antigrain.com/agg-2.5.tar.gz;
+    sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb" ;
+  };
+  buildInputs = [autoconf automake libtool pkgconfig];
+  preConfigure = "sh autogen.sh";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ccc47ddeef..a7e8f08f27c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1321,6 +1321,12 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
+  /*
+  agg = import ../development/libraries/agg {
+    inherit fetchurl stdenv autoconf automake libtool pkgconfig;
+  };
+  */
+
   apr = import ../development/libraries/apr {
     inherit fetchurl stdenv;
   };
@@ -3384,16 +3390,15 @@ rec {
   };
 
   openoffice = import ../applications/office/openoffice {
-    inherit fetchurl pam python tcsh libxslt
+    inherit fetchurl stdenv pam python tcsh libxslt
       perl perlArchiveZip perlCompressZlib zlib libjpeg
       expat pkgconfig freetype fontconfig libwpd libxml2
       db4 sablotron curl libsndfile flex zip unzip libmspack
-      getopt file neon;
+      getopt file neon cairo which icu boost;
     inherit (xlibs) libXaw;
     inherit (gtkLibs) gtk;
     bison = bison23;
     inherit jre;
-    stdenv = overrideGCC stdenv gcc34;
   };
 
   opera = import ../applications/networking/browsers/opera {