diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle b/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle
index 8387e35ad7..f62aae2a9c 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle
@@ -67,17 +67,19 @@ else if (file(tlb).exists()) {
 	}
 }
 else {
-	def prebuiltTlb = new File(rootProject.BIN_REPO + '/' + getGhidraRelativePath(project) + "/os/win_x86_64/dbgmodel.tlb")
-	if (prebuiltTlb.exists()) {
-		println "Copying prebuilt dbgmodel.tlb"
+	def depsFile = file("${DEPS_DIR}/Debugger-agent-dbgeng/dbgmodel.tlb")
+	def binRepoFile = file("${BIN_REPO}/${getGhidraRelativePath(project)}/os/win_x86_64/dbgmodel.tlb")
+	def prebuiltTlb = depsFile.exists() ? depsFile : (binRepoFile.exists() ? binRepoFile : null)
+
+	if (prebuiltTlb) {
 		tasks.assemblePyPackage {
-			from(rootProject.BIN_REPO + '/' + getGhidraRelativePath(project) + "/os/win_x86_64/dbgmodel.tlb") {
+			from(prebuiltTlb) {
 				into("src/ghidradbg/dbgmodel/tlb")
 			}
 		}
 	}
 	else {
-		println "WARNING: dbgmodel.tlb omitted from ghidradbg python package"
+		println "****WARNING:**** dbgmodel.tlb omitted from ghidradbg python package"
 	}
 }
 
diff --git a/gradle/support/fetchDependencies.gradle b/gradle/support/fetchDependencies.gradle
index 9faaa50adb..85368223e0 100644
--- a/gradle/support/fetchDependencies.gradle
+++ b/gradle/support/fetchDependencies.gradle
@@ -67,6 +67,12 @@ ext.deps = [
 		sha256: "7f736566494756d271aa5e4b1af6c89dc50d074ab1c6374a47df822264226b01",
 		destination: FLAT_REPO_DIR
 	],
+	[
+		name: "dbgmodel.tlb",
+		url: "https://github.com/NationalSecurityAgency/ghidra-data/raw/Ghidra_${RELEASE_VERSION}/Debugger/dbgmodel.tlb",
+		sha256: "8cf5f3a2eb81160aa349056a5ca4c2c726b1b6e98bf3097cd4135147163343c7",
+		destination: file("${DEPS_DIR}/Debugger-agent-dbgeng/")
+	],
 	[
 		name: "AXMLPrinter2.jar",
 		url: "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2.jar",