diff --git a/nbdkit.spec b/nbdkit.spec
index 0640efc..b38988b 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -5,8 +5,8 @@
 %endif
 
 Name:           nbdkit
-Version:        1.1.16
-Release:        2%{?dist}
+Version:        1.1.18
+Release:        1%{?dist}
 Summary:        NBD server
 
 License:        BSD
@@ -137,6 +137,24 @@ libvirt guest disks readonly.  It is implemented using the libvirt
 virDomainBlockPeek API.
 
 
+%package plugin-nbd
+Summary:        NBD forwarding plugin for %{name}
+License:        BSD
+
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+
+%description plugin-nbd
+This package is an NBD forwarding plugin for %{name}.
+
+It provides an NBD server that forwards all traffic as a client to
+another existing NBD server.  A primary usage of this setup is to alter
+the set of features available to the ultimate end client, without
+having to change the original server (for example, to convert between
+oldstyle and newtyle, or to add TLS support where the original server
+lacks it).
+
+
 %ifarch %{ocaml_native_compiler}
 %package plugin-ocaml
 Summary:        OCaml plugin for %{name}
@@ -411,6 +429,12 @@ popd
 %{_mandir}/man1/nbdkit-libvirt-plugin.1*
 
 
+%files plugin-nbd
+%doc LICENSE README
+%{_libdir}/%{name}/plugins/nbdkit-nbd-plugin.so
+%{_mandir}/man1/nbdkit-nbd-plugin.1*
+
+
 %ifarch %{ocaml_native_compiler}
 %files plugin-ocaml
 %doc LICENSE README
@@ -475,6 +499,10 @@ popd
 
 
 %changelog
+* Tue Nov 21 2017 Richard W.M. Jones <rjones@redhat.com> - 1.1.18-1
+- New upstream version 1.1.18.
+- Add NBD forwarding plugin.
+
 * Fri Oct 20 2017 Richard W.M. Jones <rjones@redhat.com> - 1.1.16-2
 - New upstream version 1.1.16.
 - Disable python3 plugin on RHEL/EPEL <= 7.
diff --git a/sources b/sources
index 291721a..f396f5b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nbdkit-1.1.16.tar.gz) = 05c739b8c5c5a7376c5077d192fec2742655f8db6c10c9aea28da174c229a5b3b45f57108f2e82fb7adcd0126d7355b4aab48a92e93cc7e7b2c5549b9f425579
+SHA512 (nbdkit-1.1.18.tar.gz) = 62ebe50eb7c3e2faac66f763cc8d8b206c76692cd6f865acb4753fdb16ca3ee466b90f52daff1c9a54e6554103cfeb7752c4007f3dca6765d3c85f32e89c0c33