diff --git a/.gitignore b/.gitignore
index 8d79438..d481c42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /signature-1.3.1.crate
+/signature-1.6.4.crate
diff --git a/rust-signature.spec b/rust-signature.spec
index 377a6a9..16cdb7f 100644
--- a/rust-signature.spec
+++ b/rust-signature.spec
@@ -1,29 +1,21 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 22
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate signature
 
-Name:           rust-%{crate}
-Version:        1.3.1
+Name:           rust-signature
+Version:        1.6.4
 Release:        %autorelease
 Summary:        Traits for cryptographic signature algorithms (e.g
 
-# Upstream license specification: Apache-2.0 OR MIT
-License:        ASL 2.0 or MIT
+License:        Apache-2.0 OR MIT
 URL:            https://crates.io/crates/signature
 Source:         %{crates_source}
-# Initial patched metadata
-# * Bump hex-literal to 0.3 (upstream)
-Patch0:         signature-fix-metadata.diff
 
-# rust-cpufeatures is only available on these arches
-ExclusiveArch: x86_64 aarch64
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif
+ExclusiveArch:  %{rust_arches}
 
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Traits for cryptographic signature algorithms (e.g. ECDSA, Ed25519).}
@@ -36,12 +28,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
-%doc README.md CHANGELOG.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/CHANGELOG.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -49,11 +44,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}+derive-preview-devel
 Summary:        %{summary}
@@ -61,11 +56,11 @@ BuildArch:      noarch
 
 %description -n %{name}+derive-preview-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "derive-preview" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "derive-preview" feature of the "%{crate}" crate.
 
 %files       -n %{name}+derive-preview-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+digest-devel
 Summary:        %{summary}
@@ -73,11 +68,11 @@ BuildArch:      noarch
 
 %description -n %{name}+digest-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "digest" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "digest" feature of the "%{crate}" crate.
 
 %files       -n %{name}+digest-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+digest-preview-devel
 Summary:        %{summary}
@@ -85,11 +80,23 @@ BuildArch:      noarch
 
 %description -n %{name}+digest-preview-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "digest-preview" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "digest-preview" feature of the "%{crate}" crate.
 
 %files       -n %{name}+digest-preview-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+hazmat-preview-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+hazmat-preview-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "hazmat-preview" feature of the "%{crate}" crate.
+
+%files       -n %{name}+hazmat-preview-devel
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+rand-preview-devel
 Summary:        %{summary}
@@ -97,11 +104,11 @@ BuildArch:      noarch
 
 %description -n %{name}+rand-preview-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "rand-preview" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "rand-preview" feature of the "%{crate}" crate.
 
 %files       -n %{name}+rand-preview-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+rand_core-devel
 Summary:        %{summary}
@@ -109,11 +116,11 @@ BuildArch:      noarch
 
 %description -n %{name}+rand_core-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "rand_core" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "rand_core" feature of the "%{crate}" crate.
 
 %files       -n %{name}+rand_core-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+signature_derive-devel
 Summary:        %{summary}
@@ -121,11 +128,11 @@ BuildArch:      noarch
 
 %description -n %{name}+signature_derive-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "signature_derive" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "signature_derive" feature of the "%{crate}" crate.
 
 %files       -n %{name}+signature_derive-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+std-devel
 Summary:        %{summary}
@@ -133,11 +140,11 @@ BuildArch:      noarch
 
 %description -n %{name}+std-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "std" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "std" feature of the "%{crate}" crate.
 
 %files       -n %{name}+std-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
diff --git a/signature-fix-metadata.diff b/signature-fix-metadata.diff
deleted file mode 100644
index 965aa54..0000000
--- a/signature-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- signature-1.3.1/Cargo.toml	1970-01-01T00:00:00+00:00
-+++ signature-1.3.1/Cargo.toml	2021-07-11T14:23:44.980470+00:00
-@@ -39,7 +39,7 @@
- version = "= 1.0.0-pre.3"
- optional = true
- [dev-dependencies.hex-literal]
--version = "0.2"
-+version = "0.3"
- 
- [dev-dependencies.sha2]
- version = "0.9"
diff --git a/sources b/sources
index 9303840..4cf40fc 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 SHA512 (signature-1.3.1.crate) = e410ff4fa4e96aa9c3fcc1d8d66e29be3650d9a6373b351c630bf9c5f3eef966706296bfc5e7e51943ab7ccc3b1a97fad60ebc915ca77b124251f9a9c922933f
+SHA512 (signature-1.5.0.crate) = 5e4dc0ee1da74ef6391e78b0b2abc921faa5b9264b357e9e9b4028c8f424818532b4d7457c8451fbef18b497e133e4c32827d74616ce5ee95b15d07daf6a1772
+SHA512 (signature-1.6.4.crate) = 7409b4c26c6f569d486ceeb4648af2bfb9854cd9f35fde11ef0e17ae31cecc4293418e2d86e8101c79737a6d5cf9a8098bfbd64477ff4d2f537aed98eb3424bf