diff --git a/pkgs/lib/attrsets.nix b/pkgs/lib/attrsets.nix
index f562a2f7df4..01d51779c80 100644
--- a/pkgs/lib/attrsets.nix
+++ b/pkgs/lib/attrsets.nix
@@ -246,7 +246,7 @@ rec {
 
   /* backward compatibility */
   zipWithNames = zipAttrsWithNames;
-  zip = zipAttrsWith;
+  zip = builtins.trace "lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith;
 
 
   /* Does the same as the update operator '//' except that attributes are
diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index b634cccc8c6..afd5ed5e17c 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -117,7 +117,7 @@ rec {
       name = "attribute set of ${elemType.name}s";
       check = x: lib.traceValIfNot isAttrs x
         && fold (e: v: v && elemType.check e) true (lib.attrValues x);
-      merge = lib.zip (name: elemType.merge);
+      merge = lib.zipAttrsWith (name: elemType.merge);
       iter = f: path: set: lib.mapAttrs (name: elemType.iter f (path + "." + name)) set;
       fold = op: nul: set: fold (e: l: elemType.fold op l e) nul (lib.attrValues set);
       docPath = path: elemType.docPath (path + ".<name>");