diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox
index f331a0015..412c98289 100755
--- a/tutorial/ovs-sandbox
+++ b/tutorial/ovs-sandbox
@@ -356,6 +356,7 @@ rungdb $gdb_vswitchd $gdb_vswitchd_ex ovs-vswitchd --detach --no-chdir --pidfile
if $ovn; then
ovs-vsctl set open . external-ids:system-id=56b18105-5706-46ef-80c4-ff20979ab068
+ ovs-vsctl set open . external-ids:hostname=sandbox
ovs-vsctl set open . external-ids:ovn-remote=unix:"$sandbox"/ovnsb_db.sock
ovs-vsctl set open . external-ids:ovn-encap-type=geneve
ovs-vsctl set open . external-ids:ovn-encap-ip=127.0.0.1
diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index 7354a473f..d2872ef82 100755
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -108,6 +108,8 @@ set_system_ids () {
esac
set "$@" external-ids:system-id="\"$SYSTEM_ID\""
+ set "$@" external-ids:hostname="\"$(hostname)\""
+
if test X"$SYSTEM_TYPE" != X; then
set "$@" system-type="\"$SYSTEM_TYPE\""
else
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 09985845a..7d6976f2f 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -72,6 +72,10 @@
host as displayed by xe host-list
.
+
+ The hostname for the host running Open vSwitch.
+
+