diff --git a/libs/web/root/etc/config/luci b/libs/web/root/etc/config/luci
index 43c484a8fd..b02fb51f50 100644
--- a/libs/web/root/etc/config/luci
+++ b/libs/web/root/etc/config/luci
@@ -44,4 +44,3 @@ config internal template
 	option compiledir "/tmp/.lucitplcache"
 		
 config internal themes
-	option OpenWRT "/luci-static/openwrt.org"
diff --git a/themes/openwrt.org/ipkg/postinst b/themes/openwrt.org/ipkg/postinst
new file mode 100755
index 0000000000..48ea52273f
--- /dev/null
+++ b/themes/openwrt.org/ipkg/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -n "${IPKG_INSTROOT}" ] || {
+	( . /etc/uci-defaults/luci-theme-openwrt ) &&	rm -f /etc/uci-defaults/luci-theme-openwrt
+}
diff --git a/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt b/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt
new file mode 100755
index 0000000000..a8bef6c92d
--- /dev/null
+++ b/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt
@@ -0,0 +1,6 @@
+#!/bin/sh
+uci batch <<-EOF
+	set luci.themes.OpenWRT=/luci-static/openwrt.org
+        commit luci
+EOF
+