diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index e7e9c2f0601..8fb66915115 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -90,7 +90,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  unzip = (import ../tools/archivers/unzip) {
+  # !!! fix this
+  unzip = if stdenv.system == "i686-linux" then unzip550 else unzip552;
+
+  unzip550 = (import ../tools/archivers/unzip) {
     inherit fetchurl stdenv;
   };
 
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 105de73cdb2..070d3eb82a2 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -96,7 +96,7 @@ let {
     aterm
     subversion
     bisonnew
-    flexnew
+#    flexnew
     libxml2
     libxslt
     docbook_xml_dtd_42