diff --git a/rust-quickcheck0.9.spec b/rust-quickcheck0.9.spec
index 015659b..9bbc0f2 100644
--- a/rust-quickcheck0.9.spec
+++ b/rust-quickcheck0.9.spec
@@ -1,25 +1,20 @@
-# Generated by rust2rpm 13
+# Generated by rust2rpm 24
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate quickcheck
 
-Name:           rust-%{crate}0.9
+Name:           rust-quickcheck0.9
 Version:        0.9.2
 Release:        %autorelease
 Summary:        Automatic property based testing with shrinking
 
 # Upstream license specification: Unlicense/MIT
-License:        Unlicense or MIT
+License:        Unlicense OR MIT
 URL:            https://crates.io/crates/quickcheck
 Source:         %{crates_source}
 
-ExclusiveArch:  %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif
-
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Automatic property based testing with shrinking.}
@@ -32,13 +27,15 @@ BuildArch:      noarch
 
 %description    devel %{_description}
 
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
 
 %files          devel
-%license UNLICENSE LICENSE-MIT COPYING
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/COPYING
+%license %{crate_instdir}/LICENSE-MIT
+%license %{crate_instdir}/UNLICENSE
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -46,11 +43,11 @@ BuildArch:      noarch
 
 %description -n %{name}+default-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
 
 %files       -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+env_logger-devel
 Summary:        %{summary}
@@ -58,11 +55,11 @@ BuildArch:      noarch
 
 %description -n %{name}+env_logger-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "env_logger" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "env_logger" feature of the "%{crate}" crate.
 
 %files       -n %{name}+env_logger-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+log-devel
 Summary:        %{summary}
@@ -70,11 +67,11 @@ BuildArch:      noarch
 
 %description -n %{name}+log-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "log" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "log" feature of the "%{crate}" crate.
 
 %files       -n %{name}+log-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+regex-devel
 Summary:        %{summary}
@@ -82,11 +79,11 @@ BuildArch:      noarch
 
 %description -n %{name}+regex-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "regex" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "regex" feature of the "%{crate}" crate.
 
 %files       -n %{name}+regex-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+unstable-devel
 Summary:        %{summary}
@@ -94,11 +91,11 @@ BuildArch:      noarch
 
 %description -n %{name}+unstable-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "unstable" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "unstable" feature of the "%{crate}" crate.
 
 %files       -n %{name}+unstable-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+use_logging-devel
 Summary:        %{summary}
@@ -106,11 +103,11 @@ BuildArch:      noarch
 
 %description -n %{name}+use_logging-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "use_logging" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "use_logging" feature of the "%{crate}" crate.
 
 %files       -n %{name}+use_logging-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1