diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch
index f43fbf4..9d8d1c0 100644
--- a/SOURCES/openvswitch-2.16.0.patch
+++ b/SOURCES/openvswitch-2.16.0.patch
@@ -194,18 +194,33 @@ index 95fa7af128..c1a35eb13a 100644
  is discussed here.
  
 diff --git a/NEWS b/NEWS
-index 559a51ba3f..80720f2607 100644
+index 559a51ba3f..2329ed6ac5 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,20 @@
-+v2.16.3 - xx xxx xxxx
+@@ -1,3 +1,35 @@
++v2.16.4 - xx xxx xxxx
 +---------------------
-+   - Python:
-+     * For SSL support, the use of the pyOpenSSL library has been replaced
-+       with the native 'ssl' module.
++
++v2.16.3 - 08 Apr 2022
++---------------------
++   - Bug fixes
++   - libopenvswitch API change:
++     * To fix the Undefined Behavior issue causing the compiler to incorrectly
++       optimize important parts of code, container iteration macros (e.g.,
++       LIST_FOR_EACH) have been re-implemented in a UB-safe way.
++     * Backwards compatibility has mostly been preserved, however the
++       user-provided pointer is now set to NULL after the loop (unless it
++       exited via "break;")
++     * Users of libopenvswitch will need to double-check the use of such loop
++       macros before compiling with a new version.
++     * Since the change is limited to the definitions within the headers, the
++       ABI is not affected.
 +   - DPDK:
 +     * OVS validated with DPDK 20.11.4. It is recommended to use this version
 +       until further releases.
++   - Python:
++     * For SSL support, the use of the pyOpenSSL library has been replaced
++       with the native 'ssl' module.
 +
 +v2.16.2 - 17 Dec 2021
 +---------------------
@@ -255,7 +270,7 @@ index dba365ea1a..1b957c3dcd 100644
     AC_ARG_ENABLE(
       [sparse],
 diff --git a/configure.ac b/configure.ac
-index 16b32be965..92817b62e1 100644
+index 16b32be965..80bdde37c1 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -13,7 +13,7 @@
@@ -263,7 +278,7 @@ index 16b32be965..92817b62e1 100644
  
  AC_PREREQ(2.63)
 -AC_INIT(openvswitch, 2.16.0, bugs@openvswitch.org)
-+AC_INIT(openvswitch, 2.16.3, bugs@openvswitch.org)
++AC_INIT(openvswitch, 2.16.4, bugs@openvswitch.org)
  AC_CONFIG_SRCDIR([datapath/datapath.c])
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_AUX_DIR([build-aux])
@@ -637,15 +652,21 @@ index 4cce92f66c..bc18c56b81 100644
  #define nf_conntrack_in rpl_nf_conntrack_in
  #endif /* HAVE_NF_CONNTRACK_IN_TAKES_NF_HOOK_STATE */
 diff --git a/debian/changelog b/debian/changelog
-index 239d210b96..9fa140c6ff 100644
+index 239d210b96..4d23dbc4ec 100644
 --- a/debian/changelog
 +++ b/debian/changelog
-@@ -1,3 +1,21 @@
+@@ -1,3 +1,27 @@
++openvswitch (2.16.4-1) unstable; urgency=low
++   [ Open vSwitch team ]
++   * New upstream version
++
++ -- Open vSwitch team <dev@openvswitch.org>  Fri, 08 Apr 2022 14:57:43 +0200
++
 +openvswitch (2.16.3-1) unstable; urgency=low
 +   [ Open vSwitch team ]
 +   * New upstream version
 +
-+ -- Open vSwitch team <dev@openvswitch.org>  Fri, 17 Dec 2021 22:14:03 +0100
++ -- Open vSwitch team <dev@openvswitch.org>  Fri, 08 Apr 2022 14:57:43 +0200
 +
 +openvswitch (2.16.2-1) unstable; urgency=low
 +   [ Open vSwitch team ]
diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec
index cb9d466..42788d8 100644
--- a/SPECS/openvswitch2.16.spec
+++ b/SPECS/openvswitch2.16.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.16.0
-Release: 67%{?dist}
+Release: 68%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -699,6 +699,14 @@ exit 0
 %endif
 
 %changelog
+* Fri Apr 08 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-68
+- Merging upstream branch-2.16 [RH git: 2ee98fa0ff]
+    Commit list:
+    be8b35fddf Prepare for 2.16.4.
+    d8639f81c1 Set release date for 2.16.3.
+    71a5a38c83 NEWS: Highlight libopenvswitch API change caused by UB fixes.
+
+
 * Wed Apr 06 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-67
 - Merging upstream branch-2.16 [RH git: 4936a7194b]
     Commit list: