diff --git a/.gitignore b/.gitignore
index f9fb1de..02612a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /cargo-c-0.6.8.crate
 /cargo-c-0.6.10.crate
 /cargo-c-0.6.13.crate
+/cargo-c-0.6.18+cargo-0.49.crate
diff --git a/cargo-c-fix-metadata.diff b/cargo-c-fix-metadata.diff
new file mode 100644
index 0000000..975ed38
--- /dev/null
+++ b/cargo-c-fix-metadata.diff
@@ -0,0 +1,16 @@
+--- cargo-c-0.6.18+cargo-0.49/Cargo.toml	2020-11-23T12:53:31+00:00
++++ cargo-c-0.6.18+cargo-0.49/Cargo.toml	2020-11-29T14:30:10.089229+00:00
+@@ -13,7 +13,7 @@
+ [package]
+ edition = "2018"
+ name = "cargo-c"
+-version = "0.6.18+cargo-0.49"
++version = "0.6.18"
+ authors = ["Luca Barbato <lu_zero@gentoo.org>"]
+ description = "Helper program to build and install c-like libraries"
+ readme = "README.md"
+@@ -69,4 +69,3 @@
+ 
+ [features]
+ default = []
+-vendored-openssl = ["cargo/vendored-openssl"]
diff --git a/rust-cargo-c.spec b/rust-cargo-c.spec
index f263345..9c43fea 100644
--- a/rust-cargo-c.spec
+++ b/rust-cargo-c.spec
@@ -1,17 +1,22 @@
-# Generated by rust2rpm 13
+# Generated by rust2rpm 16
 %bcond_without check
 
 %global crate cargo-c
+%global upstream_version 0.6.18+cargo-0.49
 
 Name:           rust-%{crate}
-Version:        0.6.13
+Version:        0.6.18
 Release:        1%{?dist}
 Summary:        Helper program to build and install c-like libraries
 
 # Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/cargo-c
-Source:         %{crates_source}
+Source:         %{crates_source %{crate} %{upstream_version}}
+# Initial patched metadata
+# * drop +cargo-0.49 suffix from version
+# * remove vendored OpenSSL feature
+Patch0:         cargo-c-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -30,12 +35,14 @@ Helper program to build and install c-like libraries.}
 Summary:        %{summary}
 # ASL 2.0
 # ASL 2.0 or Boost
+# ASL 2.0 or MIT
 # MIT
 # MIT or ASL 2.0
+# MIT or ASL 2.0 or zlib
 # MPLv2.0
 # Unlicense or MIT
-# zlib
-License:        MIT and ASL 2.0 and MPLv2.0 and zlib
+# zlib or ASL 2.0 or MIT
+License:        MIT and ASL 2.0 and MPLv2.0
 
 %description -n %{crate} %{_description}
 
@@ -44,6 +51,7 @@ License:        MIT and ASL 2.0 and MPLv2.0 and zlib
 %doc README.md
 %{_bindir}/cargo-cbuild
 %{_bindir}/cargo-cinstall
+%{_bindir}/cargo-ctest
 %{_bindir}/cargo-capi
 %endif
 
@@ -74,7 +82,7 @@ which use "default" feature of "%{crate}" crate.
 %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{upstream_version} -p1
 %cargo_prep
 
 %generate_buildrequires
@@ -92,6 +100,10 @@ which use "default" feature of "%{crate}" crate.
 %endif
 
 %changelog
+* Sun Nov 29 2020 Fabio Valentini <decathorpe@gmail.com> - 0.6.18-1
+- Update to version 0.6.18+cargo-0.49.
+- Fixes RHBZ#1887871
+
 * Mon Sep 21 2020 Fabio Valentini <decathorpe@gmail.com> - 0.6.13-1
 - Update to version 0.6.13.
 
diff --git a/sources b/sources
index 4d00238..2beb6e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cargo-c-0.6.13.crate) = b8369ec54c35c0856434fe4f75ea64c767119774af0e0ada5c83bb13a00f863b61a814e263230eeb8f33e807d32153805d41404b7858b06b9ee9faec83362dba
+SHA512 (cargo-c-0.6.18+cargo-0.49.crate) = 6eeb7750ed32ea23b31bbd28d0dfc79df6e30d966fe12184d38ee76c8585e955b4fad25b1cd55314bc0b0c3e43bc6e4915169dd32e1279cab181b57ef2dcf060