diff -r de82749d3a71 -r 5a5852a417b1 mercurial/sshserver.py
--- a/mercurial/sshserver.py	Sat Jul 15 16:06:05 2006 -0700
+++ b/mercurial/sshserver.py	Sat Jul 15 16:06:35 2006 -0700
@@ -60,8 +60,10 @@
         capabilities: space separated list of tokens
         '''
 
-        r = "capabilities: unbundle stream=%d\n" % (self.repo.revlogversion,)
-        self.respond(r)
+        caps = ['unbundle']
+        if self.ui.configbool('server', 'stream'):
+            caps.append('stream=%d' % self.repo.revlogversion)
+        self.respond("capabilities: %s\n" % (' '.join(caps),))
 
     def do_lock(self):
         '''DEPRECATED - allowing remote client to lock repo is not safe'''