diff --git a/pkgs/os-specific/linux/drbd/driver.nix b/pkgs/by-name/dr/drbd/driver.nix
similarity index 100%
rename from pkgs/os-specific/linux/drbd/driver.nix
rename to pkgs/by-name/dr/drbd/driver.nix
diff --git a/pkgs/os-specific/linux/drbd/utils.nix b/pkgs/by-name/dr/drbd/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/drbd/utils.nix
rename to pkgs/by-name/dr/drbd/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af50d8cea080..4f2b40617728 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8278,8 +8278,6 @@ with pkgs;
 
   dmraid = callPackage ../os-specific/linux/dmraid { lvm2 = lvm2_dmeventd; };
 
-  drbd = callPackage ../os-specific/linux/drbd/utils.nix { };
-
   # unstable until the first 1.x release
   fwts = callPackage ../os-specific/linux/fwts { };
 
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index fe8ebd43504f..1c674c91fda0 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -619,7 +619,7 @@ in
 
         hpuefi-mod = callPackage ../os-specific/linux/hpuefi-mod { };
 
-        drbd = callPackage ../os-specific/linux/drbd/driver.nix { };
+        drbd = callPackage ../by-name/dr/drbd/driver.nix { };
 
         nullfsvfs = callPackage ../os-specific/linux/nullfsvfs { };