diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/by-name/op/opensmtpd/package.nix
similarity index 100%
rename from pkgs/servers/mail/opensmtpd/default.nix
rename to pkgs/by-name/op/opensmtpd/package.nix
diff --git a/pkgs/servers/mail/opensmtpd/proc_path.diff b/pkgs/by-name/op/opensmtpd/proc_path.diff
similarity index 100%
rename from pkgs/servers/mail/opensmtpd/proc_path.diff
rename to pkgs/by-name/op/opensmtpd/proc_path.diff
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b39004e6779..d4e8914fa241 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12100,8 +12100,6 @@ with pkgs;
     modules = [ ];
   };
 
-  opensmtpd = callPackage ../servers/mail/opensmtpd { };
-
   system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { });
 
   # PulseAudio daemons