diff --git a/package/base-files/files/etc/uci-defaults/15_migrate-time-zonename b/package/base-files/files/etc/uci-defaults/15_migrate-time-zonename
new file mode 100644
index 0000000000..1ac93ea552
--- /dev/null
+++ b/package/base-files/files/etc/uci-defaults/15_migrate-time-zonename
@@ -0,0 +1,6 @@
+zonename="$(uci -q get system.@system[0].zonename)"
+case "$zonename" in
+        *[[:space:]]*) uci set system.@system[0].zonename="${zonename// /_}" ;;
+esac
+
+exit 0