diff --git a/package/gluon-config-mode/files/etc/init.d/gluon-config-mode b/package/gluon-config-mode/files/etc/init.d/gluon-config-mode
index 2ee6af935412e8d2c8009f8edf8046c065ee12ba..2af5e9539e6802feef8be90bc8c02e1b6acf843b 100755
--- a/package/gluon-config-mode/files/etc/init.d/gluon-config-mode
+++ b/package/gluon-config-mode/files/etc/init.d/gluon-config-mode
@@ -33,9 +33,10 @@ start() {
 		ip link set up dev $config_mode_iface
 
 		/usr/sbin/telnetd -l /lib/gluon/config-mode/ash-login
-
 		/etc/init.d/dropbear start
-		/etc/init.d/uhttpd start
+
+		/usr/sbin/uhttpd -h /lib/gluon/config-mode/www -x /cgi-bin -A 1 -R -p 0.0.0.0:80
+
 		/etc/init.d/led start
 
 		# correctly finish firstboot
diff --git a/package/gluon-config-mode/files/lib/gluon/config-mode/www/cgi-bin/luci b/package/gluon-config-mode/files/lib/gluon/config-mode/www/cgi-bin/luci
new file mode 100755
index 0000000000000000000000000000000000000000..c5c98473469eba6bd6b21879690026bea0758960
--- /dev/null
+++ b/package/gluon-config-mode/files/lib/gluon/config-mode/www/cgi-bin/luci
@@ -0,0 +1,5 @@
+#!/usr/bin/lua
+require "luci.cacheloader"
+require "luci.sgi.cgi"
+luci.dispatcher.indexcache = "/tmp/luci-indexcache"
+luci.sgi.cgi.run()
diff --git a/package/gluon-config-mode/files/lib/gluon/config-mode/www/index.html b/package/gluon-config-mode/files/lib/gluon/config-mode/www/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..0a7238b556d9dd3b49b7f131e9382500ff243414
--- /dev/null
+++ b/package/gluon-config-mode/files/lib/gluon/config-mode/www/index.html
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="refresh" content="0; URL=/cgi-bin/luci" />
+</head>
+<body style="background-color: black">
+<a style="color: white; text-decoration: none" href="/cgi-bin/luci">LuCI - Lua Configuration Interface</a>
+</body>
+</html>
diff --git a/package/gluon-config-mode/files/lib/gluon/config-mode/www/luci-static b/package/gluon-config-mode/files/lib/gluon/config-mode/www/luci-static
new file mode 120000
index 0000000000000000000000000000000000000000..aea80e059aaf8a810c877971fb78481d9482fd31
--- /dev/null
+++ b/package/gluon-config-mode/files/lib/gluon/config-mode/www/luci-static
@@ -0,0 +1 @@
+/www/luci-static
\ No newline at end of file