diff --git a/ci/OWNERS b/ci/OWNERS
index 7c775d469baa..a51ed3ce62db 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -228,7 +228,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/tools/misc/esphome @mweinelt
 
 # Network Time Daemons
-/pkgs/tools/networking/chrony @thoughtpolice
+/pkgs/by-name/ch/chrony @thoughtpolice
 /pkgs/tools/networking/ntp @thoughtpolice
 /pkgs/tools/networking/openntpd @thoughtpolice
 /nixos/modules/services/networking/ntp @thoughtpolice
diff --git a/pkgs/tools/networking/chrony/makefile.patch b/pkgs/by-name/ch/chrony/makefile.patch
similarity index 100%
rename from pkgs/tools/networking/chrony/makefile.patch
rename to pkgs/by-name/ch/chrony/makefile.patch
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/by-name/ch/chrony/package.nix
similarity index 100%
rename from pkgs/tools/networking/chrony/default.nix
rename to pkgs/by-name/ch/chrony/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c58aaa8b0f2..f645c420fdee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6269,8 +6269,6 @@ with pkgs;
 
   chkrootkit = callPackage ../tools/security/chkrootkit { };
 
-  chrony = callPackage ../tools/networking/chrony { };
-
   chunkfs = callPackage ../tools/filesystems/chunkfs { };
 
   chunksync = callPackage ../tools/backup/chunksync { };