diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e90146d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/addr2line-0.21.0.crate
diff --git a/.rust-addr2line.metadata b/.rust-addr2line.metadata
index e69de29..c46144f 100644
--- a/.rust-addr2line.metadata
+++ b/.rust-addr2line.metadata
@@ -0,0 +1 @@
+c9c24e98d4086eefe259757c731714654362b43b  SOURCES/addr2line-0.21.0.crate
diff --git a/SOURCES/addr2line-0.19.0.crate b/SOURCES/addr2line-0.19.0.crate
deleted file mode 100644
index 899afc2..0000000
Binary files a/SOURCES/addr2line-0.19.0.crate and /dev/null differ
diff --git a/SOURCES/addr2line-fix-metadata.diff b/SOURCES/addr2line-fix-metadata.diff
index 6ce282d..eaebc46 100644
--- a/SOURCES/addr2line-fix-metadata.diff
+++ b/SOURCES/addr2line-fix-metadata.diff
@@ -1,6 +1,6 @@
---- addr2line-0.19.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ addr2line-0.19.0/Cargo.toml	2023-03-30T18:29:34.834497+00:00
-@@ -16,6 +16,10 @@
+--- addr2line-0.21.0/Cargo.toml	1970-01-01T00:00:01+00:00
++++ addr2line-0.21.0/Cargo.toml	2023-11-29T18:39:59.278241+00:00
+@@ -18,6 +18,10 @@
      "/benches/*",
      "/fixtures/*",
      ".github",
diff --git a/SOURCES/rust2rpm.toml b/SOURCES/rust2rpm.toml
new file mode 100644
index 0000000..e618580
--- /dev/null
+++ b/SOURCES/rust2rpm.toml
@@ -0,0 +1,12 @@
+[features]
+hide = [
+    "alloc",
+    "compiler_builtins",
+    "core",
+    "rustc-dep-of-std",
+]
+
+[tests]
+run = ["none"]
+comments = ["resolve circular dependency with backtrace"]
+
diff --git a/SPECS/rust-addr2line.spec b/SPECS/rust-addr2line.spec
index f9763d7..f0eec7e 100644
--- a/SPECS/rust-addr2line.spec
+++ b/SPECS/rust-addr2line.spec
@@ -8,7 +8,7 @@
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
 ## END: Set by rpmautospec
 
-# Generated by rust2rpm 24
+# Generated by rust2rpm 25
 # * resolve circular dependency with backtrace
 %bcond_with check
 %global debug_package %{nil}
@@ -16,7 +16,7 @@
 %global crate addr2line
 
 Name:           rust-addr2line
-Version:        0.19.0
+Version:        0.21.0
 Release:        %autorelease
 Summary:        Cross-platform symbolication library written in Rust, using gimli
 
@@ -27,7 +27,7 @@ Source:         %{crates_source}
 # * exclude files that are only useful for upstream development
 Patch:          addr2line-fix-metadata.diff
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 A cross-platform symbolication library written in Rust, using `gimli`.}
@@ -86,6 +86,18 @@ use the "fallible-iterator" feature of the "%{crate}" crate.
 %files       -n %{name}+fallible-iterator-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+memmap2-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+memmap2-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "memmap2" feature of the "%{crate}" crate.
+
+%files       -n %{name}+memmap2-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+object-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -147,7 +159,7 @@ use the "std-object" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires
@@ -165,9 +177,15 @@ use the "std-object" feature of the "%{crate}" crate.
 %endif
 
 %changelog
-* Mon Nov 20 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.19.0-1
+* Wed Nov 29 2023 Fabio Valentini <decathorpe@gmail.com> - 0.21.0-1
+- Update to version 0.21.0; Fixes RHBZ#2187037
+
+* Mon Nov 20 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.19.0-2
 - Rebuilt for MSVSphere 9.2
 
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Mar 30 2023 Fabio Valentini <decathorpe@gmail.com> - 0.19.0-1
 - Update to version 0.19.0; Fixes RHBZ#2147527