diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index 789bc5a53dac..c7cedc69deea 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -10,11 +10,21 @@ stdenv.mkDerivation rec {
   name = "openoffice.org-2.3.0";
   builder = ./builder.sh;
 
-  src = fetchurl {
-	url = http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=2.3.0;
-	name = "OOo_2.3.0_src_core.tar.bz2";
-    sha256 = "0mkxn9qj3f03rjkmxc4937gr2w429hnxzb9j5j2grdknfga5a1c3";
-  };
+  src =
+    #if (stdenv.system == "i686-linux") then
+      #fetchurl {
+        # stable 2.3.0 is failing - got the tip on the mailinglist to have look
+        # at http://www.openoffice.org/issues/show_bug.cgi?id=74751
+        # now I'm trying snapshot because it should already have this patch
+        #url = http://ftp.ussg.iu.edu/openoffice/contrib/rc/2.3.1rc1/OOo_2.3.1rc1_src_core.tar.bz2;
+        #name = "OOo_2.3.1_src_core.tar.bz2";
+        #sha256 = "";
+    #} else 
+    fetchurl {
+        url = http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&lang=core&version=2.3.0;
+        name = "OOo_2.3.0_src_core.tar.bz2";
+        sha256 = "0mkxn9qj3f03rjkmxc4937gr2w429hnxzb9j5j2grdknfga5a1c3";
+    };
 
   configureFlags = "
     --with-package-format=native
@@ -63,7 +73,14 @@ stdenv.mkDerivation rec {
 
   inherit icu fontconfig libjpeg jdk cups;
 
-  patches = [./ooo-libtextcat.patch];
+  # libawt_problem see http://www.openoffice.org/issues/show_bug.cgi?id=74751 
+  # Can be removed in newer releases than 2.3.0
+  patch_file = ./libawt_problem;
+  patches = [./ooo-libtextcat.patch ];
+  patchPhase = " 
+  patch config_office/set_soenv.in \$patch_file
+  unset patchPhase; patchPhase;
+  ";
 
   meta = {
     description = "OpenOffice.org is a multiplatform and multilingual office suite";
diff --git a/pkgs/applications/office/openoffice/libawt_problem b/pkgs/applications/office/openoffice/libawt_problem
new file mode 100644
index 000000000000..edfb72cd8d26
--- /dev/null
+++ b/pkgs/applications/office/openoffice/libawt_problem
@@ -0,0 +1,10 @@
+--- config_office/set_soenv.in  2007-02-21 16:31:51.000000000 +0100
++++ config_office/set_soenv.in.new      2007-02-21 20:37:17.000000000 +0100
+@@ -426,6 +426,7 @@
+       $OUTPATH        = "unxlngx6";
+       # Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
++      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+    }