diff --git a/pkgs/racket-pkgs/racket-doc/scribblings/reference/port-lib.scrbl b/pkgs/racket-pkgs/racket-doc/scribblings/reference/port-lib.scrbl
index e39c260995..9222c9f5d1 100644
--- a/pkgs/racket-pkgs/racket-doc/scribblings/reference/port-lib.scrbl
+++ b/pkgs/racket-pkgs/racket-doc/scribblings/reference/port-lib.scrbl
@@ -327,25 +327,45 @@ it defaults to @racket[0].
 The resulting port's initial position (as reported by @racket[file-position])
 is @racket[(- init-position 1)], no matter the position of @racket[in].
 
+The resulting port supports buffering, and a @racket['block] buffer
+mode allows the port to peek further into @racket[in] than
+requested. The resulting port's initial buffer mode is
+@racket['block], unless @racket[in] supports buffer mode and its mode
+is initially @racket['none] (i.e., the initial buffer mode is taken
+from @racket[in] when it supports buffering). If @racket[in] supports
+buffering, adjusting the resulting port's buffer mode via
+@racket[file-stream-buffer-mode] adjusts @racket[in]'s buffer mode.
+
 For example, when you read from a peeking port, you
-see the same answers as when you read from the original port.
+see the same answers as when you read from the original port:
 
 @examples[#:eval port-eval
 (define an-original-port (open-input-string "123456789"))
 (define a-peeking-port (peeking-input-port an-original-port))
+(file-stream-buffer-mode a-peeking-port 'none)
 (read-string 3 a-peeking-port)
 (read-string 3 an-original-port)]
 
-But beware, the read from the original port is invisible to the peeking
+Beware that the read from the original port is invisible to the peeking
 port, which keeps its own separate internal counter, and thus
 interleaving reads on the two ports can produce confusing results.
 Continuing the example before, if we read three more characters from
-the peeking port, we end up skipping over the @litchar{456} in the port.
+the peeking port, we end up skipping over the @litchar{456} in the port
+(but only because we disabled buffering above):
 
 @examples[#:eval port-eval
 (read-string 3 a-peeking-port)
 ]
-}
+
+If we had left the buffer mode of @racket[a-peeking-port] alone, that
+last @racket[read-string] would have likely produced @racket["456"] as
+a result of buffering bytes from @racket[an-original-port] earlier.
+
+
+@history[#:changed "6.1.0.3" @elem{Enabled buffering and buffer-mode
+                                   adjustments via @racket[file-stream-buffer-mode],
+                                   and set the port's initial buffer mode to that of
+                                   @racket[in].}]}
 
 
 
diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/portlib.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/portlib.rktl
index 6658d6cb8e..02e1e1c4d4 100644
--- a/pkgs/racket-pkgs/racket-test/tests/racket/portlib.rktl
+++ b/pkgs/racket-pkgs/racket-test/tests/racket/portlib.rktl
@@ -428,6 +428,29 @@
     (test 200 peek-byte p)
     (test 200 read-byte p)))
 
+;; Tests for `peeking-input-port`
+(let ()
+  (define (try-peeking buffer-mode)
+    (define an-original-port (open-input-string "123456789abc"))
+    (define a-peeking-port (peeking-input-port an-original-port))
+    (file-stream-buffer-mode a-peeking-port buffer-mode)
+    (test "123" read-string 3 a-peeking-port)
+    (test "456" read-string 3 a-peeking-port)
+
+    (test "123" read-string 3 an-original-port)
+
+    ;; It's not well defined what will happen now when buffering is
+    ;; enabled, but we can predict given the current implementation:
+    (test (if (eq? 'block buffer-mode) "789" "abc") read-string 3 a-peeking-port)
+
+    (test #f file-stream-buffer-mode an-original-port)
+    (test buffer-mode file-stream-buffer-mode a-peeking-port)
+    (test (void) file-stream-buffer-mode a-peeking-port 'none)
+    (test 'none file-stream-buffer-mode a-peeking-port))
+
+  (try-peeking 'none)
+  (try-peeking 'block))
+
 ;; read synchronization events
 (define (go mk-hello sync atest btest)
   (test #t list? (list mk-hello sync atest btest))
diff --git a/racket/collects/racket/port.rkt b/racket/collects/racket/port.rkt
index 12dc2d877b..ebe09b8003 100644
--- a/racket/collects/racket/port.rkt
+++ b/racket/collects/racket/port.rkt
@@ -584,6 +584,8 @@
                             [name (object-name orig-in)]
                             [delta 0]
                             #:init-position [init-position 1])
+  (define buffer-mode (or (file-stream-buffer-mode orig-in)
+                          'block))
   (make-input-port/read-to-peek
    name
    (lambda (s)
@@ -595,7 +597,14 @@
    void
    #f
    void
-   init-position))
+   init-position
+   (case-lambda
+    [() buffer-mode]
+    [(mode)
+     (when (file-stream-buffer-mode orig-in)
+       (file-stream-buffer-mode orig-in mode))
+     (set! buffer-mode mode)])
+   (eq? buffer-mode 'block)))
 
 (define relocate-input-port
   (lambda (p line col pos [close? #t])