diff --git a/openair2/ENB_APP/CONTROL_MODULES/S1AP/flexran_agent_s1ap.c b/openair2/ENB_APP/CONTROL_MODULES/S1AP/flexran_agent_s1ap.c
index d5fc5627a0..c2d7cb9e55 100644
--- a/openair2/ENB_APP/CONTROL_MODULES/S1AP/flexran_agent_s1ap.c
+++ b/openair2/ENB_APP/CONTROL_MODULES/S1AP/flexran_agent_s1ap.c
@@ -158,6 +158,30 @@ void flexran_agent_handle_mme_update(mid_t mod_id,
   }
 }
 
+void flexran_agent_handle_plmn_update(mid_t mod_id,
+                                      int CC_id,
+                                      size_t n_plmn,
+                                      Protocol__FlexPlmn **plmn_id) {
+  if (n_plmn < 1 || n_plmn > 6) {
+    LOG_E(FLEXRAN_AGENT, "cannot handle %lu PLMNs\n", n_plmn);
+    return;
+  }
+
+  /* We assume the controller has checked all the parameters within each
+   * plmn_id */
+  int rc = flexran_set_new_plmn_id(mod_id, CC_id, n_plmn, plmn_id);
+  if (rc == 0) {
+    LOG_I(FLEXRAN_AGENT, "set %lu new PLMNs:\n", n_plmn);
+    for (int i = 0; i < (int)n_plmn; ++i)
+      LOG_I(FLEXRAN_AGENT, "    MCC %d MNC %d MNC length %d\n",
+            plmn_id[i]->mcc, plmn_id[i]->mnc, plmn_id[0]->mnc_length);
+  } else {
+    LOG_W(FLEXRAN_AGENT,
+          "could not set new PLMN configuration: flexran_set_new_plmn_id() returned %d\n",
+          rc);
+  }
+}
+
 int flexran_agent_register_s1ap_xface(mid_t mod_id) {
   if (agent_s1ap_xface[mod_id]) {
     LOG_E(FLEXRAN_AGENT, "S1AP agent CM for eNB %d is already registered\n", mod_id);
diff --git a/openair2/ENB_APP/CONTROL_MODULES/S1AP/flexran_agent_s1ap.h b/openair2/ENB_APP/CONTROL_MODULES/S1AP/flexran_agent_s1ap.h
index 54ea2926a8..006eaa1d3c 100644
--- a/openair2/ENB_APP/CONTROL_MODULES/S1AP/flexran_agent_s1ap.h
+++ b/openair2/ENB_APP/CONTROL_MODULES/S1AP/flexran_agent_s1ap.h
@@ -65,6 +65,12 @@ void flexran_agent_handle_mme_update(mid_t mod_id,
                                      size_t n_mme,
                                      Protocol__FlexS1apMme **mme);
 
+/* Set a new PLMN configuration */
+void flexran_agent_handle_plmn_update(mid_t mod_id,
+                                      int CC_id,
+                                      size_t n_plmn,
+                                      Protocol__FlexPlmn **plmn_id);
+
 /* Register technology specific interface callbacks */
 int flexran_agent_register_s1ap_xface(mid_t mod_id);
 
diff --git a/openair2/ENB_APP/flexran_agent_common.c b/openair2/ENB_APP/flexran_agent_common.c
index ec0b780a3a..e77b2fb386 100644
--- a/openair2/ENB_APP/flexran_agent_common.c
+++ b/openair2/ENB_APP/flexran_agent_common.c
@@ -915,6 +915,12 @@ int flexran_agent_handle_enb_config_reply(mid_t mod_id, const void *params, Prot
       if (rc < 0)
         LOG_E(FLEXRAN_AGENT, "Error in configuring X2 handover controlled by network");
     }
+    if (flexran_agent_get_rrc_xface(mod_id) && enb_config->cell_config[0]->n_plmn_id > 0) {
+      flexran_agent_handle_plmn_update(mod_id,
+                                       0,
+                                       enb_config->cell_config[0]->n_plmn_id,
+                                       enb_config->cell_config[0]->plmn_id);
+    }
   }
 
   if (flexran_agent_get_s1ap_xface(mod_id) && enb_config->s1ap) {
diff --git a/openair2/ENB_APP/flexran_agent_ran_api.c b/openair2/ENB_APP/flexran_agent_ran_api.c
index 3306dfe61b..0fcc51782e 100644
--- a/openair2/ENB_APP/flexran_agent_ran_api.c
+++ b/openair2/ENB_APP/flexran_agent_ran_api.c
@@ -3724,6 +3724,77 @@ int flexran_remove_s1ap_mme(mid_t mod_id, size_t n_mme, char **mme_ipv4) {
   return 0;
 }
 
+int flexran_set_new_plmn_id(mid_t mod_id, int CC_id, size_t n_plmn, Protocol__FlexPlmn **plmn_id) {
+  if (!rrc_is_present(mod_id))
+    return -1;
+  s1ap_eNB_instance_t *s1ap = s1ap_eNB_get_instance(mod_id);
+  if (!s1ap)
+    return -2;
+
+  eNB_RRC_INST *rrc = RC.rrc[CC_id];
+  RrcConfigurationReq *conf = &rrc->configuration;
+
+  uint8_t num_plmn_old = conf->num_plmn;
+  uint16_t mcc[PLMN_LIST_MAX_SIZE];
+  uint16_t mnc[PLMN_LIST_MAX_SIZE];
+  uint8_t mnc_digit_length[PLMN_LIST_MAX_SIZE];
+  for (int i = 0; i < num_plmn_old; ++i) {
+    mcc[i] = conf->mcc[i];
+    mnc[i] = conf->mnc[i];
+    mnc_digit_length[i] = conf->mnc_digit_length[i];
+  }
+
+  conf->num_plmn = (uint8_t) n_plmn;
+  for (int i = 0; i < conf->num_plmn; ++i) {
+    conf->mcc[i] = plmn_id[i]->mcc;
+    conf->mnc[i] = plmn_id[i]->mnc;
+    conf->mnc_digit_length[i] = plmn_id[i]->mnc_length;
+  }
+
+  rrc_eNB_carrier_data_t *carrier = &rrc->carrier[CC_id];
+  extern uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
+                         int Mod_id,
+                         int CC_id,
+                         BOOLEAN_t brOption,
+                         RrcConfigurationReq *configuration);
+  carrier->sizeof_SIB1 = do_SIB1(carrier, mod_id, CC_id, FALSE, conf);
+  if (carrier->sizeof_SIB1 < 0)
+    return -1337; /* SIB1 encoding failed, hell will probably break loose */
+
+  s1ap->num_plmn = (uint8_t) n_plmn;
+  for (int i = 0; i < conf->num_plmn; ++i) {
+    s1ap->mcc[i] = plmn_id[i]->mcc;
+    s1ap->mnc[i] = plmn_id[i]->mnc;
+    s1ap->mnc_digit_length[i] = plmn_id[i]->mnc_length;
+  }
+
+  int bpn_failed = 0;
+  struct s1ap_eNB_mme_data_s *mme = NULL;
+  RB_FOREACH(mme, s1ap_mme_map, &s1ap->s1ap_mme_head) {
+    for (int i = 0; i < mme->broadcast_plmn_num; ++i) {
+      /* search the new index and update. If we don't find, we count this using
+       * bpn_failed to now how many broadcast_plmns could not be updated */
+      int idx = mme->broadcast_plmn_index[i];
+      int omcc = mcc[idx];
+      int omnc = mnc[idx];
+      int omncl = mnc_digit_length[idx];
+      int j = 0;
+      for (j = 0; j < s1ap->num_plmn; ++j) {
+        if (s1ap->mcc[j] == omcc
+            && s1ap->mnc[j] == omnc
+            && s1ap->mnc_digit_length[j] == omncl) {
+          mme->broadcast_plmn_index[i] = j;
+          break;
+        }
+      }
+      if (j == s1ap->num_plmn) /* could not find the old PLMN in the new ones */
+        bpn_failed++;
+    }
+  }
+  if (bpn_failed > 0)
+    return -10000 - bpn_failed;
+  return 0;
+}
 
 int flexran_get_s1ap_ue(mid_t mod_id, rnti_t rnti, Protocol__FlexS1apUe * ue_conf){
   if (!rrc_is_present(mod_id)) return -1;
diff --git a/openair2/ENB_APP/flexran_agent_ran_api.h b/openair2/ENB_APP/flexran_agent_ran_api.h
index 3c2803d663..9d1bfb9d3e 100644
--- a/openair2/ENB_APP/flexran_agent_ran_api.h
+++ b/openair2/ENB_APP/flexran_agent_ran_api.h
@@ -838,6 +838,9 @@ int flexran_add_s1ap_mme(mid_t mod_id, size_t n_mme, char **mme_ipv4);
 /* Remove MMEs and and cut SCTP to MME */
 int flexran_remove_s1ap_mme(mid_t mod_id, size_t n_mme, char **mme_ipv4);
 
+/* Set a new PLMN configuration */
+int flexran_set_new_plmn_id(mid_t mod_id, int CC_id, size_t n_plmn, Protocol__FlexPlmn **plmn_id);
+
 /********************* general information *****************/
 /* get an ID for this BS (or part of a BS) */
 uint64_t flexran_get_bs_id(mid_t mod_id);