diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md
index 284b120dc7bc..477986ffb152 100644
--- a/doc/release-notes/rl-2505.section.md
+++ b/doc/release-notes/rl-2505.section.md
@@ -21,6 +21,10 @@
 - [testers.shellcheck](https://nixos.org/manual/nixpkgs/unstable/#tester-shellcheck) now warns when `name` is not provided.
   The `name` argument will become mandatory in a future release.
 
+- `xdragon` package has been renamed to `dragon-drop`.
+  `xdragon` is an alias to `dragon-drop` and the package still provides `bin/xdragon`.
+  `bin/dragon` is no longer supplied.
+
 - The `nixLog*` family of functions made available through the standard environment have been rewritten to prefix messages with both the debug level and the function name of the caller.
   The `nixLog` function, which logs unconditionally, was also re-introduced and modified to prefix messages with the function name of the caller.
   For more information, [see this PR](https://github.com/NixOS/nixpkgs/pull/370742).
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bd93a8e274e5..59063b1e917c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23338,6 +23338,12 @@
       }
     ];
   };
+  taliyahwebb = {
+    email = "taliyahmail@proton.me";
+    github = "taliyahwebb";
+    githubId = 161863235;
+    name = "Taliyah Webb";
+  };
   talkara = {
     email = "taito.horiuchi@relexsolutions.com";
     github = "talkara";
diff --git a/pkgs/tools/X11/xdragon/default.nix b/pkgs/by-name/dr/dragon-drop/package.nix
similarity index 65%
rename from pkgs/tools/X11/xdragon/default.nix
rename to pkgs/by-name/dr/dragon-drop/package.nix
index 9fa790b2048b..9a3f5a7e64a2 100644
--- a/pkgs/tools/X11/xdragon/default.nix
+++ b/pkgs/by-name/dr/dragon-drop/package.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "xdragon";
+  pname = "dragon-drop";
   version = "1.2.0";
 
   src = fetchFromGitHub {
@@ -20,16 +20,21 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gtk3 ];
 
+  makeFlags = [ "NAME=dragon-drop" ];
   installFlags = [ "PREFIX=${placeholder "out"}" ];
   postInstall = ''
-    ln -s $out/bin/dragon $out/bin/xdragon
+    ln -s $out/bin/dragon-drop $out/bin/xdragon
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple drag-and-drop source/sink for X or Wayland (called dragon in upstream)";
     homepage = "https://github.com/mwh/dragon";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ das_j ];
-    mainProgram = "xdragon";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      das_j
+      taliyahwebb
+    ];
+    mainProgram = "dragon-drop";
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 984ca8538140..fd1e82d28a68 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1704,6 +1704,7 @@ mapAliases {
   xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17
   xboxdrv = throw "'xboxdrv' has been dropped as it has been superseded by an in-tree kernel driver"; # Added 2024-12-25
   xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17
+  xdragon = dragon-drop; # Added 2025-03-22
   xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30
   xen-slim = throw "'xen-slim' has been renamed to 'xen'. The old Xen package with built-in components no longer exists"; # Added 2024-10-05
   xen_4_16 = throw "While Xen 4.16 was still security-supported when it was removed from Nixpkgs, it would have reached its End of Life a couple of days after NixOS 24.11 released. To avoid shipping an insecure version of Xen, the Xen Project Hypervisor Maintenance Team decided to delete the derivation entirely"; # Added 2024-10-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19ac0547d41b..4a91b6a2ccc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17684,8 +17684,6 @@ with pkgs;
     stdenv = gccStdenv;
   };
 
-  xdragon = lowPrio (callPackage ../tools/X11/xdragon { });
-
   sail-riscv = callPackage ../applications/virtualization/sail-riscv {
     inherit (ocamlPackages) sail;
   };