diff --git a/src/ChangeLog b/src/ChangeLog
index 83afaaa921..fa264c8c6c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-17  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* text3.C (doDispatch): recordUndo on LFUN_BREAKLINE (bug 3111).
+
 2007-01-17  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* BufferView.C (mouseSetCursor): if the cursor was in an empty
diff --git a/src/text3.C b/src/text3.C
index 299e91e2fd..8acaa162c9 100644
--- a/src/text3.C
+++ b/src/text3.C
@@ -530,6 +530,8 @@ void LyXText::dispatch(LCursor & cur, FuncRequest & cmd)
 	case LFUN_BREAKLINE: {
 		// Not allowed by LaTeX (labels or empty par)
 		if (cur.pos() > cur.paragraph().beginOfBody()) {
+			if (!cur.selection())
+				recordUndo(cur);
 			lyx::cap::replaceSelection(cur);
 			cur.insert(new InsetNewline);
 			cur.posRight();
diff --git a/status.14x b/status.14x
index d52e4de626..fb6a57a109 100644
--- a/status.14x
+++ b/status.14x
@@ -182,6 +182,8 @@ What's new
   (bug 3055). This also fixes problems with older LyX files
   (bug 3066) [qt only].
 
+- fix undo when inserting a line break (bug 3111).
+
 * Build/installation:
 
 - Allow autoconf 2.60 and 2.61 for building.