diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/by-name/bm/bmaptool/package.nix
similarity index 62%
rename from pkgs/tools/misc/bmap-tools/default.nix
rename to pkgs/by-name/bm/bmaptool/package.nix
index 2f36c452fcb15..163aca8edb3b8 100644
--- a/pkgs/tools/misc/bmap-tools/default.nix
+++ b/pkgs/by-name/bm/bmaptool/package.nix
@@ -1,14 +1,14 @@
 { lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  pname = "bmap-tools";
-  version = "3.6";
+  pname = "bmaptool";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
-    owner = "intel";
-    repo = "bmap-tools";
+    owner = "yoctoproject";
+    repo = "bmaptool";
     rev = "v${version}";
-    sha256 = "01xzrv5nvd2nvj91lz4x9s91y9825j9pj96z0ap6yvy3w2dgvkkl";
+    sha256 = "sha256-YPY3sNuZ/TASNBPH94iqG6AuBRq5KjioKiuxAcu94+I=";
   };
 
   propagatedBuildInputs = with python3Packages; [ six ];
@@ -17,8 +17,8 @@ python3Packages.buildPythonApplication rec {
   doCheck = false;
 
   meta = with lib; {
-    description = "bmap-related tools";
-    homepage = "https://github.com/intel/bmap-tools";
+    description = "BMAP Tools";
+    homepage = "https://github.com/yoctoproject/bmaptool";
     license = licenses.gpl2Only;
     maintainers = [ maintainers.dezgeg ];
     platforms = platforms.linux;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 48238717d5ca5..1f461e3fef780 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -171,6 +171,7 @@ mapAliases ({
       (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30
   blockbench-electron = blockbench; # Added 2024-03-16
   bluezFull = throw "'bluezFull' has been renamed to/replaced by 'bluez'"; # Converted to throw 2023-09-10
+  bmap-tools = bmaptool; # Added 2024-08-05
   bookletimposer = throw "bookletimposer has been removed from nixpkgs; upstream unmaintained and broke with pypdf3"; # Added 2024-01-01
   boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08
   boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 688bfe22cfc2e..a48f25fe9072f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3411,8 +3411,6 @@ with pkgs;
 
   blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
 
-  bmap-tools = callPackage ../tools/misc/bmap-tools { };
-
   bolliedelayxt-lv2 = callPackage ../applications/audio/bolliedelayxt.lv2 { };
 
   bonnmotion = callPackage ../development/tools/misc/bonnmotion { };