diff --git a/ChangeLog b/ChangeLog
index cdcb9eeef202c9199f1871afda83b7439767094f..1ad77bb8db700022a30394a21a94ed1361e6337a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 CVS code -
+- cut.c:
+  do_cut_text()
+	- Don't immediately abort if we're on filebot and the marker is
+	  set (fixes unable to select and cut entire file bug,
+	  discovered by Ken Tyler).
+
 nano-0.9.17 - 09/04/2000
 - General
 	- New shortcuts to toggle certain options that are normally only
diff --git a/cut.c b/cut.c
index 8a66064c6452c94bfef3afeda9c04aaaca51d892..d238595c9db91f72cab69fba623f800934f4a96c 100644
--- a/cut.c
+++ b/cut.c
@@ -152,7 +152,7 @@ int do_cut_text(void)
     }
 
     /* Must let cutbuffer get blown away first before we do this... */
-    if (fileptr == filebot)	
+    if (fileptr == filebot && !ISSET(MARK_ISSET))	
 	return 0;
 
 #ifndef NANO_SMALL