diff --git a/cmd_parser.c b/cmd_parser.c
index 21ff7a8..f1f7c28 100644
--- a/cmd_parser.c
+++ b/cmd_parser.c
@@ -1524,6 +1524,18 @@ void cmd_parser(void) __banked
 				igmp_show();
 			else
 				igmp_setup();  // Reverts to default with IP-MC being flooded
+		} else if (cmd_compare(0, "hostname")) {
+			/* hostname <text>: rest of the line, sanitized to JSON-safe
+			 * printable ASCII (<=23 chars), stored in the shared hostname. */
+			__xdata uint8_t *hp = &cmd_buffer[cmd_words_b[1]];
+			uint8_t hn = 0;
+			if (cmd_words_len >= 2)
+				while (hn < 23 && hp[hn] && hp[hn] != '\r' && hp[hn] != '\n') {
+					hostname[hn] = (hp[hn] < 0x20 || hp[hn] > 0x7e
+						|| hp[hn] == '"' || hp[hn] == '\\') ? '.' : hp[hn];
+					hn++;
+				}
+			hostname[hn] = 0;
 		} else if (cmd_compare(0, "stp")) {
 			if (cmd_compare(1, "on")) {
 				print_string("STP enabled\n");
diff --git a/html/config.js b/html/config.js
index 6efa283..8af3fba 100644
--- a/html/config.js
+++ b/html/config.js
@@ -25,6 +25,7 @@ const conf_cmds = [
   /^igmp\s+(on|off)$/,
   /^mtu\s+\d{1,2}\s+\d+$/,
   /^bw\s+(in|out)\s+\d{1,2}\s+\S+$/,
+  /^hostname\s+.{1,23}$/,
 ];
 const conf_overwrite = [
   /^ip\b/,
@@ -49,6 +50,7 @@ const conf_overwrite = [
   /^igmp\b/,
   /^mtu\s+\d{1,2}\b/,
   /^bw\s+(in|out)\s+\d{1,2}\b/,
+  /^hostname\b/,
 ];
 
 function parseConf(s){
diff --git a/html/i18n.js b/html/i18n.js
index bab49dc..676e9af 100644
--- a/html/i18n.js
+++ b/html/i18n.js
@@ -138,6 +138,8 @@ var LANG = {
     sys_tab_console: 'Console',
     sys_heading: 'System Settings',
     sys_ip: 'IP address:',
+    sys_hostname: 'Hostname:',
+    sys_apply: 'Apply',
     sys_netmask: 'Netmask:',
     sys_gateway: 'Gateway:',
     sys_language: 'Language:',
@@ -317,6 +319,8 @@ var LANG = {
     sys_tab_console: 'コンソール',
     sys_heading: 'システム設定',
     sys_ip: 'IP アドレス:',
+    sys_hostname: 'ホスト名:',
+    sys_apply: '適用',
     sys_netmask: 'ネットマスク:',
     sys_gateway: 'ゲートウェイ:',
     sys_language: '言語:',
@@ -496,6 +500,8 @@ var LANG = {
     sys_tab_console: '控制台',
     sys_heading: '系统设置',
     sys_ip: 'IP 地址:',
+    sys_hostname: '主机名:',
+    sys_apply: '应用',
     sys_netmask: '子网掩码:',
     sys_gateway: '网关:',
     sys_language: '语言:',
diff --git a/html/system.html b/html/system.html
index d1c908a..36369fe 100644
--- a/html/system.html
+++ b/html/system.html
@@ -25,6 +25,11 @@
 
     <div id="system-tab" class="tab-content active">
       <h1 data-i18n="sys_heading">System Settings</h1>
+      <div class="row">
+        <div class="lcol"> <label for="hostname" data-i18n="sys_hostname">Hostname:</label></div>
+        <div class="rcol"> <input id="hostname" type="text" maxlength="23" size="20"/>
+          <button onclick="hostSub()" data-i18n="sys_apply">Apply</button></div>
+      </div>
       <div class="row">
         <div class="lcol"> <label for="ip" data-i18n="sys_ip">IP address:</label></div>
         <div class="rcol"> <input id="ip" class="ip" type="text" minlength="7" maxlength="15" size="15"/></div>
diff --git a/html/system.js b/html/system.js
index 091ff61..4c8aa86 100644
--- a/html/system.js
+++ b/html/system.js
@@ -48,6 +48,14 @@ async function cmdSub() {
 }
 
 
+async function hostSub() {
+  const h = document.getElementById("hostname").value;
+  try { await fetch('/cmd', { method: 'POST', body: "hostname " + h }); }
+  catch(err) { console.error(`Error: ${err}`); }
+  fetchIP();
+}
+
+
 async function sendConfig(c) {
   if (isSaving) return;
   isSaving = true;
@@ -123,6 +131,7 @@ function fetchIP() {
       document.getElementById("ip").value=s.ip_address;
       document.getElementById("netmask").value=s.ip_netmask;
       document.getElementById("gw").value=s.ip_gateway;
+      if (document.getElementById("hostname")) document.getElementById("hostname").value = s.hostname || "";
       clearInterval(systemInterval);
       // Fetch and populate the config textbox
       fetchConfig().then((configText) => {
diff --git a/httpd/page_impl.c b/httpd/page_impl.c
index 7ca29e4..223e5d5 100644
--- a/httpd/page_impl.c
+++ b/httpd/page_impl.c
@@ -252,6 +252,12 @@ void send_basic_info(void)
 	byte_to_html(uip_ethaddr.addr[3]); char_to_html(':');
 	byte_to_html(uip_ethaddr.addr[4]); char_to_html(':');
 	byte_to_html(uip_ethaddr.addr[5]);
+	slen += strtox(outbuf + slen, "\",\"hostname\":\"");
+	{
+		__xdata char *hp = hostname;	/* sanitized on ingest, emit verbatim */
+		while (*hp)
+			char_to_html(*hp++);
+	}
 	slen += strtox(outbuf + slen, "\",\"sw_ver\":\"");
 	slen += strtox(outbuf + slen, VERSION_SW);
 	slen += strtox(outbuf + slen, "\",\"build_date\":\"");
diff --git a/rtl837x_common.h b/rtl837x_common.h
index 9aa9af4..66df88a 100644
--- a/rtl837x_common.h
+++ b/rtl837x_common.h
@@ -115,6 +115,11 @@ struct flash_region_t {
 
 extern __xdata char port_names[9][PORT_NAME_SIZE];
 
+/* System hostname (device identity). Set via `hostname <text>` and the System
+ * Settings page, reported in /information.json. Other modules (e.g. LLDP, which
+ * advertises it as the System Name TLV) read it from here. */
+extern __xdata char hostname[24];
+
 extern __xdata uint8_t uip_buf[UIP_CONF_BUFFER_SIZE+2];
 extern __xdata struct uip_eth_addr uip_ethaddr;
 
diff --git a/rtlplayground.c b/rtlplayground.c
index 30b15d8..4886848 100644
--- a/rtlplayground.c
+++ b/rtlplayground.c
@@ -120,6 +120,7 @@ __xdata uint16_t management_vlan;
 __xdata uint8_t tx_seq;
 
 __xdata uint8_t stpEnabled;
+__xdata char hostname[24];	/* device hostname, default set at boot, see rtl837x_common.h */
 
 __code uint16_t bit_mask[16] = {
 	0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
@@ -2145,6 +2146,7 @@ void main(void)
 	vlan_setup();
 	port_l2_setup();
 	igmp_setup();
+	strcpy((__xdata uint8_t *)hostname, "RTLPlayground");	/* default until "hostname ..." replay */
 	bandwidth_setup();
 	uip_init();
 	uip_arp_init();