diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh
index edeb0e997600..3234e366b902 100644
--- a/pkgs/applications/office/openoffice/builder.sh
+++ b/pkgs/applications/office/openoffice/builder.sh
@@ -5,25 +5,73 @@ export NO_HIDS=TRUE
 
 export PATH=$icu/sbin:$PATH
 
+
 preConfigure=preConfigure
 preConfigure() {
     for i in \
 	sysui/desktop/share/makefile.mk \
 	; do 
-	substituteInPlace $i --replace /bin/bash /bin/sh
+	substituteInPlace $i --replace /bin/bash $shell
     done
 
+    SRCDIR=
+
     cd config_office/
 }
 
+
 postConfigure="cd .."
 
+
 buildPhase=buildPhase
 buildPhase() {
-  source LinuxX86Env.Set.sh
-  ./bootstrap
-
-  dmake
+    source LinuxX86Env.Set.sh
+    ./bootstrap
+    dmake # wait a few hours...
 }
 
+
+wrapSOffice() {
+    local fn=$1
+    local arg=$2
+
+    # !!! should use makeWrapper for this.
+
+    cat > $out/bin/$fn <<EOF 
+#! $shell
+# Add fontconfig to the library search path; apparently OpenOffice
+# looks for it at runtime.
+export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$fontconfig/lib
+exec $ooFiles/program/soffice $arg "\$@"
+EOF
+    chmod +x $out/bin/$fn
+}
+
+
+installPhase=installPhase
+installPhase() {
+    ooFiles=$out/lib/openoffice
+
+    # This was all borrowed from ooo-build-2.2.1's bin/ooinstall.
+    eval $(grep 'BUILD\|LAST_MINOR' $SOLARENV/inc/minor.mk)
+    export PYTHONPATH=$SOLARVERSION/$INPATH/lib:$SRC_ROOT/instsetoo_native/$INPATH/bin:$PYTHONPATH 
+    export OUT=../$INPATH
+    export LOCAL_OUT=../$INPATH
+    export LOCAL_COMMON_OUT=../$INPATH
+
+    # Do the actual installation into $out.
+    (cd $SRC_ROOT/instsetoo_native/util && perl -w $SOLARENV/bin/make_installer.pl \
+	-f openoffice.lst -l en-US -p OpenOffice \
+	-packagelist ../inc_openoffice/unix/packagelist.txt \
+	-addpackagelist ../inc_openoffice/unix/packagelist_language.txt \
+	-buildid $BUILD -simple $ooFiles)
+
+    ensureDir $out/bin
+    for i in soffice ooffice; do wrapSOffice $i; done
+    
+    # Create some wrappers to start individual OpenOffice components.
+    for i in writer calc draw impress base math web; do wrapSOffice oo$i -$i; done
+}
+
+
 genericBuild
diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index f2f3050e785e..78843709735e 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -54,4 +54,10 @@ stdenv.mkDerivation {
   ];
 
   inherit icu;
+
+  meta = {
+    description = "OpenOffice.org is a multiplatform and multilingual office suite";
+    homepage = http://www.openoffice.org/;
+    license = "LGPL";
+  };
 }
diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix
new file mode 100644
index 000000000000..23b781902e7b
--- /dev/null
+++ b/pkgs/development/tools/misc/epm/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, rpm}:
+
+stdenv.mkDerivation {
+  name = "epm-4.1";
+
+  src = fetchurl {
+    url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/epm/4.1/epm-4.1-source.tar.bz2;
+    sha256 = "18xq1h9hx410x28bfccabydrqb1c0dqnq62qa17wc3846rwf234n";
+  };
+
+  buildInputs = [rpm];
+
+  meta = {
+    description = "The ESP Package Manager generates distribution archives for a variety of platforms";
+    homepage = http://www.easysw.com/epm/index.php;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7e8f08f27ce..8693573bb84a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1167,6 +1167,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  epm = import ../development/tools/misc/epm {
+    inherit fetchurl stdenv rpm;
+  };
+
   flex = flex254a;
 
   flex2533 = import ../development/tools/parsing/flex/flex-2.5.33.nix {