diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh
index fb60ed2d913d..97c657ee1811 100644
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@@ -1,7 +1,5 @@
 source $stdenv/setup
 
-echo $with_jdk_home
-
 export nodep=TRUE
 export NO_HIDS=TRUE
 
@@ -9,9 +7,7 @@ export PATH=$icu/sbin:$PATH
 
 preConfigure=preConfigure
 preConfigure() {
-    for i in \
-	sysui/desktop/share/makefile.mk \
-	; do 
+    for i in sysui/desktop/share/makefile.mk; do 
 	substituteInPlace $i --replace /bin/bash $shell
     done
 
@@ -21,7 +17,16 @@ preConfigure() {
 }
 
 
-postConfigure="cd .."
+postConfigure=postConfigure
+postConfigure() {
+    cd ..
+    for i in LinuxX86Env.Set LinuxX86Env.Set.sh; do
+	substituteInPlace $i --replace /usr /no-such-path
+    done
+    substituteInPlace solenv/inc/libs.mk \
+	--replace /usr/lib/libjpeg.so $libjpeg/lib/libjpeg.so \
+	--replace /usr/lib64/libjpeg.so $libjpeg/lib/libjpeg.so
+}
 
 
 buildPhase=buildPhase
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index 0486e1c58939..b93fb8c5f791 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -50,9 +50,7 @@ stdenv.mkDerivation rec {
     --with-hsqldb-jar=${hsqldb}/lib/hsqldb.jar
   ";
 
-  LD_LIBRARY_PATH = "$LD_LIBRARY_PATH:${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib";
-
-  with_jdk_home = jdk;
+  LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib";
 
   buildInputs = [
     pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib 
@@ -61,7 +59,7 @@ stdenv.mkDerivation rec {
     getopt file jdk cairo which icu boost libXext libX11 libXtst libXi
   ];
 
-  inherit icu fontconfig;
+  inherit icu fontconfig libjpeg;
 
   meta = {
     description = "OpenOffice.org is a multiplatform and multilingual office suite";