diff --git a/.gitignore b/.gitignore
index e785ce5..5c7f585 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /clang-sys-1.6.0.crate
 /clang-sys-1.6.1.crate
 /clang-sys-1.7.0.crate
+/clang-sys-1.8.1.crate
diff --git a/clang-sys-fix-metadata.diff b/clang-sys-fix-metadata.diff
new file mode 100644
index 0000000..533ec49
--- /dev/null
+++ b/clang-sys-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- clang-sys-1.8.1/Cargo.toml	1970-01-01T00:00:01+00:00
++++ clang-sys-1.8.1/Cargo.toml	2024-06-10T17:21:16.762166+00:00
+@@ -46,7 +46,7 @@
+ version = "1"
+ 
+ [dev-dependencies.tempfile]
+-version = ">=3.0.0, <3.7.0"
++version = "3"
+ 
+ [build-dependencies.glob]
+ version = "0.3"
diff --git a/rust-clang-sys.spec b/rust-clang-sys.spec
index 79b8312..eafc2a8 100644
--- a/rust-clang-sys.spec
+++ b/rust-clang-sys.spec
@@ -1,19 +1,23 @@
-# Generated by rust2rpm 25
+# Generated by rust2rpm 26
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate clang-sys
 
 Name:           rust-clang-sys
-Version:        1.7.0
+Version:        1.8.1
 Release:        %autorelease
 Summary:        Rust bindings for libclang
 
 License:        Apache-2.0
 URL:            https://crates.io/crates/clang-sys
 Source:         %{crates_source}
+# Manually created patch for downstream crate metadata changes
+# * relax tempfile dev-dependency to allow building with 3.7+
+Patch:          clang-sys-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  clang-devel >= 3.5
 
 %global _description %{expand:
 Rust bindings for libclang.}
@@ -152,6 +156,19 @@ use the "clang_17_0" feature of the "%{crate}" crate.
 %files       -n %{name}+clang_17_0-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+clang_18_0-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Requires:       clang-devel >= 18.0
+
+%description -n %{name}+clang_18_0-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "clang_18_0" feature of the "%{crate}" crate.
+
+%files       -n %{name}+clang_18_0-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+clang_3_5-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -295,6 +312,18 @@ use the "clang_9_0" feature of the "%{crate}" crate.
 %files       -n %{name}+clang_9_0-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+libcpp-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+libcpp-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "libcpp" feature of the "%{crate}" crate.
+
+%files       -n %{name}+libcpp-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+libloading-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -338,7 +367,6 @@ use the "static" feature of the "%{crate}" crate.
 
 %generate_buildrequires
 %cargo_generate_buildrequires
-echo 'clang-devel >= 3.5'
 
 %build
 %cargo_build
diff --git a/rust2rpm.toml b/rust2rpm.toml
index cc3a036..2f24410 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,3 +1,8 @@
+[package]
+cargo-toml-patch-comments = [
+    "relax tempfile dev-dependency to allow building with 3.7+",
+]
+
 [requires]
 build = ["clang-devel >= 3.5"]
 
@@ -23,4 +28,5 @@ clang_14_0 = ["clang-devel >= 14.0"]
 clang_15_0 = ["clang-devel >= 15.0"]
 clang_16_0 = ["clang-devel >= 16.0"]
 clang_17_0 = ["clang-devel >= 17.0"]
+clang_18_0 = ["clang-devel >= 18.0"]
 
diff --git a/sources b/sources
index bd93fae..41f8d7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (clang-sys-1.7.0.crate) = e544984d5bd76824ea2093f43f98b59a99e1ca8a5de40e49164b870ed4a91a530f3492faf0678190b91e74aa5d122bdbb32c649998d0ce24912dfb0b83ed6b81
+SHA512 (clang-sys-1.8.1.crate) = a68c426c20110fddb8bba07d6631517b0528fad45802e5a34a22561d7e6dad82dc5001387019a03f275e9a671b09ee0a06b6e86793c4fb4ec655700bb0f5e125