diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index dc33ec28a..b45997dac 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-07  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* buffered-input.scm (make-line-buffered-input-port): Don't set
+	the continuation flag for leading whitespace.  Thanks to Dirk
+	Herrmann for the suggestion.
+
 2001-03-05  Neil Jerram  <neil@ossau.uklinux.net>
 
 	* optargs.scm (rest-arg->keyword-binding-list): Use "'()" instead
diff --git a/ice-9/buffered-input.scm b/ice-9/buffered-input.scm
index 4e35d4d4b..df42cd533 100644
--- a/ice-9/buffered-input.scm
+++ b/ice-9/buffered-input.scm
@@ -79,7 +79,8 @@ first call to @var{reader}, and so @var{reader} will be called with
 		 (else
 		  (let ((res (string-ref read-string string-index)))
 		    (set! string-index (+ 1 string-index))
-                    (set! (buffered-input-continuation? port) #t)
+                    (if (not (char-whitespace? res))
+                        (set! (buffered-input-continuation? port) #t))
 		    res)))))
              (port #f))
       (set! port (make-soft-port (vector #f #f #f get-character #f) "r"))