diff --git a/CHANGES b/CHANGES
index 8574d69cb..121932457 100644
--- a/CHANGES
+++ b/CHANGES
@@ -38,6 +38,7 @@ Bugfixes:
 Misc:
  - Qt: Show multiplayer numbers in window title
  - Qt: Handle saving input settings better
+ - Debugger: Free watchpoints in addition to breakpoints
 
 0.2.0: (2015-04-03)
 Features:
diff --git a/src/debugger/cli-debugger.c b/src/debugger/cli-debugger.c
index 0305d0368..03f4fb279 100644
--- a/src/debugger/cli-debugger.c
+++ b/src/debugger/cli-debugger.c
@@ -519,6 +519,7 @@ static void _clearBreakpoint(struct CLIDebugger* debugger, struct CLIDebugVector
 	}
 	uint32_t address = dv->intValue;
 	ARMDebuggerClearBreakpoint(&debugger->d, address);
+	ARMDebuggerClearWatchpoint(&debugger->d, address);
 }
 
 static void _setWatchpoint(struct CLIDebugger* debugger, struct CLIDebugVector* dv) {