diff --git a/board/common/rootfs/etc/motd b/board/common/rootfs/etc/motd
new file mode 100644
index 00000000..8162a149
--- /dev/null
+++ b/board/common/rootfs/etc/motd
@@ -0,0 +1,4 @@
+.-------.
+|  . .  | Infix -- a Network Operating System
+|-. v .-| https://kernelkit.github.io
+'-'---'-'
\ No newline at end of file
diff --git a/src/confd/bin/Makefile.am b/src/confd/bin/Makefile.am
index eeecba4a..134fd6b2 100644
--- a/src/confd/bin/Makefile.am
+++ b/src/confd/bin/Makefile.am
@@ -1,2 +1,2 @@
 pkglibexec_SCRIPTS  = bootstrap error load \
-		      gen-hostkeys gen-admin-auth gen-hostname gen-interfaces
+		      gen-hostkeys gen-admin-auth gen-hostname gen-interfaces gen-motd
diff --git a/src/confd/bin/bootstrap b/src/confd/bin/bootstrap
index b449dd60..299a40de 100755
--- a/src/confd/bin/bootstrap
+++ b/src/confd/bin/bootstrap
@@ -97,6 +97,7 @@ factory()
 
     # Create an overlay for /etc/hostname to change the default in an br2-external
     gen-hostname                                            >"$FACTORY_D/20-hostname.json"
+    gen-motd                                                >"$FACTORY_D/20-motd.json"
     # shellcheck disable=SC2086
     gen-interfaces $GEN_IFACE_OPTS                          >"$FACTORY_D/20-interfaces.json"
 
diff --git a/src/confd/bin/gen-motd b/src/confd/bin/gen-motd
new file mode 100644
index 00000000..e73f22f1
--- /dev/null
+++ b/src/confd/bin/gen-motd
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ -f /etc/motd ]; then
+    cat <<EOF
+{
+  "ietf-system:system": {
+    "infix-system:motd": "$(sed ':a;N;$!ba;s/\n/\\n/g;s/\t/\\t/g' /etc/motd)"
+  }
+}
+EOF
+else
+    echo "{}"
+fi