diff --git a/.gitignore b/.gitignore
index 283289a..0cd42f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /xbean-4.15-source-release.zip
 /xbean-4.17-source-release.zip
 /xbean-4.18-source-release.zip
+/xbean-4.21-source-release.zip
diff --git a/0001-Remove-unused-import.patch b/0001-Remove-unused-import.patch
deleted file mode 100644
index c0a9a2f..0000000
--- a/0001-Remove-unused-import.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c7b2913a7d552929a3182901466db69ba40e4340 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Thu, 12 Dec 2019 08:51:36 +0100
-Subject: [PATCH 1/3] Remove unused import
-
----
- .../java/org/apache/xbean/propertyeditor/PropertyEditors.java   | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
-index dda3bf4d..5c6285f2 100644
---- a/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
-+++ b/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
-@@ -19,8 +19,6 @@ package org.apache.xbean.propertyeditor;
- import java.beans.PropertyEditorManager;
- import java.lang.reflect.Type;
- 
--import com.sun.org.apache.regexp.internal.RE;
--
- /**
-  * The property editor manager.  This orchestrates Geronimo usage of
-  * property editors, allowing additional search paths to be added and
--- 
-2.21.0
-
diff --git a/0002-Unbundle-ASM.patch b/0001-Unbundle-ASM.patch
similarity index 100%
rename from 0002-Unbundle-ASM.patch
rename to 0001-Unbundle-ASM.patch
diff --git a/0003-Remove-dependency-on-log4j-and-commons-logging.patch b/0002-Remove-dependency-on-log4j-and-commons-logging.patch
similarity index 100%
rename from 0003-Remove-dependency-on-log4j-and-commons-logging.patch
rename to 0002-Remove-dependency-on-log4j-and-commons-logging.patch
diff --git a/sources b/sources
index fcc3e67..8ab93b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xbean-4.18-source-release.zip) = 766746caa4f9ea87ceff1af1fe052481a9478cab4754b18cb7c760fb9dc466e5fd85533f2040583c3378cf36a4e17ba357d48060896af86a933916008cb2dda6
+SHA512 (xbean-4.21-source-release.zip) = 174072e9cb1577a20494822d056d7b25feef51f0d1871f6c4c84891c220e5822af082e0d408f755d58de8a62c4638d4d2a8697eaca7d47b9d06a93b263da22f1
diff --git a/xbean.spec b/xbean.spec
index e989ce0..0bdc5c1 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -1,8 +1,8 @@
 %bcond_with bootstrap
 
 Name:           xbean
-Version:        4.18
-Release:        8%{?dist}
+Version:        4.21
+Release:        1%{?dist}
 Summary:        Java plugin based web server
 License:        ASL 2.0
 URL:            https://geronimo.apache.org/xbean/
@@ -11,9 +11,8 @@ ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
-Patch1:         0001-Remove-unused-import.patch
-Patch2:         0002-Unbundle-ASM.patch
-Patch3:         0003-Remove-dependency-on-log4j-and-commons-logging.patch
+Patch1:         0001-Unbundle-ASM.patch
+Patch2:         0002-Remove-dependency-on-log4j-and-commons-logging.patch
 
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
@@ -46,7 +45,6 @@ This package provides %{summary}.
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 cp xbean-asm-util/src/main/java/org/apache/xbean/asm9/original/commons/AsmConstants.java xbean-reflect/src/main/java/org/apache/xbean/recipe/
 
@@ -77,7 +75,7 @@ find -name Log4jConverter.java -delete
 %pom_remove_dep :xbean-bundleutils xbean-finder
 rm -r xbean-finder/src/main/java/org/apache/xbean/finder{,/archive}/Bundle*
 
-# Disable one test that fails on JDK 11
+# Disable one test that fails on JVM 11
 sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apache/xbean/finder/archive/MJarJarArchiveTest.java
 
 %build
@@ -93,6 +91,9 @@ sed -i '/testGetBytecode/i@org.junit.Ignore' xbean-finder/src/test/java/org/apac
 %license LICENSE NOTICE
 
 %changelog
+* Fri Sep 09 2022 Marian Koncek <mkoncek@redhat.com> - 4.21-1
+- Update to upstream version 4.21
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.18-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild