diff --git a/.gitignore b/.gitignore
index d107491..045759f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mstflint-4.18.0-1.tar.gz
+SOURCES/mstflint-4.21.0-1.tar.gz
diff --git a/.mstflint.metadata b/.mstflint.metadata
index 0944a16..a64ef87 100644
--- a/.mstflint.metadata
+++ b/.mstflint.metadata
@@ -1 +1 @@
-62bda99ff2f53d36a44ab98ab10a78572ce7f0d2 SOURCES/mstflint-4.18.0-1.tar.gz
+08367f20899423d62313867e4fb40653df2e139c SOURCES/mstflint-4.21.0-1.tar.gz
diff --git a/SPECS/mstflint.spec b/SPECS/mstflint.spec
index a291bb4..bf3bf6b 100644
--- a/SPECS/mstflint.spec
+++ b/SPECS/mstflint.spec
@@ -2,15 +2,17 @@
 
 Name:		mstflint
 Summary:	Mellanox firmware burning tool
-Version:	4.18.0
+Version:	4.21.0
 Release:	1%{?dist}
 License:	GPLv2+ or BSD
+Url:		https://github.com/Mellanox/%{name}
+Source0: 	https://github.com/Mellanox/%{name}/releases/download/v%{version}-1/%{name}-%{version}-1.tar.gz
 Group:		Applications/System
-Source: 	https://github.com/Mellanox/mstflint/releases/download/v4.18.0-1/mstflint-4.18.0-1.tar.gz
-Patch4: 	add-default-link-flags-for-shared-libraries.patch
+
+Patch4:	add-default-link-flags-for-shared-libraries.patch
 Patch6: 	replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch
-Url:		https://github.com/Mellanox/mstflint
-BuildRequires: make
+
+BuildRequires:	make
 BuildRequires:	libstdc++-devel, zlib-devel, libibmad-devel, gcc-c++, gcc
 BuildRequires:  libcurl-devel, boost-devel, libxml2-devel, openssl-devel
 %if %{__remake_config}
@@ -25,9 +27,11 @@ This package contains firmware update tool, vpd dump and register dump tools
 for network adapters based on Mellanox Technologies chips.
 
 %prep
-%setup -q -n mstflint-4.18.0
+%setup -q -n %{name}-%{version}
+
 %patch4 -p1
 %patch6 -p1
+
 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';'
 find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
 
@@ -55,6 +59,14 @@ find %{buildroot} -type f -name '*.a' -delete
 %{_mandir}/man1/*
 
 %changelog
+* Wed Aug 17 2022 Michal Schmidt <mschmidt@redhat.com> - 4.21.0-1
+- Update to upstream release 4.21.0
+- Resolves: rhbz#2049525
+
+* Mon Mar 28 2022 Michal Schmidt <mschmidt@redhat.com> - 4.19.0-0.3
+- Rebase to the almost released 4.19.0
+- Resolves: rhbz#2045017
+
 * Sun Dec 05 2021 Honggang Li <honli@redhat.com> - 4.18.0-1
 - Rebase mstflint to latest upstream release v4.18.0-1
 - Resolves: rhbz#1982202