diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
index fa8c481f4917..4af18da693a7 100644
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -83,6 +83,10 @@
         "date": "2026-02-04",
         "new": "bats-vim"
     },
+    "bitbake-vim": {
+        "date": "2026-04-09",
+        "new": "bitbake"
+    },
     "calendar": {
         "date": "2026-02-04",
         "new": "calendar-vim"
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 0bdd6a0d9575..5bb6cacfa5ae 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1582,6 +1582,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  bitbake = buildVimPlugin {
+    pname = "bitbake";
+    version = "2.12.0-unstable-2026-04-08";
+    src = fetchFromGitHub {
+      owner = "openembedded";
+      repo = "bitbake";
+      rev = "5d722b5d65e4eef7befe6376983385421e993f86";
+      hash = "sha256-nOnNIXRUxsYNaEBhWuzCMTg37C9/S4ekxNbCpvBe+TU=";
+    };
+    meta.homepage = "https://github.com/openembedded/bitbake/";
+    meta.hydraPlatforms = [ ];
+  };
+
   blame-nvim = buildVimPlugin {
     pname = "blame.nvim";
     version = "0-unstable-2026-02-12";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix
deleted file mode 100644
index f43b0557c4d8..000000000000
--- a/pkgs/applications/editors/vim/plugins/non-generated/bitbake-vim/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  vimUtils,
-  fetchFromGitHub,
-}:
-vimUtils.buildVimPlugin rec {
-  pname = "bitbake-vim";
-  version = "2.10.4";
-
-  # The tags are very messy on the upstream repo. We prefer disabling automatic updates for this plugin.
-  # nixpkgs-update: no auto update
-  src = fetchFromGitHub {
-    owner = "openembedded";
-    repo = "bitbake";
-    tag = version;
-    hash = "sha256-gdxPnRhd4Hj1PWgCU5A/+639ndJXlkdArOBZt6eiZWA=";
-  };
-
-  sourceRoot = "source/contrib/vim";
-
-  meta.homepage = "https://github.com/openembedded/bitbake/";
-}
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index ac3f29e5730b..95a1c87e0d60 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -304,6 +304,10 @@ assertNoAdditions {
     ];
   };
 
+  bitbake = super.bitbake.overrideAttrs {
+    sourceRoot = "source/contrib/vim";
+  };
+
   blink-cmp-conventional-commits = super.blink-cmp-conventional-commits.overrideAttrs {
     dependencies = [ self.blink-cmp ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index a8bb5fbf3787..da5c2c3d2f9a 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -120,6 +120,7 @@ https://github.com/rbgrouleff/bclose.vim/,,
 https://github.com/sontungexpt/better-diagnostic-virtual-text/,HEAD,
 https://github.com/max397574/better-escape.nvim/,,
 https://github.com/LunarVim/bigfile.nvim/,,
+https://github.com/openembedded/bitbake/,HEAD,
 https://github.com/FabijanZulj/blame.nvim/,HEAD,
 https://github.com/APZelos/blamer.nvim/,HEAD,
 https://github.com/Kaiser-Yang/blink-cmp-avante/,HEAD,