diff --git a/SOURCES/openvswitch-2.11.3.patch b/SOURCES/openvswitch-2.11.3.patch
index a890e9c..5a854c3 100644
--- a/SOURCES/openvswitch-2.11.3.patch
+++ b/SOURCES/openvswitch-2.11.3.patch
@@ -19660,7 +19660,7 @@ index 9f78e87f65..11403b1009 100644
  Sets the \fItable\fR within \fIdb\fR that will be excluded from synchronization.
  This overrides the \fB\-\-sync\-exclude-tables\fR command-line option.
 diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
-index 65a47a41d3..284ed05519 100644
+index 65a47a41d3..d3ed043db0 100644
 --- a/ovsdb/ovsdb-server.c
 +++ b/ovsdb/ovsdb-server.c
 @@ -86,6 +86,7 @@ static unixctl_cb_func ovsdb_server_set_active_ovsdb_server;
@@ -19754,7 +19754,36 @@ index 65a47a41d3..284ed05519 100644
              if (error) {
                  break;
              }
-@@ -1307,7 +1317,8 @@ ovsdb_server_connect_active_ovsdb_server(struct unixctl_conn *conn,
+@@ -624,8 +634,6 @@ add_db(struct server_config *config, struct db *db)
+ static struct ovsdb_error * OVS_WARN_UNUSED_RESULT
+ open_db(struct server_config *config, const char *filename)
+ {
+-    struct db *db;
+-
+     /* If we know that the file is already open, return a good error message.
+      * Otherwise, if the file is open, we'll fail later on with a harder to
+      * interpret file locking error. */
+@@ -640,9 +648,6 @@ open_db(struct server_config *config, const char *filename)
+         return error;
+     }
+ 
+-    db = xzalloc(sizeof *db);
+-    db->filename = xstrdup(filename);
+-
+     struct ovsdb_schema *schema;
+     if (ovsdb_storage_is_clustered(storage)) {
+         schema = NULL;
+@@ -655,6 +660,9 @@ open_db(struct server_config *config, const char *filename)
+         }
+         ovs_assert(schema && !txn_json);
+     }
++
++    struct db *db = xzalloc(sizeof *db);
++    db->filename = xstrdup(filename);
+     db->db = ovsdb_create(schema, storage);
+     ovsdb_jsonrpc_server_add_db(config->jsonrpc, db->db);
+ 
+@@ -1307,7 +1315,8 @@ ovsdb_server_connect_active_ovsdb_server(struct unixctl_conn *conn,
          const struct uuid *server_uuid;
          server_uuid = ovsdb_jsonrpc_server_get_uuid(config->jsonrpc);
          ovsdb_replication_init(*config->sync_from, *config->sync_exclude,
@@ -19764,7 +19793,7 @@ index 65a47a41d3..284ed05519 100644
          if (!*config->is_backup) {
              *config->is_backup = true;
              save_config(config);
-@@ -1330,6 +1341,28 @@ ovsdb_server_disconnect_active_ovsdb_server(struct unixctl_conn *conn,
+@@ -1330,6 +1339,28 @@ ovsdb_server_disconnect_active_ovsdb_server(struct unixctl_conn *conn,
      unixctl_command_reply(conn, NULL);
  }
  
@@ -19793,7 +19822,7 @@ index 65a47a41d3..284ed05519 100644
  static void
  ovsdb_server_set_sync_exclude_tables(struct unixctl_conn *conn,
                                       int argc OVS_UNUSED,
-@@ -1347,7 +1380,8 @@ ovsdb_server_set_sync_exclude_tables(struct unixctl_conn *conn,
+@@ -1347,7 +1378,8 @@ ovsdb_server_set_sync_exclude_tables(struct unixctl_conn *conn,
              const struct uuid *server_uuid;
              server_uuid = ovsdb_jsonrpc_server_get_uuid(config->jsonrpc);
              ovsdb_replication_init(*config->sync_from, *config->sync_exclude,
@@ -19803,7 +19832,7 @@ index 65a47a41d3..284ed05519 100644
          }
          err = set_blacklist_tables(argv[1], false);
      }
-@@ -1558,7 +1592,8 @@ ovsdb_server_add_database(struct unixctl_conn *conn, int argc OVS_UNUSED,
+@@ -1558,7 +1590,8 @@ ovsdb_server_add_database(struct unixctl_conn *conn, int argc OVS_UNUSED,
              const struct uuid *server_uuid;
              server_uuid = ovsdb_jsonrpc_server_get_uuid(config->jsonrpc);
              ovsdb_replication_init(*config->sync_from, *config->sync_exclude,
@@ -19813,7 +19842,7 @@ index 65a47a41d3..284ed05519 100644
          }
          unixctl_command_reply(conn, NULL);
      } else {
-@@ -1580,7 +1615,8 @@ remove_db(struct server_config *config, struct shash_node *node, char *comment)
+@@ -1580,7 +1613,8 @@ remove_db(struct server_config *config, struct shash_node *node, char *comment)
          const struct uuid *server_uuid;
          server_uuid = ovsdb_jsonrpc_server_get_uuid(config->jsonrpc);
          ovsdb_replication_init(*config->sync_from, *config->sync_exclude,
diff --git a/SPECS/openvswitch2.11.spec b/SPECS/openvswitch2.11.spec
index e0547d5..7b59f26 100644
--- a/SPECS/openvswitch2.11.spec
+++ b/SPECS/openvswitch2.11.spec
@@ -66,7 +66,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.11.3
-Release: 89%{?dist}
+Release: 90%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -745,6 +745,12 @@ exit 0
 
 
 %changelog
+* Sat Jul 17 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.11.3-90
+- Merging upstream branch-2.11 [RH gerrit: aac87adaf1]
+    Commit list:
+    40682157c9 ovsdb-server: Fix memleak when failing to read storage.
+
+
 * Mon May 10 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.11.3-89
 - Merging upstream branch-2.11 [RH gerrit: 1d6f0bd658]
     Commit list: