diff --git a/pkgs/by-name/xw/xwiimote/package.nix b/pkgs/by-name/xw/xwiimote/package.nix
new file mode 100644
index 000000000000..a17299197d27
--- /dev/null
+++ b/pkgs/by-name/xw/xwiimote/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  udev,
+  ncurses,
+  pkg-config,
+  fetchFromGitHub,
+  bluez,
+  autoreconfHook,
+}:
+
+stdenv.mkDerivation {
+  pname = "xwiimote";
+  version = "2-unstable-2024-02-29";
+
+  src = fetchFromGitHub {
+    owner = "xwiimote";
+    repo = "xwiimote";
+    rev = "4df713d9037d814cc0c64197f69e5c78d55caaf1";
+    hash = "sha256-y68bi62H7ErVekcs0RZUXPpW+QJ97sTQP4lajB9PsgU=";
+  };
+
+  configureFlags = [ "--with-doxygen=no" ];
+
+  buildInputs = [
+    udev
+    ncurses
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+  ];
+
+  postInstallPhase = ''
+    mkdir -p "$out/etc/X11/xorg.conf.d/"
+    cp "res/50-xorg-fix-xwiimote.conf" "$out/etc/X11/xorg.conf.d/50-fix-xwiimote.conf"
+  '';
+
+  meta = {
+    homepage = "https://xwiimote.github.io/xwiimote/";
+    description = "Userspace utilities to control connected Nintendo Wii Remotes";
+    mainProgram = "xwiishow";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix
deleted file mode 100644
index 14f22c9463ed..000000000000
--- a/pkgs/misc/drivers/xwiimote/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, udev, ncurses, pkg-config, fetchurl, bluez }:
-
-stdenv.mkDerivation rec {
-  pname = "xwiimote";
-  version = "2";
-
-  src = fetchurl {
-    url = "https://github.com/dvdhrm/xwiimote/releases/download/xwiimote-${version}/xwiimote-${version}.tar.xz";
-    sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ udev ncurses bluez ];
-
-  configureFlags = [ "--with-doxygen=no" ];
-
-  meta = {
-    homepage = "https://dvdhrm.github.io/xwiimote";
-    description = "Userspace utilities to control connected Nintendo Wii Remotes";
-    mainProgram = "xwiishow";
-    platforms = lib.platforms.linux;
-    license = lib.licenses.mit;
-  };
-
-  postInstallPhase = ''
-    mkdir -p "$out/etc/X11/xorg.conf.d/"
-    cp "res/50-xorg-fix-xwiimote.conf" "$out/etc/X11/xorg.conf.d/50-fix-xwiimote.conf"
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c26167e3528..3a37f10b5570 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -39470,8 +39470,6 @@ with pkgs;
 
   xva-img = callPackage ../tools/virtualization/xva-img { };
 
-  xwiimote = callPackage ../misc/drivers/xwiimote { };
-
   xzoom = callPackage ../tools/X11/xzoom { };
 
   yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { };