diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7935050e7..120a17cfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - **breaking:** alias: display an error with `/alias add` or `/alias addcompletion` when the alias already exists, add options `addreplace` and `addreplacecompletion` in command `/alias` ([#2095](https://github.com/weechat/weechat/issues/2095))
 - core: add option `addreplace` in commands `/bar` and `/proxy` ([#2095](https://github.com/weechat/weechat/issues/2095))
 - irc: add option `addreplace` in commands `/ignore`, `/notify` and `/server` ([#2095](https://github.com/weechat/weechat/issues/2095))
+- relay: add option `addreplace` in command `/relay` ([#2095](https://github.com/weechat/weechat/issues/2095))
 - relay: enable websocket extension "permessage-deflate" with "api" relay only ([#1549](https://github.com/weechat/weechat/issues/1549))
 
 ### Added
diff --git a/po/cs.po b/po/cs.po
index fe92fd496..71b02073d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14095,6 +14095,14 @@ msgstr "%s%s:  nemohu se \"navázat\" na port %d (%s): chyba %d %s"
 msgid "No server for relay"
 msgstr "Žádný server pro přesměrování"
 
+#, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr "%s%s: chyba: přesměrování pro\"%s\" již existuje"
+
+#, fuzzy, c-format
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "%s: přesměrování \"%s\" (port %s) přidáno"
+
 #, fuzzy, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "%s: přesměrování \"%s\" (port %s) přidáno"
@@ -14196,8 +14204,8 @@ msgstr "ovládání přesměrování"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 #, fuzzy
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 "list|listfull|listrelay || add <protocol.name> <port> || del <protocol.name> "
 "|| raw"
@@ -14214,6 +14222,11 @@ msgstr ""
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr ""
 
+#, fuzzy
+#| msgid "%s%s: error adding notification"
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr "%s%s: chyba při přidávání notifikace"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr ""
 
@@ -14434,10 +14447,6 @@ msgstr "%s%s: chyba: neznámý protokol \"%s\""
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: chyba: neznámý protokol \"%s\""
 
-#, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr "%s%s: chyba: přesměrování pro\"%s\" již existuje"
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/de.po b/po/de.po
index afdafe429..2a8ace414 100644
--- a/po/de.po
+++ b/po/de.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
 "PO-Revision-Date: 2024-05-31 20:32+0200\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -15529,6 +15529,15 @@ msgstr "  %s %s%s%s, Relay: %s%s%s, %s, gestartet am: %s"
 msgid "No server for relay"
 msgstr "Keinen Server für Relay"
 
+#, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr "%s%s: Fehler: Relay für \"%s\" existiert bereits"
+
+#, fuzzy, c-format
+#| msgid "%s: relay \"%s\" (%s: %s) added"
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "%s: Relay \"%s\" (%s: %s) hinzugefügt"
+
 #, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "%s: Relay \"%s\" (%s: %s) hinzugefügt"
@@ -15617,9 +15626,13 @@ msgid "relay control"
 msgstr "Relay-Kontrolle"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
+#| "stop <name> || raw || tlscertkey"
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 "list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
 "stop <name> || raw || tlscertkey"
@@ -15638,6 +15651,13 @@ msgstr "raw[listrelay]: Auflistung der Relays (Name und Port)"
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr "raw[add]: fügt ein Relay (lauscht an Port/Pfad)"
 
+#, fuzzy
+#| msgid "raw[addreplace]: add or replace an existing filter"
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr ""
+"raw[addreplace]: neuen Filter anlegen oder einen schon existierenden Filter "
+"ersetzen"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr "raw[del]: entfernt Relay (Clients bleiben verbunden)"
 
@@ -15853,10 +15873,6 @@ msgstr "%s%s: Unbekanntes Protokoll \"%s\""
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: Fehler: dieser Name ist für das Protokoll \"%s\" nicht erlaubt"
 
-#, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr "%s%s: Fehler: Relay für \"%s\" existiert bereits"
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/es.po b/po/es.po
index 44e5807e3..8a30c39c1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14423,6 +14423,14 @@ msgstr "  puerto %s%d%s, repetidor: %s%s%s, %s, iniciado en: %s"
 msgid "No server for relay"
 msgstr "Ningún servidor para retransmitir"
 
+#, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr "%s%s: error: repetidor para \"%s\" ya existe"
+
+#, fuzzy, c-format
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "%s: repetidor \"%s\" (puerto %s) agregado"
+
 #, fuzzy, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "%s: repetidor \"%s\" (puerto %s) agregado"
@@ -14522,8 +14530,8 @@ msgstr "control de retransmisión"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 #, fuzzy
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 "list|listfull|listrelay || add <protocolo.nombre> <puerto> || del <protocolo."
 "nombre> || raw || sslcertkey"
@@ -14540,6 +14548,11 @@ msgstr ""
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr ""
 
+#, fuzzy
+#| msgid "%s%s: error adding notification"
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr "%s%s: error al agregar la notificación"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr ""
 
@@ -14756,10 +14769,6 @@ msgstr "%s%s: error: protocolo desconocido \"%s\""
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: error: nombre no es permitido para el protocolo \"%s\""
 
-#, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr "%s%s: error: repetidor para \"%s\" ya existe"
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/fr.po b/po/fr.po
index 5fc79c573..bddee3363 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
-"PO-Revision-Date: 2024-06-09 15:57+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
+"PO-Revision-Date: 2024-06-09 16:22+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -15174,6 +15174,14 @@ msgstr "  %s %s%s%s, relai : %s%s%s, %s, démarré le : %s"
 msgid "No server for relay"
 msgstr "Pas de serveur pour le relai"
 
+#, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr "%s%s : erreur : le relai pour \"%s\" existe déjà"
+
+#, c-format
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "%s : relai \"%s\" (%s : %s) mis à jour"
+
 #, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "%s : relai \"%s\" (%s : %s) ajouté"
@@ -15261,11 +15269,11 @@ msgstr "contrôle du relai"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
-"list|listfull|listrelay || add <nom> <port>|<chemin> || del|start|restart|"
-"stop <nom> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <nom> <port>|<chemin> || del|start|"
+"restart|stop <nom> || raw || tlscertkey"
 
 msgid "raw[list]: list relay clients (only active relays)"
 msgstr "raw[list] : lister les clients pour le relai"
@@ -15279,6 +15287,9 @@ msgstr "raw[listrelay] : lister les relais (nom et port)"
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr "raw[add] : ajouter un relai (écouter sur un port)"
 
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr "raw[addreplace] : ajouter ou remplacer un relai existant"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr "raw[del] : supprimer un relai (les clients restent connectés)"
 
@@ -15494,10 +15505,6 @@ msgstr "%s%s : erreur : protocole \"%s\" inconnu"
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s : erreur : le nom est interdit pour le protocole \"%s\""
 
-#, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr "%s%s : erreur : le relai pour \"%s\" existe déjà"
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/hu.po b/po/hu.po
index d3717eb85..fd1bfa0bc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -13500,6 +13500,14 @@ msgstr "%s%s%s távol: %s\n"
 msgid "No server for relay"
 msgstr "Nincs szerver.\n"
 
+#, fuzzy, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr "%s az ignore már létezik\n"
+
+#, fuzzy, c-format
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "%s a \"%s\" szerver nem található\n"
+
 #, fuzzy, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "%s a \"%s\" szerver nem található\n"
@@ -13588,8 +13596,8 @@ msgstr ""
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 
 msgid "raw[list]: list relay clients (only active relays)"
@@ -13604,6 +13612,10 @@ msgstr ""
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr ""
 
+#, fuzzy
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr "%s nincs elég memória az információs pult üzenethez\n"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr ""
 
@@ -13804,10 +13816,6 @@ msgstr "%s ismeretlen billentyűparancs \"%s\"\n"
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s ismeretlen billentyűparancs \"%s\"\n"
 
-#, fuzzy, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr "%s az ignore már létezik\n"
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/it.po b/po/it.po
index 207e7105a..3f89fdb32 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14441,6 +14441,14 @@ msgstr "  porta %s%d%s, relay: %s%s%s, %s, avviato il: %s"
 msgid "No server for relay"
 msgstr "Nessun server per il relay"
 
+#, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr "%s%s: errore: il relay per \"%s\" esiste già"
+
+#, fuzzy, c-format
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "%s: relay \"%s\" (porta %s) aggiunto"
+
 #, fuzzy, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "%s: relay \"%s\" (porta %s) aggiunto"
@@ -14540,8 +14548,8 @@ msgstr "controllo relay"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 #, fuzzy
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 "list|listfull|listrelay || add [ipv4.][ipv6.][ssl.]<protocollo.nome> <porta> "
 "|| del [ipv4.][ipv6.][ssl.]<protocollo.nome> || raw || sslcertkey"
@@ -14558,6 +14566,11 @@ msgstr ""
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr ""
 
+#, fuzzy
+#| msgid "%s%s: error adding notification"
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr "%s%s: errore nell'aggiunta della notifica"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr ""
 
@@ -14780,10 +14793,6 @@ msgstr "%s%s: errore: protocollo \"%s\" sconosciuto"
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: errore: nome non consentito per il protocollo \"%s\""
 
-#, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr "%s%s: errore: il relay per \"%s\" esiste già"
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/ja.po b/po/ja.po
index 4e27cf849..4bec12f53 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -14868,6 +14868,15 @@ msgstr "  %s %s%s%s、リレー: %s%s%s、%s、開始日時: %s"
 msgid "No server for relay"
 msgstr "リレーするサーバがありません"
 
+#, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr "%s%s: エラー: \"%s\" のリレーは既に存在しています"
+
+#, fuzzy, c-format
+#| msgid "%s: relay \"%s\" (%s: %s) added"
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "%s: リレー \"%s\" (%s: %s) が追加されました"
+
 #, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "%s: リレー \"%s\" (%s: %s) が追加されました"
@@ -14977,8 +14986,8 @@ msgstr "リレー管理"
 #| "list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
 #| "stop <name> || raw || sslcertkey"
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 "list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
 "stop <name> || raw || sslcertkey"
@@ -14995,6 +15004,11 @@ msgstr ""
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr ""
 
+#, fuzzy
+#| msgid "%s%s: error adding notification"
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr "%s%s: 通知の追加中にエラー"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr ""
 
@@ -15221,10 +15235,6 @@ msgstr "%s%s: エラー: 不明なプロトコル \"%s\""
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: エラー: プロトコル \"%s\" では name を使えません"
 
-#, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr "%s%s: エラー: \"%s\" のリレーは既に存在しています"
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/pl.po b/po/pl.po
index 026afdd90..bb7576681 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14779,6 +14779,15 @@ msgstr "  %s %s%s%s, pośrednik:%s%s%s, %s, rozpoczęto: %s"
 msgid "No server for relay"
 msgstr "Brak serwera dla relay"
 
+#, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr "%s%s: błąd: relay dla \"%s\" już istnieje"
+
+#, fuzzy, c-format
+#| msgid "%s: relay \"%s\" (%s: %s) added"
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "%s: pośrednik \"%s\" (%s: %s) dodany"
+
 #, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "%s: pośrednik \"%s\" (%s: %s) dodany"
@@ -14865,9 +14874,13 @@ msgid "relay control"
 msgstr "zarządzanie przesyłaniem"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
+#| "stop <name> || raw || tlscertkey"
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 "list|listfull|listrelay || add <nazwa> <port>|<ścieżka> || del|start|restart|"
 "stop <nazwa> || raw || tlscertkey"
@@ -14884,6 +14897,11 @@ msgstr "raw[listrelay]: wyświetl pośredników (nazwa i port)"
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr "raw[add]: dodaj pośrednika (nasłuchuj na porcie/ścieżce)"
 
+#, fuzzy
+#| msgid "raw[addreplace]: add or replace an existing filter"
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr "raw[addreplace]: dodaj lub zastąp istniejący filtr"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr "raw[del]: usuń pośrednika (klienci zostają połączeni)"
 
@@ -15096,10 +15114,6 @@ msgstr "%s%s: błąd: nieznany protokół \"%s\""
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: błąd: nie jest dozwolona dla protokołu \"%s\""
 
-#, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr "%s%s: błąd: relay dla \"%s\" już istnieje"
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/pt.po b/po/pt.po
index f7d01f5d6..2dfcae892 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -14786,6 +14786,14 @@ msgstr "  porta %s%d%s, relay: %s%s%s, %s, iniciado a: %s"
 msgid "No server for relay"
 msgstr "Nenhum servidor para reencaminhar"
 
+#, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr "%s%s: erro: já existe reencaminhamento de \"%s\""
+
+#, fuzzy, c-format
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "%s: relay \"%s\" (porta %s) adicionado"
+
 #, fuzzy, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "%s: relay \"%s\" (porta %s) adicionado"
@@ -14892,8 +14900,8 @@ msgstr "controlo de reencaminhamento"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 #, fuzzy
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 "list|listfull|listrelay || add <nome> <porta> || del|stop|restart <nome> || "
 "raw || sslcertkey"
@@ -14910,6 +14918,11 @@ msgstr ""
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr ""
 
+#, fuzzy
+#| msgid "%s%s: error adding notification"
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr "%s%s: error ao adicionar a notificação"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr ""
 
@@ -15133,10 +15146,6 @@ msgstr "%s%s: erro: protocolo desconhecido \"%s\""
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: erro: o nome não é permitido no protocolo \"%s\""
 
-#, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr "%s%s: erro: já existe reencaminhamento de \"%s\""
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 54caacff2..ce8bced09 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -13946,6 +13946,14 @@ msgstr "  porta %s%d%s, relay: %s%s, %s, iniciado em: %s"
 msgid "No server for relay"
 msgstr "Nenhuma servidor para relay"
 
+#, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "Todos os filtros foram excluídos"
+
 #, fuzzy, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "Todos os filtros foram excluídos"
@@ -14037,8 +14045,8 @@ msgstr ""
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 
 msgid "raw[list]: list relay clients (only active relays)"
@@ -14053,6 +14061,11 @@ msgstr ""
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr ""
 
+#, fuzzy
+#| msgid "%s%s: failed to add word to personal dictionary"
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr "%s%s: falha ao adicionar palavra no dicionário pessoal"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr ""
 
@@ -14268,10 +14281,6 @@ msgstr "%s%s: erro: protocolo \"%s\" desconhecido"
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: erro: protocolo \"%s\" desconhecido"
 
-#, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr ""
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/ru.po b/po/ru.po
index 89207ee23..39d8c6b85 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -13554,6 +13554,14 @@ msgstr "%s%s%s отсутствует: %s\n"
 msgid "No server for relay"
 msgstr "Нет сервера.\n"
 
+#, fuzzy, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr "%s игнорирование уже существует\n"
+
+#, fuzzy, c-format
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "%s сервер \"%s\" не найден\n"
+
 #, fuzzy, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "%s сервер \"%s\" не найден\n"
@@ -13642,8 +13650,8 @@ msgstr ""
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 
 msgid "raw[list]: list relay clients (only active relays)"
@@ -13658,6 +13666,10 @@ msgstr ""
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr ""
 
+#, fuzzy
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr "%s недостаточно памяти для сообщения в строке информации\n"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr ""
 
@@ -13858,10 +13870,6 @@ msgstr "%s неизвестная функция клавиши \"%s\"\n"
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s неизвестная функция клавиши \"%s\"\n"
 
-#, fuzzy, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr "%s игнорирование уже существует\n"
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/sr.po b/po/sr.po
index 777ad481a..57076c44d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
 "PO-Revision-Date: 2024-05-07 14:00+0400\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14785,6 +14785,15 @@ msgstr "  %s %s%s%s, релеј: %s%s%s, %s, покренуто: %s"
 msgid "No server for relay"
 msgstr "Нема сервера за релеј"
 
+#, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr "%s%s: грешка: релеј за „%s” већ постоји"
+
+#, fuzzy, c-format
+#| msgid "%s: relay \"%s\" (%s: %s) added"
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "%s: релеј „%s” (%s: %s) додато"
+
 #, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "%s: релеј „%s” (%s: %s) додато"
@@ -14871,9 +14880,13 @@ msgid "relay control"
 msgstr "контрола преко релеја"
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
+#, fuzzy
+#| msgid ""
+#| "list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
+#| "stop <name> || raw || tlscertkey"
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 "list|listfull|listrelay || add <име> <порт>|<путања> || del|start|restart|"
 "stop <име> || raw || tlscertkey"
@@ -14890,6 +14903,11 @@ msgstr "raw[listrelay]: испис релеја (име и порт)"
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr "raw[add]: додавање релеја (слуша на порту/путањи)"
 
+#, fuzzy
+#| msgid "raw[addreplace]: add or replace an existing filter"
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr "raw[addreplace]: додаје или замењује постојећи филтер"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr "raw[del]: уклањање релеја (клијенти остају повезани)"
 
@@ -15103,10 +15121,6 @@ msgstr "%s%s: грешка: непознати протокол „%s”"
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: грешка: име није дозвољено за протокол „%s”"
 
-#, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr "%s%s: грешка: релеј за „%s” већ постоји"
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/tr.po b/po/tr.po
index 54298ce6b..57dd75544 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
 "PO-Revision-Date: 2024-04-07 14:50+0200\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -15040,6 +15040,15 @@ msgstr "  %s %s%s%s, iletim: %s%s%s, %s, başlatılma: %s"
 msgid "No server for relay"
 msgstr "İletim için bir sunucu yok"
 
+#, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr "%s%s: Hata: \"%s\" için iletim halihazırda mevcut"
+
+#, fuzzy, c-format
+#| msgid "%s: relay \"%s\" (%s: %s) added"
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr "%s: \"%s\" ileticisi (%s: %s) eklendi"
+
 #, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr "%s: \"%s\" ileticisi (%s: %s) eklendi"
@@ -15149,8 +15158,8 @@ msgstr "iletim denetimi"
 #| "list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
 #| "stop <name> || raw || sslcertkey"
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 "list|listfull|listrelay || add <ad> <kapı>|<yol> || del|start|restart|stop "
 "<ad> || raw || sslcertkey"
@@ -15167,6 +15176,11 @@ msgstr ""
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr ""
 
+#, fuzzy
+#| msgid "%s%s: error adding notification"
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr "%s%s: Bildirim eklerken hata"
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr ""
 
@@ -15402,10 +15416,6 @@ msgstr "%s%s: Hata: Bilinmeyen protokol \"%s\""
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr "%s%s: Hata: \"%s\" protokolü için ada izin verilmiyor"
 
-#, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr "%s%s: Hata: \"%s\" için iletim halihazırda mevcut"
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/po/weechat.pot b/po/weechat.pot
index 1866d8f42..9438ee149 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2024-06-09 15:56+0200\n"
+"POT-Creation-Date: 2024-06-09 16:21+0200\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -12357,6 +12357,14 @@ msgstr ""
 msgid "No server for relay"
 msgstr ""
 
+#, c-format
+msgid "%s%s: error: relay for \"%s\" already exists"
+msgstr ""
+
+#, c-format
+msgid "%s: relay \"%s\" (%s: %s) updated"
+msgstr ""
+
 #, c-format
 msgid "%s: relay \"%s\" (%s: %s) added"
 msgstr ""
@@ -12442,8 +12450,8 @@ msgstr ""
 
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated
 msgid ""
-"list|listfull|listrelay || add <name> <port>|<path> || del|start|restart|"
-"stop <name> || raw || tlscertkey"
+"list|listfull|listrelay || add|addreplace <name> <port>|<path> || del|start|"
+"restart|stop <name> || raw || tlscertkey"
 msgstr ""
 
 msgid "raw[list]: list relay clients (only active relays)"
@@ -12458,6 +12466,9 @@ msgstr ""
 msgid "raw[add]: add a relay (listen on a port/path)"
 msgstr ""
 
+msgid "raw[addreplace]: add or replace an existing relay"
+msgstr ""
+
 msgid "raw[del]: remove a relay (clients remain connected)"
 msgstr ""
 
@@ -12637,10 +12648,6 @@ msgstr ""
 msgid "%s%s: error: name is not allowed for protocol \"%s\""
 msgstr ""
 
-#, c-format
-msgid "%s%s: error: relay for \"%s\" already exists"
-msgstr ""
-
 msgid ""
 "path to a socket file (path is evaluated, see function string_eval_path_home "
 "in plugin API reference)"
diff --git a/src/plugins/relay/relay-command.c b/src/plugins/relay/relay-command.c
index e472d6fb1..be048ebb6 100644
--- a/src/plugins/relay/relay-command.c
+++ b/src/plugins/relay/relay-command.c
@@ -194,7 +194,7 @@ relay_command_relay (const void *pointer, void *data,
     struct t_relay_server *ptr_server;
     struct t_config_option *ptr_option;
     char *path;
-    int unix_socket, rc;
+    int unix_socket, rc, update;
 
     /* make C compiler happy */
     (void) pointer;
@@ -221,9 +221,36 @@ relay_command_relay (const void *pointer, void *data,
             return WEECHAT_RC_OK;
         }
 
-        if (weechat_strcmp (argv[1], "add") == 0)
+        if ((weechat_strcmp (argv[1], "add") == 0)
+            || (weechat_strcmp (argv[1], "addreplace") == 0))
         {
             WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
+            update = 0;
+            ptr_server = relay_server_search (argv[2]);
+            if (ptr_server)
+            {
+                if (weechat_strcmp (argv[1], "addreplace") == 0)
+                {
+                    update = 1;
+                    unix_socket = ptr_server->unix_socket;
+                    relay_server_free (ptr_server);
+                    ptr_option = weechat_config_search_option (
+                        relay_config_file,
+                        (unix_socket) ? relay_config_section_path : relay_config_section_port,
+                        argv[2]);
+                    weechat_config_option_free (ptr_option);
+                }
+                else
+                {
+                    weechat_printf (
+                        NULL,
+                        _("%s%s: error: relay for \"%s\" already exists"),
+                        weechat_prefix ("error"),
+                        RELAY_PLUGIN_NAME,
+                        argv[2]);
+                    return WEECHAT_RC_OK;
+                }
+            }
             relay_server_get_protocol_args (argv[2], NULL, NULL, NULL,
                                             &unix_socket, NULL, NULL);
             rc = relay_config_create_option_port_path (
@@ -234,12 +261,15 @@ relay_command_relay (const void *pointer, void *data,
                 argv_eol[3]);
             if (rc != WEECHAT_CONFIG_OPTION_SET_ERROR)
             {
-                weechat_printf (NULL,
-                                _("%s: relay \"%s\" (%s: %s) added"),
-                                RELAY_PLUGIN_NAME,
-                                argv[2],
-                                (unix_socket) ? _("path") : _("port"),
-                                argv_eol[3]);
+                weechat_printf (
+                    NULL,
+                    (update) ?
+                    _("%s: relay \"%s\" (%s: %s) updated") :
+                    _("%s: relay \"%s\" (%s: %s) added"),
+                    RELAY_PLUGIN_NAME,
+                    argv[2],
+                    (unix_socket) ? _("path") : _("port"),
+                    argv_eol[3]);
             }
             return WEECHAT_RC_OK;
         }
@@ -752,7 +782,7 @@ relay_command_init ()
         N_("relay control"),
         /* TRANSLATORS: only text between angle brackets (eg: "<name>") must be translated */
         N_("list|listfull|listrelay"
-           " || add <name> <port>|<path>"
+           " || add|addreplace <name> <port>|<path>"
            " || del|start|restart|stop <name>"
            " || raw"
            " || tlscertkey"),
@@ -761,6 +791,7 @@ relay_command_init ()
             N_("raw[listfull]: list relay clients (verbose, all relays)"),
             N_("raw[listrelay]: list relays (name and port)"),
             N_("raw[add]: add a relay (listen on a port/path)"),
+            N_("raw[addreplace]: add or replace an existing relay"),
             N_("raw[del]: remove a relay (clients remain connected)"),
             N_("raw[start]: listen on port"),
             N_("raw[restart]: close the server socket and listen again on port "
@@ -815,7 +846,7 @@ relay_command_init ()
         "list %(relay_relays)"
         " || listfull %(relay_relays)"
         " || listrelay"
-        " || add %(relay_protocol_name) %(relay_free_port)"
+        " || add|addreplace %(relay_protocol_name) %(relay_free_port)"
         " || del %(relay_relays)"
         " || start %(relay_relays)"
         " || restart %(relay_relays)"