diff --git a/pkgs/development/libraries/glibc/2.17/builder.sh b/pkgs/development/libraries/glibc/2.18/builder.sh
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/builder.sh
rename to pkgs/development/libraries/glibc/2.18/builder.sh
diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.18/common.nix
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/common.nix
rename to pkgs/development/libraries/glibc/2.18/common.nix
diff --git a/pkgs/development/libraries/glibc/2.17/cve-2013-0242.patch b/pkgs/development/libraries/glibc/2.18/cve-2013-0242.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/cve-2013-0242.patch
rename to pkgs/development/libraries/glibc/2.18/cve-2013-0242.patch
diff --git a/pkgs/development/libraries/glibc/2.17/cve-2013-1914.patch b/pkgs/development/libraries/glibc/2.18/cve-2013-1914.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/cve-2013-1914.patch
rename to pkgs/development/libraries/glibc/2.18/cve-2013-1914.patch
diff --git a/pkgs/development/libraries/glibc/2.17/default.nix b/pkgs/development/libraries/glibc/2.18/default.nix
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/default.nix
rename to pkgs/development/libraries/glibc/2.18/default.nix
diff --git a/pkgs/development/libraries/glibc/2.17/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/2.18/dont-use-system-ld-so-cache.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/dont-use-system-ld-so-cache.patch
rename to pkgs/development/libraries/glibc/2.18/dont-use-system-ld-so-cache.patch
diff --git a/pkgs/development/libraries/glibc/2.17/glibc-crypt-blowfish.patch b/pkgs/development/libraries/glibc/2.18/glibc-crypt-blowfish.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/glibc-crypt-blowfish.patch
rename to pkgs/development/libraries/glibc/2.18/glibc-crypt-blowfish.patch
diff --git a/pkgs/development/libraries/glibc/2.17/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.18/glibc-elf-localscope.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/glibc-elf-localscope.patch
rename to pkgs/development/libraries/glibc/2.18/glibc-elf-localscope.patch
diff --git a/pkgs/development/libraries/glibc/2.17/glibc-rh739743.patch b/pkgs/development/libraries/glibc/2.18/glibc-rh739743.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/glibc-rh739743.patch
rename to pkgs/development/libraries/glibc/2.18/glibc-rh739743.patch
diff --git a/pkgs/development/libraries/glibc/2.17/info.nix b/pkgs/development/libraries/glibc/2.18/info.nix
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/info.nix
rename to pkgs/development/libraries/glibc/2.18/info.nix
diff --git a/pkgs/development/libraries/glibc/2.17/locales-builder.sh b/pkgs/development/libraries/glibc/2.18/locales-builder.sh
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/locales-builder.sh
rename to pkgs/development/libraries/glibc/2.18/locales-builder.sh
diff --git a/pkgs/development/libraries/glibc/2.17/locales.nix b/pkgs/development/libraries/glibc/2.18/locales.nix
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/locales.nix
rename to pkgs/development/libraries/glibc/2.18/locales.nix
diff --git a/pkgs/development/libraries/glibc/2.17/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.18/nix-locale-archive.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/nix-locale-archive.patch
rename to pkgs/development/libraries/glibc/2.18/nix-locale-archive.patch
diff --git a/pkgs/development/libraries/glibc/2.17/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.18/rpcgen-path.patch
similarity index 100%
rename from pkgs/development/libraries/glibc/2.17/rpcgen-path.patch
rename to pkgs/development/libraries/glibc/2.18/rpcgen-path.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85b0aaed6f1f..9f8741b69c87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4177,8 +4177,6 @@ let
 
   glfw = callPackage ../development/libraries/glfw { };
 
-  glibcCross = glibc217Cross;
-
   glibc213 = (callPackage ../development/libraries/glibc/2.13 {
     kernelHeaders = linuxHeaders;
     installLocales = config.glibc.locales or false;
@@ -4200,7 +4198,7 @@ let
         inherit fetchgit;
       }));
 
-  glibc = callPackage ../development/libraries/glibc/2.17 {
+  glibc = callPackage ../development/libraries/glibc/2.18 {
     kernelHeaders = linuxHeaders;
     installLocales = config.glibc.locales or false;
     machHeaders = null;
@@ -4208,13 +4206,13 @@ let
     gccCross = null;
   };
 
-  glibc_memusage = callPackage ../development/libraries/glibc/2.17 {
+  glibc_memusage = callPackage ../development/libraries/glibc/2.18 {
     kernelHeaders = linuxHeaders;
     installLocales = false;
     withGd = true;
   };
 
-  glibc217Cross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.17)
+  glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.18)
     (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu";
      in {
        inherit stdenv fetchurl;
@@ -4243,9 +4241,9 @@ let
     installLocales = config.glibc.locales or false;
   };
 
-  glibcLocales = callPackage ../development/libraries/glibc/2.17/locales.nix { };
+  glibcLocales = callPackage ../development/libraries/glibc/2.18/locales.nix { };
 
-  glibcInfo = callPackage ../development/libraries/glibc/2.17/info.nix { };
+  glibcInfo = callPackage ../development/libraries/glibc/2.18/info.nix { };
 
   glibc_multi =
     runCommand "${glibc.name}-multi"