diff --git a/pkgs/top-level/stdenvs.nix b/pkgs/stdenv/default.nix
similarity index 86%
rename from pkgs/top-level/stdenvs.nix
rename to pkgs/stdenv/default.nix
index fe25421b804..b66d770782c 100644
--- a/pkgs/top-level/stdenvs.nix
+++ b/pkgs/stdenv/default.nix
@@ -10,11 +10,11 @@
 rec {
 
   gccWrapper = import ../build-support/gcc-wrapper;
-  genericStdenv = import ../stdenv/generic;
+  genericStdenv = import ./generic;
 
 
   # Trivial environment used for building other environments.
-  stdenvInitial = (import ../stdenv/initial) {
+  stdenvInitial = (import ./initial) {
     name = "stdenv-initial";
     inherit system;
   };
@@ -25,7 +25,7 @@ rec {
   # i.e., the stuff in /bin, /usr/bin, etc.  This environment should
   # be used with care, since many Nix packages will not build properly
   # with it (e.g., because they require GNU Make).
-  stdenvNative = (import ../stdenv/native) {
+  stdenvNative = (import ./native) {
     stdenv = stdenvInitial;
     inherit genericStdenv gccWrapper;
   };
@@ -37,7 +37,7 @@ rec {
 
 
   # The Nix build environment.
-  stdenvNix = (import ../stdenv/nix) {
+  stdenvNix = (import ./nix) {
     stdenv = stdenvNative;
     pkgs = stdenvNativePkgs;
     inherit genericStdenv gccWrapper;
@@ -50,13 +50,13 @@ rec {
 
 
   # Linux standard environment.
-  inherit (import ../stdenv/linux {inherit allPackages;})
+  inherit (import ./linux {inherit allPackages;})
     stdenvLinux stdenvLinuxPkgs;
 
     
   # Darwin (Mac OS X) standard environment.  Very simple for now
   # (essentially it's just the native environment).
-  stdenvDarwin = (import ../stdenv/darwin) {
+  stdenvDarwin = (import ./darwin) {
     stdenv = stdenvInitial;
     inherit genericStdenv gccWrapper;
   };
@@ -70,7 +70,7 @@ rec {
   # FreeBSD standard environment.  Right now this is more or less the
   # same as the native environemnt.  Eventually we'll want a pure
   # environment similar to stdenvLinux.
-  stdenvFreeBSD = (import ../stdenv/freebsd) {
+  stdenvFreeBSD = (import ./freebsd) {
     stdenv = stdenvInitial;
     inherit genericStdenv gccWrapper;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf3fd7ca20a..a88ebc862de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -42,7 +42,7 @@ rec {
   stdenv = if bootStdenv == null then defaultStdenv else bootStdenv;
 
   defaultStdenv =
-    (import ./stdenvs.nix {
+    (import ../stdenv {
       inherit system;
       allPackages = import ./all-packages.nix;
     }).stdenv;