diff --git a/src/ChangeLog b/src/ChangeLog
index 963fac4f88..36412126a9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-16  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* text.C (delete): adjust cursor after backspace in change tracking
+	mode (bug 2185).
+
 2006-03-16  Félix-Antoine Bourbonnais  <bouf10pub2@myriade.ca>
 
 	* text3.C (dispatch): set needsUpdate according to the return
diff --git a/src/text.C b/src/text.C
index 744de94816..e447cca6db 100644
--- a/src/text.C
+++ b/src/text.C
@@ -1541,6 +1541,10 @@ bool LyXText::Delete(LCursor & cur)
 		recordUndo(cur, Undo::DELETE, cur.pit());
 		setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary());
 		needsUpdate = backspace(cur);
+		Paragraph & par = cur.paragraph();
+		if (cur.pos() < par.size()
+		    && par.lookupChange(cur.pos()) == Change::DELETED)
+			cur.posRight();
 	} else if (cur.pit() != cur.lastpit()) {
 		LCursor scur = cur;
 
diff --git a/status.14x b/status.14x
index f086953f25..f4ace5cf05 100644
--- a/status.14x
+++ b/status.14x
@@ -58,6 +58,8 @@ What's new
 
 - Fix cursor positioning in tabulars (bug 2006).
 
+- Adjust cursor after backspace in change tracking mode (bug 2185).
+
 - Update screen when cursor was between two spaces and goes to
   line/document start/end (bug 2298).