diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/by-name/fe/fetchmail/package.nix
similarity index 92%
rename from pkgs/applications/misc/fetchmail/default.nix
rename to pkgs/by-name/fe/fetchmail/package.nix
index f25cc0a69017..ab61a26c5a32 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/by-name/fe/fetchmail/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fetchmail";
-  version = "6.5.7";
+  version = "6.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
-    hash = "sha256-c+trHUIbWYaGatSmt3fBFAo5AFKYxjv4R95TeXbL+9s=";
+    hash = "sha256-e5wZ5mg+gn1VZ1GqXbXUS5Yeh76LMIdTW0kJuhtZMhw=";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/misc/fetchmail/v7.nix b/pkgs/by-name/fe/fetchmail_7/package.nix
similarity index 100%
rename from pkgs/applications/misc/fetchmail/v7.nix
rename to pkgs/by-name/fe/fetchmail_7/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27a3db1de03a..0130772f5741 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10951,9 +10951,6 @@ with pkgs;
         ];
       };
 
-  fetchmail = callPackage ../applications/misc/fetchmail { };
-  fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { };
-
   firewalld-gui = firewalld.override { withGui = true; };
 
   fldigi = callPackage ../applications/radio/fldigi {