diff --git a/.gitignore b/.gitignore
index 2d7c1eb..af4806c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /libvma-9.6.4.tar.gz
 /libvma-9.8.1.tar.gz
 /libvma-9.8.40.tar.gz
+/libvma-9.8.51.tar.gz
diff --git a/0001-Fix-build-failure.patch b/0001-Fix-build-failure.patch
new file mode 100644
index 0000000..88cabe1
--- /dev/null
+++ b/0001-Fix-build-failure.patch
@@ -0,0 +1,31 @@
+From 3801620674bb052fcf7acf03915999fd6f48dd66 Mon Sep 17 00:00:00 2001
+From: Kamal Heib <kheib@redhat.com>
+Date: Mon, 29 Apr 2024 18:54:39 -0400
+Subject: [PATCH] Fix build failure
+
+../../src/vma/util/vma_list.h:210:31: error: template-id not allowed for constructor in C++20 [-Werror=template-id-cdtor]
+  210 |         vma_list_t<T, offset> (const vma_list_t<T, offset>& other) {
+      |                               ^
+../../src/vma/util/vma_list.h:210:31: note: remove the '< >'
+
+Signed-off-by: Kamal Heib <kheib@redhat.com>
+---
+ src/vma/util/vma_list.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/vma/util/vma_list.h b/src/vma/util/vma_list.h
+index 0ce65e8e5268..32fdedbb826f 100644
+--- a/src/vma/util/vma_list.h
++++ b/src/vma/util/vma_list.h
+@@ -207,7 +207,7 @@ public:
+ 		}
+ 	}
+ 
+-	vma_list_t<T, offset> (const vma_list_t<T, offset>& other) {
++	vma_list_t(const vma_list_t<T, offset>& other) {
+ 		if (!other.empty())
+ 			vlist_logwarn("Copy constructor is not supported for non-empty list! other.size=%zu", other.m_size);
+ 		init_list();
+-- 
+2.44.0
+
diff --git a/0001-Fix-gcc12-compilation-issue.patch b/0001-Fix-gcc12-compilation-issue.patch
deleted file mode 100644
index 5eed55c..0000000
--- a/0001-Fix-gcc12-compilation-issue.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a42397e377cc2c26a6bb501ee131da63f0a33f45 Mon Sep 17 00:00:00 2001
-From: Igor Ivanov <igori@nvidia.com>
-Date: Mon, 31 Jan 2022 20:01:33 +0200
-Subject: [PATCH] issue: 2945718 Fix gcc12 compilation issue
-
-C++17 has deprecated a few components that had been in C++ since its beginning,
-and std::iterator is one of them.
-
-Signed-off-by: Igor Ivanov <igori@nvidia.com>
----
- src/vma/util/vma_list.h | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/vma/util/vma_list.h b/src/vma/util/vma_list.h
-index ae57fba4..9c9b6b38 100644
---- a/src/vma/util/vma_list.h
-+++ b/src/vma/util/vma_list.h
-@@ -88,9 +88,14 @@ public :
- 
- template<typename T, size_t offset(void)>
- /* coverity[missing_move_assignment] */
--class list_iterator_t : public std::iterator<std::random_access_iterator_tag, T, std::ptrdiff_t, T*, T&>
-+class list_iterator_t
- {
- public:
-+	using iterator_category = std::random_access_iterator_tag;
-+	using value_type = T;
-+	using difference_type = std::ptrdiff_t;
-+	using pointer = T*;
-+	using reference = T&;
- 
- 	list_iterator_t(T* ptr = NULL) : m_ptr(ptr) {}
- 
--- 
-2.27.0
-
diff --git a/libvma.spec b/libvma.spec
index 9e496df..c2aa181 100644
--- a/libvma.spec
+++ b/libvma.spec
@@ -1,13 +1,14 @@
 %{!?configure_options: %global configure_options %{nil}}
 
 Name: libvma
-Version: 9.8.40
-Release: 3%{?dist}
+Version: 9.8.51
+Release: 1%{?dist}
 Summary: A library for boosting TCP and UDP traffic (over RDMA hardware)
 
 License: GPLv2 or BSD
 Url: https://github.com/Mellanox/libvma
 Source0: https://github.com/Mellanox/libvma/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0: 0001-Fix-build-failure.patch
 
 # libvma currently supports only the following architectures
 ExclusiveArch: x86_64 ppc64le ppc64 aarch64
@@ -99,6 +100,10 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/vma
 %{_mandir}/man8/vma_stats.*
 
 %changelog
+* Mon Apr 29 2024 Kamal Heib <kheib@redhat.com> - 9.8.51-1
+- Update to upstream release 9.8.51
+- Resolves: RHEL-24810
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.8.40-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 0e442fb..bdc3f6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libvma-9.8.40.tar.gz) = 2ea7a6abf646354c2f56472c5d7ca325097af87e2fa92f2d9a1c6fc310e7cb1e3eb923329fe70521a115d47e3b907f22965d8dad89518b3f82db3a1a885e47ce
+SHA512 (libvma-9.8.51.tar.gz) = f15217f40aec8fa1462292369f451274e50d1f97cd4b0c2b43c0eaabc4fff1e490a8bf48029dd6a94d06bc00239ca9fb5bbc3197c986ef5a4ce2c5320123aece