diff --git a/ChangeLog b/ChangeLog
index 916f7f71d2e9869cd2cf82cda6a69992a30e6026..0d5871c56c07a9e72784206ba3756350169728ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,9 @@ CVS Code -
   do_int_spell_fix(), do_int_speller()
 	- Fix crashes with mark position, current_x position, 
 	  and edit_update args (David Benbennick).
+  do_justify()
+	- Unset KEEP_CUTBUFFER so nano won't crash with subsequent
+	  ^K cuts and justifies (David Benbennick).
   do_mouse()
 	- Fix the mouse code to work with lines longer than COLS and
 	  with the proper positioning, including special characters
diff --git a/nano.c b/nano.c
index b91b79fb12ff75c0608f48df7301aaf5b7d2a86c..8a327d2c4bfbbbb006c09b241cba39e146c7860e 100644
--- a/nano.c
+++ b/nano.c
@@ -2652,6 +2652,7 @@ int do_justify(void)
 	}
 	edit_refresh();
     }
+    UNSET(KEEP_CUTBUFFER);
     cutbuffer = cutbuffer_save;
     blank_statusbar_refresh();
     /* display shortcut list without UnCut */