diff --git a/bootfiles/19f/boot-2009-07.lisp b/bootfiles/19f/boot-2009-07.lisp
index f74d9091d5d10067ab7c1b0951f70353df7d73ce..b388a343842ffde3032afa6a935f651a5c8bf3e0 100644
--- a/bootfiles/19f/boot-2009-07.lisp
+++ b/bootfiles/19f/boot-2009-07.lisp
@@ -3,7 +3,7 @@
 
 (in-package "C")
 
-(without-package-locks
+(ext:without-package-locks
 
 ;; Just in case the compiling lisp doesn't known about lisp::shrink-vector.
 (defknown lisp::shrink-vector (vector fixnum) vector
@@ -29,3 +29,11 @@
 	(make-union-type results)
 	(first results))))
 )
+
+(in-package "STREAM")
+
+;; We want to use LISP::SURROGATES in the STREAM package.
+(ext:without-package-locks
+  (unintern 'stream::surrogates)
+  (import 'lisp::surrogates)
+  )