diff --git a/.gitignore b/.gitignore
index d107491..4b5ae05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mstflint-4.18.0-1.tar.gz
+SOURCES/mstflint-2b022989e5f22875284f3fbaccf67361ef5a848d.tar.gz
diff --git a/.mstflint.metadata b/.mstflint.metadata
index 0944a16..ba4bd92 100644
--- a/.mstflint.metadata
+++ b/.mstflint.metadata
@@ -1 +1 @@
-62bda99ff2f53d36a44ab98ab10a78572ce7f0d2 SOURCES/mstflint-4.18.0-1.tar.gz
+e5b86610383d89d294092a0edab42808e1945e20 SOURCES/mstflint-2b022989e5f22875284f3fbaccf67361ef5a848d.tar.gz
diff --git a/SPECS/mstflint.spec b/SPECS/mstflint.spec
index a291bb4..1f67eef 100644
--- a/SPECS/mstflint.spec
+++ b/SPECS/mstflint.spec
@@ -1,15 +1,20 @@
 %global __remake_config 1
 
+%global forgeurl https://github.com/Mellanox/mstflint
+%global commit 2b022989e5f22875284f3fbaccf67361ef5a848d
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%forgemeta
+
 Name:		mstflint
 Summary:	Mellanox firmware burning tool
-Version:	4.18.0
-Release:	1%{?dist}
+Version:	4.19.0
+Release:	0.3%{?dist}
 License:	GPLv2+ or BSD
 Group:		Applications/System
-Source: 	https://github.com/Mellanox/mstflint/releases/download/v4.18.0-1/mstflint-4.18.0-1.tar.gz
+Source: 	%{forgesource}
 Patch4: 	add-default-link-flags-for-shared-libraries.patch
 Patch6: 	replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch
-Url:		https://github.com/Mellanox/mstflint
+Url:		%{forgeurl}
 BuildRequires: make
 BuildRequires:	libstdc++-devel, zlib-devel, libibmad-devel, gcc-c++, gcc
 BuildRequires:  libcurl-devel, boost-devel, libxml2-devel, openssl-devel
@@ -25,17 +30,17 @@ 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
-%patch4 -p1
-%patch6 -p1
+%forgeautosetup -p1
 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';'
 find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
 
 %build
 %if %{__remake_config}
+# gitversion.sh called from autogen.sh will fail. Just do its work here:
+printf '#define TOOLS_GIT_SHA "%s"\n' %{shortcommit} > common/gitversion.h
 ./autogen.sh
 %endif
-%configure --enable-fw-mgr
+%configure TOOLS_GIT_SHA=%{shortcommit} --enable-fw-mgr
 %make_build
 
 %install
@@ -55,6 +60,11 @@ find %{buildroot} -type f -name '*.a' -delete
 %{_mandir}/man1/*
 
 %changelog
+* Mon Mar 28 2022 Michal Schmidt <mschmidt@redhat.com> - 4.19.0-0.3
+- Rebase to the almost released 4.19.0
+- O-Resolves: rhbz#2045017
+- Resolves: rhbz#2068077
+
 * 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