diff --git a/nbdkit.spec b/nbdkit.spec
index 47f3078..3d1713e 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -44,7 +44,7 @@ ExclusiveArch:  x86_64
 %global source_directory 1.21-development
 
 Name:           nbdkit
-Version:        1.21.6
+Version:        1.21.7
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -65,6 +65,7 @@ BuildRequires: autoconf, automake, libtool
 %ifnarch %{complete_test_arches}
 BuildRequires:  autoconf, automake, libtool
 %endif
+BuildRequires:  gcc, gcc-c++
 BuildRequires:  /usr/bin/pod2man
 BuildRequires:  gnutls-devel
 BuildRequires:  libselinux-devel
@@ -225,6 +226,21 @@ This package contains example plugins for %{name}.
 # The plugins below have non-trivial dependencies are so are
 # packaged separately.
 
+%package cc-plugin
+Summary:        Write small inline C plugins and scripts for %{name}
+License:        BSD
+
+Requires:       %{name}-server%{?_isa} = %{version}-%{release}
+Requires:       gcc
+Requires:       %{_bindir}/cat
+
+
+%description cc-plugin
+This package contains support for writing inline C plugins and scripts
+for %{name}.  NOTE this is NOT the right package for writing plugins
+in C, install %{name}-devel for that.
+
+
 %package curl-plugin
 Summary:        HTTP/FTP (cURL) plugin for %{name}
 License:        BSD
@@ -764,6 +780,13 @@ make %{?_smp_mflags} check || {
 %{_mandir}/man1/nbdkit-curl-plugin.1*
 
 
+%files cc-plugin
+%doc README
+%license LICENSE
+%{_libdir}/%{name}/plugins/nbdkit-cc-plugin.so
+%{_mandir}/man1/nbdkit-cc-plugin.1*
+
+
 %if 0%{?have_libguestfs}
 %files guestfs-plugin
 %doc README
@@ -988,6 +1011,10 @@ make %{?_smp_mflags} check || {
 
 
 %changelog
+* Thu Jun  4 2020 Richard W.M. Jones <rjones@redhat.com> - 1.21.7-1
+- New upstream development version 1.21.7.
+- New nbdkit-cc-plugin subpackage.
+
 * Tue Jun  2 2020 Richard W.M. Jones <rjones@redhat.com> - 1.21.6-1
 - New upstream development version 1.21.6.
 
diff --git a/sources b/sources
index c26dfa1..c04cc7f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.21.6.tar.gz) = fabd875113880f3bc38937bf3a7b0f88548168ac0d628d9a6f07f224471d02e893ae5cf0178e2822319331e18024641d954e2110ab22d82a4d0fcb5e43f25597
-SHA512 (nbdkit-1.21.6.tar.gz.sig) = 1abb8316d90046466eb91e5581b4996992ffa8c78617690c7099569ccc7e1a856d8e2d8622291546f6a2c7090f77a81dfb9dda6be2a1adbcfe6d2a734ba765bd
+SHA512 (nbdkit-1.21.7.tar.gz) = dc3c324895c11ebba7cd3e7b10351e3d3567ae773b81c2abc4f3593a128a5a41cb6ae0d53929410bb9306c4281f11224dfe841fc6f29f92b3af964e36a93252d
+SHA512 (nbdkit-1.21.7.tar.gz.sig) = 05e99ec5bd24dd2416f0a20ca4013c5bbe526a7b804e78a25e44dfe9eb6aa2e191446aefce23b98e93b10b9ddea5e210629c7fd6cbe630a5fc2bb16cf6ceb9df