diff --git a/SOURCES/openvswitch-3.5.0.patch b/SOURCES/openvswitch-3.5.0.patch
index 90b443f..bff5dc0 100644
--- a/SOURCES/openvswitch-3.5.0.patch
+++ b/SOURCES/openvswitch-3.5.0.patch
@@ -1884,6 +1884,37 @@ index 4d1fb7493c..c9734efece 100644
          super().__init__(opts, "odp")
  
      def start_file(self, name, filename):
+diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
+index 715cbf7aa7..26c0f6ec48 100644
+--- a/rhel/openvswitch-fedora.spec.in
++++ b/rhel/openvswitch-fedora.spec.in
+@@ -148,7 +148,7 @@ License: ASL 2.0
+ This provides shared library, libopenswitch.so and the openvswitch header
+ files needed to build an external application.
+ 
+-%if 0%{?rhel} > 7 || 0%{?fedora} > 28
++%if 0%{?rhel} > 7 || (0%{?fedora} > 28 && 0%{?fedora} < 41)
+ %package -n network-scripts-%{name}
+ Summary: Open vSwitch legacy network service support
+ License: ASL 2.0
+@@ -436,7 +436,7 @@ fi
+ %exclude %{_libdir}/*.la
+ %exclude %{_libdir}/*.a
+ 
+-%if 0%{?rhel} > 7 || 0%{?fedora} > 28
++%if 0%{?rhel} > 7 || (0%{?fedora} > 28 && 0%{?fedora} < 41)
+ %files -n network-scripts-%{name}
+ %{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
+ %{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
+@@ -463,7 +463,7 @@ fi
+ %{_unitdir}/ovs-vswitchd.service
+ %{_unitdir}/ovs-delete-transient-ports.service
+ %{_datadir}/openvswitch/scripts/openvswitch.init
+-%if ! (0%{?rhel} > 7 || 0%{?fedora} > 28)
++%if ! (0%{?rhel} > 7 || (0%{?fedora} > 28 && 0%{?fedora} < 41))
+ %{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
+ %{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
+ %endif
 diff --git a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service b/rhel/usr_lib_systemd_system_openvswitch-ipsec.service
 index 92dad44f93..913598f080 100644
 --- a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service
diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec
index 8502dba..7316d81 100644
--- a/SPECS/openvswitch3.5.spec
+++ b/SPECS/openvswitch3.5.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.5.0
-Release: 0.17%{?dist}
+Release: 0.18%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -773,6 +773,12 @@ exit 0
 %endif
 
 %changelog
+* Thu Feb 06 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-0.18
+- Merging upstream branch-3.5 [RH git: d3ea8eae53]
+    Commit list:
+    63785d16db fedora: Don't generate network-scripts-openvswitch for ver > 40.
+
+
 * Fri Jan 31 2025 Kevin Traynor <ktraynor@redhat.com> - 3.5.0-0.17
 - redhat: update ovsci Jenkins URL [RH git: 620501659b]
     Signed-off-by: Kevin Traynor <ktraynor@redhat.com>