diff --git a/pkgs/development/libraries/mbedtls/0001-fix-gcc14-build.patch b/pkgs/by-name/mb/mbedtls/0001-fix-gcc14-build.patch
similarity index 100%
rename from pkgs/development/libraries/mbedtls/0001-fix-gcc14-build.patch
rename to pkgs/by-name/mb/mbedtls/0001-fix-gcc14-build.patch
diff --git a/pkgs/development/libraries/mbedtls/4.nix b/pkgs/by-name/mb/mbedtls/4.nix
similarity index 100%
rename from pkgs/development/libraries/mbedtls/4.nix
rename to pkgs/by-name/mb/mbedtls/4.nix
diff --git a/pkgs/development/libraries/mbedtls/generic.nix b/pkgs/by-name/mb/mbedtls/generic.nix
similarity index 100%
rename from pkgs/development/libraries/mbedtls/generic.nix
rename to pkgs/by-name/mb/mbedtls/generic.nix
diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/by-name/mb/mbedtls/package.nix
similarity index 100%
rename from pkgs/development/libraries/mbedtls/3.nix
rename to pkgs/by-name/mb/mbedtls/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c5c22602d0a..680b8cec248f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6746,8 +6746,12 @@ with pkgs;
     )
       haskellPackages.matterhorn;
 
-  mbedtls = callPackage ../development/libraries/mbedtls/3.nix { };
-  mbedtls_4 = callPackage ../development/libraries/mbedtls/4.nix { };
+  inherit
+    ({
+      mbedtls_4 = callPackage ../by-name/mb/mbedtls/4.nix { };
+    })
+    mbedtls_4
+    ;
 
   simple-dftd3 = callPackage ../development/libraries/science/chemistry/simple-dftd3 { };