diff --git a/.gitignore b/.gitignore
index 8320b6b..8255243 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ noarch/
 /mstflint-4.24.0-1.tar.gz
 /mstflint-4.25.0-1.tar.gz
 /mstflint-4.26.0-1.tar.gz
+/mstflint-4.29.0-1.tar.gz
diff --git a/mstflint.spec b/mstflint.spec
index f918e84..a3a2ea9 100644
--- a/mstflint.spec
+++ b/mstflint.spec
@@ -2,7 +2,7 @@
 
 Name:		mstflint
 Summary:	Mellanox firmware burning tool
-Version:	4.26.0
+Version:	4.29.0
 Release:	%autorelease
 # COPYING says the license is your choice of OpenIB.org BSD or GPLv2.
 # kernel/Makefile has the 3-clause BSD.
@@ -15,7 +15,6 @@ Group:		Applications/System
 
 Patch1:		0001-Fix-bind-now-test.patch
 Patch4: 	add-default-link-flags-for-shared-libraries.patch
-Patch6: 	replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch
 
 BuildRequires:	make
 BuildRequires:	libstdc++-devel, zlib-devel, libibmad-devel, gcc-c++, gcc
@@ -35,9 +34,8 @@ for network adapters based on Mellanox Technologies chips.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch1 -p1
-%patch4 -p1
-%patch6 -p1
+%patch -P1 -p1
+%patch -P4 -p1
 
 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';'
 find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
@@ -54,7 +52,7 @@ find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
 # Remove the devel files that we don't ship
 rm -fr %{buildroot}%{_includedir}
 find %{buildroot} -type f -name '*.la' -delete
-find %{buildroot} -type f -name '*.a' -delete
+find %{buildroot} -type f,l -name '*.a' -delete
 
 # Mark these shared libs executable for find-debuginfo.sh to find them.
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Debuginfo/
diff --git a/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch b/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch
deleted file mode 100644
index d24ef01..0000000
--- a/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
-index 420b82f..0a20bcd 100644
---- a/flint/subcommands.cpp
-+++ b/flint/subcommands.cpp
-@@ -4484,7 +4484,7 @@ FlintStatus SgSubCommand::sgFs2()
-     return FLINT_SUCCESS;
- }
- 
--#define FW_RESET_MSG "To load new configuration run mlxfwreset or reboot machine"
-+#define FW_RESET_MSG "To load new configuration run mstfwreset or reboot machine"
- 
- FlintStatus SgSubCommand::sgFs3()
- {
-diff --git a/mlxfwops/lib/flint_base.h b/mlxfwops/lib/flint_base.h
-index f3edc43..a85e43d 100644
---- a/mlxfwops/lib/flint_base.h
-+++ b/mlxfwops/lib/flint_base.h
-@@ -364,7 +364,7 @@ struct GPH {
- 
- #define REBOOT_REQUIRED_STR "To load new FW run reboot machine."
- #ifndef MST_UL
--#define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mlxfwreset or reboot machine."
-+#define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mstfwreset or reboot machine."
- #else
- #define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mstfwreset or reboot machine."
- #endif
diff --git a/sources b/sources
index 8d29fd2..7ff7d14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mstflint-4.26.0-1.tar.gz) = 6ba357f5ed3a8c5ac4195b7b45c5abad3eb95d549f5bd2cc8ae84dee7dab894c47839a3ce3aec04bdaa4942ca953bb148a68cf72c2e9d4e60e090595c96c163e
+SHA512 (mstflint-4.29.0-1.tar.gz) = 33e889feb97e86cfaf095a4224c63015363f38f595bf84b0c7d409359388b6c1fd1e36ab59f995b57ea0d9e3eb686c486bba8047b4cbe75a3829ca1b28ea3976