diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index c7c3bb9f3f3f..125eff9aec57 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -152,9 +152,12 @@ let
         inherit lib config stdenv;
       }) mkDerivation;
 
-      # For convenience, bring in the library functions in lib/ so
-      # packages don't have to do that themselves.
-      inherit lib;
+      # Slated for deprecation in 21.11
+      lib = builtins.trace ( "Warning: `stdenv.lib` is deprecated "
+                           + "and will be removed in the next release. "
+                           + "Please use `pkgs.lib` instead. "
+                           + "For more information see https://github.com/NixOS/nixpkgs/issues/108938")
+                           lib;
 
       inherit fetchurlBoot;