diff --git a/.gitignore b/.gitignore
index 915f58a..7944e09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,6 @@
 /stratisd-3.5.7.tar.gz
 /stratisd-3.5.7-vendor.tar.gz
 /stratisd-3.5.7.crate
+/stratisd-3.5.8.crate
+/stratisd-3.5.8.tar.gz
+/stratisd-3.5.8-vendor.tar.gz
diff --git a/sources b/sources
index b854e52..09f2886 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (stratisd-3.5.7.tar.gz) = 8d353928b73cd3b0b4d0576b849f7249a07905b51051602c4f1e653ae20257921380e5c96c4256dfbd3a13f2fb8430bd40092bedba03a3643e56eced58d21a12
-SHA512 (stratisd-3.5.7-vendor.tar.gz) = 0a62b64582455e462b4aa81d5ddd9f24d9e9b2abc3999ab03d2e5201213567e190826b3cd3e621d86643ef3619b3a21ad01cfc6cad105e4897dacb0b45e4895a
-SHA512 (stratisd-3.5.7.crate) = 101754600d5c3d84393ad5665e623f6a1d204f510d6694292a62dfb6af634ed21bac2bc2754592fcf2f247173744afa6dbbc75963825551274881697f7eaf294
+SHA512 (stratisd-3.5.8.crate) = 12e54377861a212f3bc745c0596e6f3381ef1b34f70392d9acc8c040c8d22ec0eeb1933df80dc344962e9fabcb2e3c56ab7e318dfe679254665629fc739f0cc4
+SHA512 (stratisd-3.5.8.tar.gz) = c5cf64f2261b7315149abe1d49d997adfce586295998be364f01f4046e400edb404db49f6b60d3acadb377b8df085a3b565365e910aca7c04c2e12943a72846b
+SHA512 (stratisd-3.5.8-vendor.tar.gz) = 90d953d88dd03a84739e9ea2b776a34aa1ae451c08db76186c799e50b85345c16daaa66c323260ce99665f8023c99d1f56c1d35ee65e98dcbe393d4a5457c466
diff --git a/stratisd.spec b/stratisd.spec
index 5060154..8d73855 100644
--- a/stratisd.spec
+++ b/stratisd.spec
@@ -4,14 +4,14 @@
 %global dracutdir %(pkg-config --variable=dracutdir dracut)
 
 Name:           stratisd
-Version:        3.5.7
-Release:        3%{?dist}
+Version:        3.5.8
+Release:        1%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
 License:        (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND MPL-2.0 AND (Unlicense OR MIT)
 URL:            https://github.com/stratis-storage/stratisd
-Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-Source1:        %{url}/releases/download/v%{version}/%{name}-%{version}-vendor.tar.gz
+Source0:        %{url}/archive/stratisd-v%{version}/%{name}-%{version}.tar.gz
+Source1:        %{url}/releases/download/stratisd-v%{version}/%{name}-%{version}-vendor.tar.gz
 Source2:        %{crates_source}
 
 
@@ -84,9 +84,21 @@ Requires:     stratisd
 %{summary}.
 
 %prep
+# Rename SOURCE0's top-level directory because it starts with
+# stratisd-stratisd-v. GitHub calculates the directory name from the repo name
+# + the tag. Extract the upstream crate on top of the extracted GitHub release,
+# overwriting changed files. The primary purpose of thie step is to ensure that
+# the Cargo.toml that is used in building is the one that is generated by
+# cargo-publish and cargo-package, not the file with path dependencies that
+# GitHub packs up. Tar the overwritten files back up again into a tar file
+# with the format and top-level directory that %setup expects cleaning up the
+# previously extracted directory and its contents at the same time. Move the
+# newly created tar file to the SOURCE0 location.
+tar --transform="s/^stratisd\-stratisd-v/stratisd-/" --extract --verbose --file %{SOURCE0}
+tar --extract --verbose --overwrite --file %{SOURCE2}
+tar --create --verbose --gzip --file %{SOURCE0}.newfile ./stratisd-%{version} --remove-files
+mv %{SOURCE0}.newfile %{SOURCE0}
 %setup -q
-tar --strip-components=1 --extract --verbose --file %{SOURCE2}
-# Patches must be applied after the upstream package is extracted.
 %if 0%{?rhel}
 # Source1 is vendored dependencies
 %cargo_prep -V 1
@@ -180,6 +192,9 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
 %{_mandir}/man8/stratis-dumpmetadata.8*
 
 %changelog
+* Thu Jul 27 2023 mulhern <amulhern@redhat.com> - 3.5.8
+- Update to 3.5.8
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild