diff --git a/Ghidra/Debug/Debugger-gadp/Module.manifest b/Ghidra/Debug/Debugger-gadp/Module.manifest
index 7bdd20ea81..6f3440fc0b 100644
--- a/Ghidra/Debug/Debugger-gadp/Module.manifest
+++ b/Ghidra/Debug/Debugger-gadp/Module.manifest
@@ -1 +1 @@
-MODULE FILE LICENSE: lib/protobuf-java-3.17.3.jar BSD-3-GOOGLE
+MODULE FILE LICENSE: lib/protobuf-java-3.21.6.jar BSD-3-GOOGLE
diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle
index 1b4922f663..9b6f84aee7 100644
--- a/Ghidra/Debug/Debugger-gadp/build.gradle
+++ b/Ghidra/Debug/Debugger-gadp/build.gradle
@@ -33,33 +33,33 @@ configurations {
 def platform = getCurrentPlatformName()
 
 dependencies {
-	allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe'
-	allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe'
-	allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe'
-	allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe'
-	allProtocArtifacts 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe'
+	allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:windows-x86_64@exe'
+	allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:linux-x86_64@exe'
+	allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:linux-aarch_64@exe'
+	allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:osx-x86_64@exe'
+	allProtocArtifacts 'com.google.protobuf:protoc:3.21.6:osx-aarch_64@exe'
 
 	if (isCurrentWindows()) {
-		protocArtifact 'com.google.protobuf:protoc:3.17.3:windows-x86_64@exe'
+		protocArtifact 'com.google.protobuf:protoc:3.21.6:windows-x86_64@exe'
 	}
 	if (isCurrentLinux()) {
 		if (platform.endsWith("x86_64")) {
-			protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-x86_64@exe'
+			protocArtifact 'com.google.protobuf:protoc:3.21.6:linux-x86_64@exe'
 		}
 		else {
-			protocArtifact 'com.google.protobuf:protoc:3.17.3:linux-aarch_64@exe'
+			protocArtifact 'com.google.protobuf:protoc:3.21..6:linux-aarch_64@exe'
 		}
 	}
 	if (isCurrentMac()) {
 		if (platform.endsWith("x86_64")) {
-			protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-x86_64@exe'
+			protocArtifact 'com.google.protobuf:protoc:3.21.6:osx-x86_64@exe'
 		}
 		else {
-			protocArtifact 'com.google.protobuf:protoc:3.17.3:osx-aarch_64@exe'
+			protocArtifact 'com.google.protobuf:protoc:3.21.6:osx-aarch_64@exe'
 		}
 	}
 
-	api 'com.google.protobuf:protobuf-java:3.17.3'
+	api 'com.google.protobuf:protobuf-java:3.21.6'
 	api project(':Framework-AsyncComm')
 	api project(':Framework-Debugging')
 	api project(':ProposedUtils')
@@ -70,7 +70,7 @@ dependencies {
 
 /*protobuf {
 	protoc {
-		artifact = 'com.google.protobuf:protoc:3.17.3'
+		artifact = 'com.google.protobuf:protoc:3.21.6'
 	}
 }*/