diff --git a/pkgs/servers/s6/default.nix b/pkgs/tools/system/s6/default.nix
similarity index 100%
rename from pkgs/servers/s6/default.nix
rename to pkgs/tools/system/s6/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3abd95b2930..5376370a84d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9144,7 +9144,7 @@ let
 
   ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { };
 
-  s6 = callPackage ../servers/s6 { };
+  s6 = callPackage ../tools/system/s6 { };
 
   s6-rc = callPackage ../tools/system/s6-rc { };