diff --git a/.github/plugin/marketplace.json b/.github/plugin/marketplace.json
index a5e00e368..4ab70462b 100644
--- a/.github/plugin/marketplace.json
+++ b/.github/plugin/marketplace.json
@@ -2460,6 +2460,36 @@
         "sha": "7c4e67e320c82600e9fb7d8786ea3a9927039b72"
       }
     },
+    {
+      "name": "windbg",
+      "description": "WinDbg diagnosis workflows for native Windows applications, services, UMDF/user-mode drivers, and kernel-mode drivers. Covers crashes, hangs, heap corruption, memory exhaustion, TTD, bugchecks, Driver Verifier, IRP lifecycle, and kernel deadlocks, with an evidence-first method and report validation.",
+      "version": "1.0.0",
+      "author": {
+        "name": "Microsoft",
+        "url": "https://github.com/microsoft/WinDbg-Feedback"
+      },
+      "repository": "https://github.com/microsoft/win-dev-skills",
+      "homepage": "https://github.com/microsoft/WinDbg-Feedback",
+      "license": "MIT",
+      "keywords": [
+        "windows",
+        "windbg",
+        "debugging",
+        "crash-dump",
+        "hang",
+        "memory",
+        "drivers",
+        "kernel",
+        "umdf",
+        "ttd"
+      ],
+      "source": {
+        "source": "github",
+        "repo": "microsoft/win-dev-skills",
+        "path": "plugins/windbg",
+        "sha": "5ce74fa89c49ca353c6ab03bd5889aa519aa9e5e"
+      }
+    },
     {
       "name": "windows-app-storage-inspector-cleanup",
       "source": "plugins/windows-app-storage-inspector-cleanup",
diff --git a/plugins/external.json b/plugins/external.json
index 6ec3054c6..c0165c4af 100644
--- a/plugins/external.json
+++ b/plugins/external.json
@@ -1838,6 +1838,36 @@
       "sha": "7c4e67e320c82600e9fb7d8786ea3a9927039b72"
     }
   },
+  {
+    "name": "windbg",
+    "description": "WinDbg diagnosis workflows for native Windows applications, services, UMDF/user-mode drivers, and kernel-mode drivers. Covers crashes, hangs, heap corruption, memory exhaustion, TTD, bugchecks, Driver Verifier, IRP lifecycle, and kernel deadlocks, with an evidence-first method and report validation.",
+    "version": "1.0.0",
+    "author": {
+      "name": "Microsoft",
+      "url": "https://github.com/microsoft/WinDbg-Feedback"
+    },
+    "repository": "https://github.com/microsoft/win-dev-skills",
+    "homepage": "https://github.com/microsoft/WinDbg-Feedback",
+    "license": "MIT",
+    "keywords": [
+      "windows",
+      "windbg",
+      "debugging",
+      "crash-dump",
+      "hang",
+      "memory",
+      "drivers",
+      "kernel",
+      "umdf",
+      "ttd"
+    ],
+    "source": {
+      "source": "github",
+      "repo": "microsoft/win-dev-skills",
+      "path": "plugins/windbg",
+      "sha": "5ce74fa89c49ca353c6ab03bd5889aa519aa9e5e"
+    }
+  },
   {
     "name": "winui",
     "description": "Agents and skills for WinUI 3 app development. Create new WinUI 3 desktop apps, convert from other frameworks (WPF, WinForms, Electron, Tauri, Flutter) to WinUI 3, or add features to existing WinUI 3 applications. Includes MSIX packaging, code signing, UI automation testing, and Windows App SDK guidance.",