diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/by-name/ki/kiwix/package.nix
similarity index 83%
rename from pkgs/applications/misc/kiwix/default.nix
rename to pkgs/by-name/ki/kiwix/package.nix
index 73e4fef2f132..4f533852df27 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/by-name/ki/kiwix/package.nix
@@ -5,12 +5,7 @@
   nix-update-script,
   libkiwix,
   pkg-config,
-  qmake,
-  qtbase,
-  qtwebengine,
-  qtsvg,
-  qtimageformats,
-  wrapQtAppsHook,
+  qt6,
   aria2,
 }:
 
@@ -30,17 +25,17 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    qmake
+    qt6.qmake
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     libkiwix
-    qtbase
-    qtwebengine
-    qtsvg
-    qtimageformats
+    qt6.qtbase
+    qt6.qtwebengine
+    qt6.qtsvg
+    qt6.qtimageformats
   ];
 
   qtWrapperArgs = [
diff --git a/pkgs/applications/misc/kiwix/remove-Werror.patch b/pkgs/by-name/ki/kiwix/remove-Werror.patch
similarity index 100%
rename from pkgs/applications/misc/kiwix/remove-Werror.patch
rename to pkgs/by-name/ki/kiwix/remove-Werror.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c427377f8b1a..c7317bc0497d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10289,8 +10289,6 @@ with pkgs;
 
   k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
 
-  kiwix = qt6Packages.callPackage ../applications/misc/kiwix { };
-
   klayout = libsForQt5.callPackage ../applications/misc/klayout { };
 
   kotatogram-desktop =