diff --git a/package/base-files/default/etc/init.d/httpd b/package/base-files/default/etc/init.d/httpd
index a05b10c09477131849f4495dcee917fa45a44969..e4f5f48e9cb966a7228ca4fc4fbd8a7be1c08e18 100755
--- a/package/base-files/default/etc/init.d/httpd
+++ b/package/base-files/default/etc/init.d/httpd
@@ -2,7 +2,10 @@
 # Copyright (C) 2006 OpenWrt.org
 
 start() {
-	[ -d /www ] && httpd -p 80 -h /www -r OpenWrt
+	include /lib/network
+	scan_interfaces
+        config_get ifname wan hostname
+	[ -d /www ] && httpd -p 80 -h /www -r ${hostname:-OpenWrt}
 }
 
 stop() {