diff --git a/maintainers/docs/todo.txt b/maintainers/docs/todo.txt
index c63a40d85bc6..fb2140d5431a 100644
--- a/maintainers/docs/todo.txt
+++ b/maintainers/docs/todo.txt
@@ -10,3 +10,5 @@
 
 * After building gcc, filter out references to /tmp/nix... in
   .../lib/libsupc++.la and .../lib/libstdc++.la
+
+* Consolidate unzip-5.52.
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index e9321e0e919f..e7e9c2f0601e 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -94,6 +94,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  unzip552 = (import ../tools/archivers/unzip-5.52) {
+    inherit fetchurl stdenv;
+  };
+
   gzip = (import ../tools/compression/gzip) {
     inherit fetchurl stdenv;
   };
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index ad6eab22cb9a..105de73cdb24 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -92,13 +92,23 @@ let {
   ;};
 
   powerpcDarwinPkgs = {inherit (import ./powerpc-darwin.nix)
+    unzip552
     aterm
     subversion
+    bisonnew
+    flexnew
+    libxml2
+    libxslt
+    docbook_xml_dtd_42
+    docbook_xml_dtd_43
+    docbook_xml_ebnf_dtd
+    docbook_xml_xslt
+    nxml
   ;};
 
 
   body = [
     i686LinuxPkgs
-#    powerpcDarwinPkgs
+    powerpcDarwinPkgs
   ];
 }
diff --git a/pkgs/system/stdenvs.nix b/pkgs/system/stdenvs.nix
index 649fa149cce6..5af6c80338dd 100644
--- a/pkgs/system/stdenvs.nix
+++ b/pkgs/system/stdenvs.nix
@@ -58,7 +58,7 @@
   # (essentially it's just the native environment).
   stdenvDarwin = (import ../stdenv/darwin) {
     stdenv = stdenvInitial;
-    genericStdenv = import ../stdenv/generic-branch;
+    genericStdenv = import ../stdenv/generic;
     inherit gccWrapper;
   };
 
diff --git a/pkgs/tools/archivers/unzip-5.52/builder.sh b/pkgs/tools/archivers/unzip-5.52/builder.sh
new file mode 100644
index 000000000000..0166eecce6b7
--- /dev/null
+++ b/pkgs/tools/archivers/unzip-5.52/builder.sh
@@ -0,0 +1,14 @@
+. $stdenv/setup
+
+builder() {
+    make -f unix/Makefile generic
+}
+
+installer() {
+    make -f unix/Makefile prefix=$out install
+}
+
+buildPhase=builder
+installPhase=installer
+
+genericBuild
diff --git a/pkgs/tools/archivers/unzip-5.52/default.nix b/pkgs/tools/archivers/unzip-5.52/default.nix
new file mode 100644
index 000000000000..b7114e190bf0
--- /dev/null
+++ b/pkgs/tools/archivers/unzip-5.52/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "unzip-5.52";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz;
+    md5 = "9d23919999d6eac9217d1f41472034a9";
+  };
+}