diff --git a/.gitignore b/.gitignore
index 16b239e..2e23143 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /cbindgen-0.8.4.crate
 /cbindgen-0.8.6.crate
 /cbindgen-0.8.7.crate
+/cbindgen-0.9.1.crate
diff --git a/rust-cbindgen.spec b/rust-cbindgen.spec
index 6ecbafd..71003b7 100644
--- a/rust-cbindgen.spec
+++ b/rust-cbindgen.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm-9-1.fc31
+# Generated by rust2rpm 10
 %bcond_without check
 
 %global crate cbindgen
 
 Name:           rust-%{crate}
-Version:        0.8.7
-Release:        2%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        Tool for generating C bindings to Rust code
 
 # Upstream license specification: MPL-2.0
@@ -14,32 +14,21 @@ URL:            https://crates.io/crates/cbindgen
 Source:         %{crates_source}
 
 ExclusiveArch:  %{rust_arches}
+%if %{__cargo_skip_build}
+BuildArch:      noarch
+%endif
 
 BuildRequires:  rust-packaging
-BuildRequires:  (crate(clap/default) >= 2.0.0 with crate(clap/default) < 3.0.0)
-BuildRequires:  (crate(log/default) >= 0.4.0 with crate(log/default) < 0.5.0)
-BuildRequires:  (crate(proc-macro2/default) >= 0.4.0 with crate(proc-macro2/default) < 0.5.0)
-BuildRequires:  (crate(quote/default) >= 0.6.0 with crate(quote/default) < 0.7.0)
-BuildRequires:  (crate(serde/default) >= 1.0.0 with crate(serde/default) < 2.0.0)
-BuildRequires:  (crate(serde/derive) >= 1.0.0 with crate(serde/derive) < 2.0.0)
-BuildRequires:  (crate(serde_derive/default) >= 1.0.0 with crate(serde_derive/default) < 2.0.0)
-BuildRequires:  (crate(serde_json/default) >= 1.0.0 with crate(serde_json/default) < 2.0.0)
-BuildRequires:  (crate(syn/clone-impls) >= 0.15.0 with crate(syn/clone-impls) < 0.16.0)
-BuildRequires:  (crate(syn/extra-traits) >= 0.15.0 with crate(syn/extra-traits) < 0.16.0)
-BuildRequires:  (crate(syn/full) >= 0.15.0 with crate(syn/full) < 0.16.0)
-BuildRequires:  (crate(syn/parsing) >= 0.15.0 with crate(syn/parsing) < 0.16.0)
-BuildRequires:  (crate(syn/printing) >= 0.15.0 with crate(syn/printing) < 0.16.0)
-BuildRequires:  (crate(tempfile/default) >= 3.0.0 with crate(tempfile/default) < 4.0.0)
-BuildRequires:  (crate(toml/default) >= 0.4.0 with crate(toml/default) < 0.5.0)
 %if %{with check}
 BuildRequires:  gcc-c++
 %endif
 
-%global _description \
-A tool for generating C bindings to Rust code.
+%global _description %{expand:
+A tool for generating C bindings to Rust code.}
 
 %description %{_description}
 
+%if ! %{__cargo_skip_build}
 %package     -n %{crate}
 Summary:        %{summary}
 
@@ -47,8 +36,9 @@ Summary:        %{summary}
 
 %files       -n %{crate}
 %license LICENSE
-%doc README.md
+%doc docs.md README.md
 %{_bindir}/cbindgen
+%endif
 
 %package        devel
 Summary:        %{summary}
@@ -61,7 +51,7 @@ which use "%{crate}" crate.
 
 %files          devel
 %license LICENSE
-%doc ARCHITECTURE.md CONTRIBUTING.md README.md
+%doc contributing.md docs.md internals.md README.md
 %{cargo_registry}/%{crate}-%{version}/
 
 %package     -n %{name}+default-devel
@@ -76,10 +66,25 @@ which use "default" feature of "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
+%package     -n %{name}+clap-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+clap-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "clap" feature of "%{crate}" crate.
+
+%files       -n %{name}+clap-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
 
+%generate_buildrequires
+%cargo_generate_buildrequires
+
 %build
 %cargo_build
 
@@ -88,11 +93,13 @@ which use "default" feature of "%{crate}" crate.
 
 %if %{with check}
 %check
-export CBINDGEN_TEST_VERIFY=1
 %cargo_test
 %endif
 
 %changelog
+* Fri Nov 15 2019 Josh Stone <jistone@redhat.com> - 0.9.1-1
+- Update to 0.9.1
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 73dc6be..42171f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cbindgen-0.8.7.crate) = 0238fa87100f1792cbb2b2c977bdc13a9a8a3e916f841ee112f69335a8ecb2a9fc99d3a0ce5eda16c9eead7ccbe8e7b3b8248d4ceaa218bbea0ac9a6a20e805d
+SHA512 (cbindgen-0.9.1.crate) = 0e32563db42363dc82e8aca2f36bdafcdf0ec9156e7238937295c9369d306c2bfa590ea7a9afd61d8b915fc383bb7af8bbb78cde71f6ab30b0c576262c74232b