diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch
index 8e663e0..38185bf 100644
--- a/SOURCES/openvswitch-2.17.0.patch
+++ b/SOURCES/openvswitch-2.17.0.patch
@@ -63047,6 +63047,20 @@ index 651012bf06..7b41dc44bf 100644
  
                  # (Here's where we end up if it didn't.)
                  # XXX rate-limit
+diff --git a/python/ovs/stream.py b/python/ovs/stream.py
+index ac5b0fd0c6..b32341076c 100644
+--- a/python/ovs/stream.py
++++ b/python/ovs/stream.py
+@@ -824,7 +824,8 @@ class SSLStream(Stream):
+             self.socket.do_handshake()
+         except ssl.SSLWantReadError:
+             return errno.EAGAIN
+-        except ssl.SSLSyscallError as e:
++        except (ssl.SSLSyscallError, ssl.SSLZeroReturnError,
++                ssl.SSLEOFError, OSError) as e:
+             return ovs.socket_util.get_exception_errno(e)
+ 
+         return 0
 diff --git a/python/setup.py b/python/setup.py
 index cfe01763f3..36ced65089 100644
 --- a/python/setup.py
diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec
index 3f3f898..793fc93 100644
--- a/SPECS/openvswitch2.17.spec
+++ b/SPECS/openvswitch2.17.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.17.0
-Release: 83%{?dist}
+Release: 84%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -748,6 +748,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Apr 26 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-84
+- Merging upstream branch-2.17 [RH git: e60083b517]
+    Commit list:
+    cbe5852d76 python-stream: Handle SSL error in do_handshake.
+
+
 * Tue Apr 25 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-83
 - Merging upstream branch-2.17 [RH git: 43fc90b55a]
     Commit list: