diff --git a/.gitignore b/.gitignore
index 1d31bb7..1ba35be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /libvma-9.1.1.tar.gz
 /libvma-9.2.2.tar.gz
 /libvma-9.3.1.tar.gz
+/libvma-9.4.0.tar.gz
diff --git a/0001-Fix-fc35-issues.patch b/0001-Fix-fc35-issues.patch
deleted file mode 100644
index debd46f..0000000
--- a/0001-Fix-fc35-issues.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 061e5640686f670398856b8640161762ce56d5e5 Mon Sep 17 00:00:00 2001
-From: Igor Ivanov <igori@nvidia.com>
-Date: Thu, 17 Jun 2021 16:07:31 +0300
-Subject: [PATCH] Fix fc35 issues
-
-- glibc:
-  The function pthread_yield has been deprecated; programs should use
-  the equivalent standard function sched_yield instead.
-- systemd:
-  Fix systemd detection
-
-Signed-off-by: Igor Ivanov <igori@nvidia.com>
----
- Makefile.am                 | 10 ++--------
- src/vma/iomux/epfd_info.cpp |  2 +-
- 2 files changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index ee543c8f..c8dea6ee 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,21 +19,15 @@ mydocdir = $(if $(docdir),$(docdir),${datadir}/doc/$(distdir))
- mydoc_DATA = README CHANGES
- 
- install-exec-hook:
--	if type systemctl >/dev/null 2>&1; then \
-+	if systemctl >/dev/null 2>&1; then \
- 		mkdir -p $(DESTDIR)$(prefix)/lib/systemd/system/; \
- 		cp $(top_builddir)/contrib/scripts/vma.service $(DESTDIR)$(prefix)/lib/systemd/system/vma.service; \
- 		chmod 644 $(DESTDIR)$(prefix)/lib/systemd/system/vma.service; \
--	else \
--		mkdir -p $(DESTDIR)/$(sysconfdir)/init.d; \
--		cp $(top_builddir)/contrib/scripts/vma.init $(DESTDIR)$(sysconfdir)/init.d/vma; \
--		chmod 755 $(DESTDIR)$(sysconfdir)/init.d/vma; \
- 	fi
- 
- uninstall-hook:
--	if type systemctl >/dev/null 2>&1; then \
-+	if systemctl >/dev/null 2>&1; then \
- 		rm -rf $(DESTDIR)$(prefix)/lib/systemd/system/vma.service; \
--	else \
--		rm -rf $(DESTDIR)$(sysconfdir)/init.d/vma; \
- 	fi
- 
- install-all: install
-diff --git a/src/vma/iomux/epfd_info.cpp b/src/vma/iomux/epfd_info.cpp
-index c7670c7b..d7c6c4fc 100644
---- a/src/vma/iomux/epfd_info.cpp
-+++ b/src/vma/iomux/epfd_info.cpp
-@@ -624,7 +624,7 @@ int epfd_info::ring_poll_and_process_element(uint64_t *p_poll_sn, void* pv_fd_re
- 
- 	m_ring_map_lock.unlock();
- 
--	if (m_sysvar_thread_mode == THREAD_MODE_PLENTY && ret_total == 0 && errno == EAGAIN) pthread_yield();
-+	if (m_sysvar_thread_mode == THREAD_MODE_PLENTY && ret_total == 0 && errno == EAGAIN) sched_yield();
- 
- 	if (ret_total) {
- 		__log_func("ret_total=%d", ret_total);
--- 
-2.18.1
-
diff --git a/libvma.spec b/libvma.spec
index 1a079ee..841f232 100644
--- a/libvma.spec
+++ b/libvma.spec
@@ -1,14 +1,13 @@
 %{!?configure_options: %global configure_options %{nil}}
 
 Name: libvma
-Version: 9.3.1
-Release: 2%{?dist}
+Version: 9.4.0
+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-fc35-issues.patch
 
 # libvma currently supports only the following architectures
 ExclusiveArch: x86_64 ppc64le ppc64 aarch64
@@ -68,6 +67,7 @@ fi
 
 find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete
 install -D -m 644 contrib/scripts/vma.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/vma.service
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/vma
 
 %post
 %systemd_post vma.service
@@ -99,6 +99,9 @@ install -D -m 644 contrib/scripts/vma.service $RPM_BUILD_ROOT/%{_prefix}/lib/sys
 %{_mandir}/man8/vma_stats.*
 
 %changelog
+* Tue Nov 09 2021 Honggang Li <honli@redhat.com> - 9.4.0-1
+- Bump version to 9.4.0
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index fd1bbe8..2ef952f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libvma-9.3.1.tar.gz) = 6829acf9759ebdfbe2bfe0607761c1817abcab9e36e942709f532b6769d24c94e8c16cba2b9ccf200eef613b6d20dce2fcd914c509f1cc7662283118ceb5d0ec
+SHA512 (libvma-9.4.0.tar.gz) = eef107ffacfad98ce4e479df5d2ce7ab1f928d5ca852eabc5e9b29dba705223773471d2761ca545e69a25b9a7d17fb7da453f30b0949abf63b888b29e8a6b773