diff --git a/ChangeLog b/ChangeLog
index 362c7c52..e26c64ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-22  Mark Majeres  <mark@engine12.com>
+	* src/text.c (do_redo): When redoing a line join at the tail
+        of the file, make sure openfile->filebot is updated.
+
 2014-06-21  Mark Majeres  <mark@engine12.com>
 	* src/text.c (undo_cut, add_undo): When undoing a cut-till-eof,
 	put the cursor back where the cut started, and not at the end.
diff --git a/src/text.c b/src/text.c
index da4da3e1..f3b9c861 100644
--- a/src/text.c
+++ b/src/text.c
@@ -640,6 +640,8 @@ void do_redo(void)
 	strcat(f->data, u->strdata);
 	if (f->next != NULL) {
 	    filestruct *tmp = f->next;
+	    if (tmp == openfile->filebot)
+		openfile->filebot = f;
 	    unlink_node(tmp);
 	    delete_node(tmp);
 	}