diff --git a/.gitignore b/.gitignore
index 5f693d7..f4dcedf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /escargot-0.5.2.crate
 /escargot-0.5.6.crate
 /escargot-0.5.7.crate
+/escargot-0.5.8.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 436d131..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-escargot
-
-The rust-escargot package
\ No newline at end of file
diff --git a/escargot-fix-metadata.diff b/escargot-fix-metadata.diff
index 95e22bb..121f214 100644
--- a/escargot-fix-metadata.diff
+++ b/escargot-fix-metadata.diff
@@ -1,10 +1,10 @@
---- escargot-0.5.7/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ escargot-0.5.7/Cargo.toml	2021-12-15T20:55:16.339563+00:00
-@@ -23,6 +23,7 @@
+--- escargot-0.5.8/Cargo.toml	1970-01-01T00:00:01+00:00
++++ escargot-0.5.8/Cargo.toml	2023-08-02T18:39:05.438571+00:00
+@@ -36,6 +36,7 @@
  categories = ["development-tools::build-utils"]
  license = "MIT OR Apache-2.0"
  repository = "https://github.com/crate-ci/escargot.git"
 +autobins = false
+ 
  [package.metadata.docs.rs]
- features = ["cargo_unstable", "test_unstable"]
- [[package.metadata.release.pre-release-replacements]]
+ all-features = true
diff --git a/rust-escargot.spec b/rust-escargot.spec
index a47618c..77e5efc 100644
--- a/rust-escargot.spec
+++ b/rust-escargot.spec
@@ -1,26 +1,23 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 24
 # * files required by tests are not included in published crates
 %bcond_with check
 %global debug_package %{nil}
 
 %global crate escargot
 
-Name:           rust-%{crate}
-Version:        0.5.7
+Name:           rust-escargot
+Version:        0.5.8
 Release:        %autorelease
 Summary:        Cargo API written in Paris
 
-# Upstream license specification: MIT OR Apache-2.0
-License:        MIT or ASL 2.0
+License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/escargot
 Source:         %{crates_source}
-# Initial patched metadata
+# Manually created patch for downstream crate metadata changes
 # * drop unwanted executables
-Patch0:         escargot-fix-metadata.diff
+Patch:          escargot-fix-metadata.diff
 
-ExclusiveArch:  %{rust_arches}
-
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Cargo API written in Paris.}
@@ -37,9 +34,10 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.
 
 %files          devel
-%license LICENSE-APACHE LICENSE-MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-APACHE
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -51,7 +49,7 @@ 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}+cargo_unstable-devel
 Summary:        %{summary}
@@ -63,7 +61,7 @@ This package contains library source intended for building other packages which
 use the "cargo_unstable" feature of the "%{crate}" crate.
 
 %files       -n %{name}+cargo_unstable-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+print-devel
 Summary:        %{summary}
@@ -75,7 +73,7 @@ This package contains library source intended for building other packages which
 use the "print" feature of the "%{crate}" crate.
 
 %files       -n %{name}+print-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+strict_unstable-devel
 Summary:        %{summary}
@@ -87,7 +85,7 @@ This package contains library source intended for building other packages which
 use the "strict_unstable" feature of the "%{crate}" crate.
 
 %files       -n %{name}+strict_unstable-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+test_unstable-devel
 Summary:        %{summary}
@@ -99,7 +97,7 @@ This package contains library source intended for building other packages which
 use the "test_unstable" feature of the "%{crate}" crate.
 
 %files       -n %{name}+test_unstable-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/sources b/sources
index 02a4f8a..fba80a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (escargot-0.5.7.crate) = 5257f18dc36390c000d15a083f349d23edf693032e40a8f1e45f3db224bb29a08e69c4d7e74f1a99aa7be44eee40a78379fa0cf3e50b79a874ddc46d7191afcf
+SHA512 (escargot-0.5.8.crate) = 6232762a14a1f05b6f4b586d38e9cc67df8ce006fb53e3ab9eb98f387bc84fe27517c161aca8279be408c20b06e4afa8ba77d8164509f0bae27f434555efbcef