diff --git a/src/apps/debugger/arch/Architecture.h b/src/apps/debugger/arch/Architecture.h
index 0b8ba3a27d..8d7ed43c60 100644
--- a/src/apps/debugger/arch/Architecture.h
+++ b/src/apps/debugger/arch/Architecture.h
@@ -40,7 +40,8 @@ enum {
 
 enum {
 	WATCHPOINT_CAPABILITY_FLAG_READ = 1,
-	WATCHPOINT_CAPABILITY_FLAG_WRITE = 2
+	WATCHPOINT_CAPABILITY_FLAG_WRITE = 2,
+	WATCHPOINT_CAPABILITY_FLAG_READ_WRITE = 4
 };
 
 
diff --git a/src/apps/debugger/arch/x86/ArchitectureX86.cpp b/src/apps/debugger/arch/x86/ArchitectureX86.cpp
index 6cb370b97c..54472477a7 100644
--- a/src/apps/debugger/arch/x86/ArchitectureX86.cpp
+++ b/src/apps/debugger/arch/x86/ArchitectureX86.cpp
@@ -620,8 +620,9 @@ ArchitectureX86::GetWatchpointDebugCapabilities(int32& _maxRegisterCount,
 	// two available for watchpoints.
 	_maxRegisterCount = 2;
 
-	// x86 only supports write watchpoints.
-	_watchpointCapabilityFlags = WATCHPOINT_CAPABILITY_FLAG_WRITE;
+	// x86 only supports write and read/write watchpoints.
+	_watchpointCapabilityFlags = WATCHPOINT_CAPABILITY_FLAG_WRITE
+		| WATCHPOINT_CAPABILITY_FLAG_READ_WRITE;
 
 	return B_OK;
 }