diff --git a/pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch b/pkgs/by-name/ms/msmtp/msmtpq-remove-binary-check.patch
similarity index 100%
rename from pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch
rename to pkgs/by-name/ms/msmtp/msmtpq-remove-binary-check.patch
diff --git a/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch b/pkgs/by-name/ms/msmtp/msmtpq-systemd-logging.patch
similarity index 100%
rename from pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch
rename to pkgs/by-name/ms/msmtp/msmtpq-systemd-logging.patch
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/by-name/ms/msmtp/package.nix
similarity index 98%
rename from pkgs/applications/networking/msmtp/default.nix
rename to pkgs/by-name/ms/msmtp/package.nix
index 60946106d0dd..e2de1f2fe68d 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/by-name/ms/msmtp/package.nix
@@ -4,7 +4,7 @@
   symlinkJoin,
   lib,
   fetchFromGitHub,
-  autoreconfHook,
+  autoreconfHook269,
   pkg-config,
   bash,
   coreutils,
@@ -62,7 +62,7 @@ let
     ] ++ optionals withKeyring [ libsecret ];
 
     nativeBuildInputs = [
-      autoreconfHook
+      autoreconfHook269
       pkg-config
       texinfo
     ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f6cde488533..2d89e07134d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13308,10 +13308,6 @@ with pkgs;
 
   taxi-cli = with python3Packages; toPythonApplication taxi;
 
-  msmtp = callPackage ../applications/networking/msmtp {
-    autoreconfHook = buildPackages.autoreconfHook269;
-  };
-
   imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix {
     lua = lua5;
   };