diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix
index c01f6dbb6d1..789bc5a53da 100644
--- a/pkgs/applications/office/openoffice/default.nix
+++ b/pkgs/applications/office/openoffice/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/office/openoffice/stable/2.3.0/OOo_2.3.0_src_core.tar.bz2;
+	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";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 873d2469042..5b913cfcae1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2761,7 +2761,15 @@ rec {
         };
         extraConfig = "CONFIG_FB_SPLASH=y";
       }
-    ];
+    ]++
+	/*(if (getConfig ["kernel" "no_hz"] false) then */[
+	{
+		name = "Enable-NO_HZ";
+		patch = /dev/null;
+		extraConfig = "NO_HZ=y\n";
+	}
+	]/* else [])*/
+	;
   };
 
   libselinux = import ../os-specific/linux/libselinux {
@@ -3624,6 +3632,10 @@ rec {
     #enableOfficialBranding = true;
   };
 
+  timidity = import ../tools/misc/timidity {
+    inherit fetchurl stdenv alsaLib;
+  };
+
   unison = import ../applications/networking/sync/unison {
     inherit fetchurl stdenv ocaml lablgtk makeWrapper;
     inherit (xorg) xset fontschumachermisc;