diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/system.lua b/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/system.lua
index 1ca546a3..9836284f 100644
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/system.lua
+++ b/package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/system.lua
@@ -19,7 +19,6 @@ function index()
 	entry({"admin", "passwd"}, cbi("admin/passwd"), "Admin Password", 10)
 	entry({"admin", "backup"}, call("action_backup"), "Backup / Restore", 80)
 	entry({"admin", "upgrade"}, call("action_upgrade"), "Flash Firmware", 90)
-	entry({"admin", "reboot"}, call("action_reboot"), "Reboot", 100)
 end
 
 function action_backup()
@@ -63,14 +62,6 @@ function action_backup()
 	end
 end
 
-function action_reboot()
-	local reboot = luci.http.formvalue("reboot")
-	luci.template.render("admin/reboot", {reboot=reboot})
-	if reboot then
-		luci.sys.reboot()
-	end
-end
-
 function action_upgrade()
 	require("luci.model.uci")
 
diff --git a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/reboot.htm b/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/reboot.htm
deleted file mode 100644
index 2eaf6d70..00000000
--- a/package/gluon-luci-admin/files/usr/lib/lua/luci/view/admin/reboot.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<%#
-LuCI - Lua Configuration Interface
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-
--%>
-<%+header%>
-<h2><a id="content" name="content">Reboot</a></h2>
-<p>Reboots the operating system of your device</p>
-<%-
-local c = require("luci.model.uci").cursor():changes()
-if c and next(c) then
--%>
-	<p class="warning">Warning: There are unsaved changes that will be lost while rebooting!</p> 
-<%-
-end
-if not reboot then 
--%>
-<p><a href="<%=REQUEST_URI%>?reboot=1">Perform reboot</a></p>
-<%- else -%>
-<p>Please wait: Device rebooting...</p>
-<%- end -%>
-<%+footer%>