diff --git a/.gitignore b/.gitignore
index 08bb04c..77e0fa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /onig-6.0.0.crate
 /onig-6.1.0.crate
 /onig-6.1.1.crate
+/onig-6.3.2.crate
diff --git a/onig-fix-metadata-auto.diff b/onig-fix-metadata-auto.diff
new file mode 100644
index 0000000..1eb6efa
--- /dev/null
+++ b/onig-fix-metadata-auto.diff
@@ -0,0 +1,8 @@
+--- onig-6.3.2/Cargo.toml	1970-01-01T00:00:01+00:00
++++ onig-6.3.2/Cargo.toml	1970-01-01T00:00:01+00:00
+@@ -44,5 +44,3 @@
+ print-debug = ["onig_sys/print-debug"]
+ std-pattern = []
+ 
+-[target."cfg(windows)".dependencies.libc]
+-version = "0.2"
diff --git a/onig-fix-metadata.diff b/onig-fix-metadata.diff
deleted file mode 100644
index 40a631b..0000000
--- a/onig-fix-metadata.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- onig-6.1.1/Cargo.toml	2020-11-22T10:29:59+00:00
-+++ onig-6.1.1/Cargo.toml	2020-11-29T18:07:07.950070+00:00
-@@ -35,5 +35,3 @@
- posix-api = ["onig_sys/posix-api"]
- print-debug = ["onig_sys/print-debug"]
- std-pattern = []
--[target."cfg(windows)".dependencies.libc]
--version = "0.2"
diff --git a/rust-onig.spec b/rust-onig.spec
index 108d53c..1f5983d 100644
--- a/rust-onig.spec
+++ b/rust-onig.spec
@@ -1,28 +1,23 @@
-# Generated by rust2rpm 16
+# Generated by rust2rpm 22
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate onig
 
-Name:           rust-%{crate}
-Version:        6.1.1
+Name:           rust-onig
+Version:        6.3.2
 Release:        %autorelease
 Summary:        Rust bindings for the Oniguruma regular expression library
 
-# Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/onig
 Source:         %{crates_source}
-# Initial patched metadata
-# * Remove windows dependency
-Patch0:         onig-fix-metadata.diff
+# Automatically generated patch to strip foreign dependencies
+Patch:          onig-fix-metadata-auto.diff
 
 ExclusiveArch:  %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif
 
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21
 
 %global _description %{expand:
 Rust-Onig is a set of Rust bindings for the Oniguruma regular expression
@@ -37,12 +32,12 @@ BuildArch:      noarch
 
 %description    devel %{_description}
 
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
 
 %files          devel
-%license LICENSE.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -50,11 +45,11 @@ BuildArch:      noarch
 
 %description -n %{name}+default-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "default" feature of "%{crate}" crate.
+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}+generate-devel
 Summary:        %{summary}
@@ -62,11 +57,11 @@ BuildArch:      noarch
 
 %description -n %{name}+generate-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "generate" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "generate" feature of the "%{crate}" crate.
 
 %files       -n %{name}+generate-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+posix-api-devel
 Summary:        %{summary}
@@ -74,11 +69,11 @@ BuildArch:      noarch
 
 %description -n %{name}+posix-api-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "posix-api" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "posix-api" feature of the "%{crate}" crate.
 
 %files       -n %{name}+posix-api-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+print-debug-devel
 Summary:        %{summary}
@@ -86,11 +81,11 @@ BuildArch:      noarch
 
 %description -n %{name}+print-debug-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "print-debug" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "print-debug" feature of the "%{crate}" crate.
 
 %files       -n %{name}+print-debug-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %package     -n %{name}+std-pattern-devel
 Summary:        %{summary}
@@ -98,11 +93,11 @@ BuildArch:      noarch
 
 %description -n %{name}+std-pattern-devel %{_description}
 
-This package contains library source intended for building other packages
-which use "std-pattern" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "std-pattern" feature of the "%{crate}" crate.
 
 %files       -n %{name}+std-pattern-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
@@ -119,12 +114,7 @@ which use "std-pattern" feature of "%{crate}" crate.
 
 %if %{with check}
 %check
-# Somehow rustdoc crashes on 32bit
-%if 0%{?__isa_bits} >= 64
-  %cargo_test
-%else
-  %cargo_test || :
-%endif
+%cargo_test
 %endif
 
 %changelog
diff --git a/sources b/sources
index 3a3e703..35d825a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (onig-6.1.1.crate) = 4d754f05a3612486f6730f850956a041f1fb8ff723fd512acd0a8a0a4a2c8be2b98cd6f7b6a882947d3b368bdb5822241e55a87eef331de80c375433d326a864
+SHA512 (onig-6.3.2.crate) = 0a139d09c5f4bff1a86b052683fda43dbae2506a82dad352f2c9ee0bff8b14485e39a8b558d79935c3485384aa245e4c13f42cf27372df4025ac42fac81c7719