diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index 9af41d19a301..e7711eb226e4 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -13,17 +13,18 @@ stdenv.mkDerivation rec {
 
   #downloadRoot = "http://download.services.openoffice.org/files/stable";
   downloadRoot = "http://www-openoffice.com/source/";
+  versionDirs = false;
 
   src = fetchurl {
-      url = "${downloadRoot}/${version}/OOo_${version}_src_core.tar.bz2";
-      sha256 = "b44ab94c75b89c9354531ddba9c211374567535e147308a934e8c35d7b26814a";
+      url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2";
+      sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca";
     };
 
   patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ];
 
   src_system = fetchurl {
       url = "${downloadRoot}/${version}/OOo_${version}_src_system.tar.bz2";
-      sha256 = "97796333eb2f17e8199026d4ab4334d59bbbffc8d2f9d9100a0c27e823e1305a";
+      sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a";
     };
 
   configureFlags = "