diff --git a/NEWS b/NEWS
index 4f1be509b..0582ec032 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,9 @@ ver 0.22 (not yet released)
   - ffmpeg: new plugin based on FFmpeg's libavfilter library
   - hdcd: new plugin based on FFmpeg's "af_hdcd" for HDCD playback
 
-ver 0.21.8 (not yet released)
+ver 0.21.8 (2019/04/23)
+* input
+  - smbclient: download to buffer instead of throttling transfer
 * output
   - httpd: add missing mutex lock
   - httpd: fix use-after-free bug
@@ -18,6 +20,7 @@ ver 0.21.8 (not yet released)
 * fix build failure with GCC 9
 * fix build failure with -Ddatabase=false
 * systemd: add user socket unit
+* doc: "list file" is deprecated
 
 ver 0.21.7 (2019/04/03)
 * input
diff --git a/doc/protocol.rst b/doc/protocol.rst
index 4eee30e53..38c099fce 100644
--- a/doc/protocol.rst
+++ b/doc/protocol.rst
@@ -873,8 +873,7 @@ The music database
 :command:`list {TYPE} {FILTER} [group {GROUPTYPE}]`
     Lists unique tags values of the specified type.
     ``TYPE`` can be any tag supported by
-    :program:`MPD` or
-    *file*.
+    :program:`MPD`.
 
     Additional arguments may specify a :ref:`filter <filter_syntax>`.
     The *group* keyword may be used
@@ -885,6 +884,10 @@ The music database
 
      list album group albumartist
 
+    ``list file`` was implemented in an early :program:`MPD` version,
+    but does not appear to make a lot of sense.  It still works (to
+    avoid breaking compatibility), but is deprecated.
+
 .. _command_listall:
 
 :command:`listall [URI]`
diff --git a/python/build/libs.py b/python/build/libs.py
index ac7984afb..103c67b09 100644
--- a/python/build/libs.py
+++ b/python/build/libs.py
@@ -392,7 +392,7 @@ libnfs = AutotoolsProject(
 )
 
 boost = BoostProject(
-    'http://downloads.sourceforge.net/project/boost/boost/1.69.0/boost_1_69_0.tar.bz2',
-    '8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406',
+    'http://downloads.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2',
+    '430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778',
     'include/boost/version.hpp',
 )
diff --git a/src/input/plugins/SmbclientInputPlugin.cxx b/src/input/plugins/SmbclientInputPlugin.cxx
index b4b0785f8..d2ad9159e 100644
--- a/src/input/plugins/SmbclientInputPlugin.cxx
+++ b/src/input/plugins/SmbclientInputPlugin.cxx
@@ -22,6 +22,7 @@
 #include "lib/smbclient/Mutex.hxx"
 #include "../InputStream.hxx"
 #include "../InputPlugin.hxx"
+#include "../MaybeBufferedInputStream.hxx"
 #include "PluginUnavailable.hxx"
 #include "system/Error.hxx"
 #include "util/ASCII.hxx"
@@ -112,8 +113,9 @@ input_smbclient_open(const char *uri,
 		throw MakeErrno(e, "smbc_fstat() failed");
 	}
 
-	return std::make_unique<SmbclientInputStream>(uri, mutex,
-						      ctx, fd, st);
+	return std::make_unique<MaybeBufferedInputStream>
+		(std::make_unique<SmbclientInputStream>(uri, mutex,
+							ctx, fd, st));
 }
 
 size_t