diff --git a/net/lighttpd/files/lighttpd.conf b/net/lighttpd/files/lighttpd.conf
index a52d08f6d..04b06bc3b 100644
--- a/net/lighttpd/files/lighttpd.conf
+++ b/net/lighttpd/files/lighttpd.conf
@@ -1,31 +1,28 @@
-# lighttpd configuration file
-# 
 server.modules = (
 )
 
-### only root can use these options
-#server.chroot               = "/"
-
-######### Options that are good to be but not neccesary to be changed #######
-#server.port                 = 81
-#server.bind                 = "localhost"
 server.document-root        = "/www"
 server.upload-dirs          = ( "/tmp" )
 server.errorlog             = "/var/log/lighttpd/error.log"
 server.pid-file             = "/var/run/lighttpd.pid"
 server.username             = "http"
 server.groupname            = "www-data"
+
+index-file.names            = ( "index.php", "index.html",
+                                "index.htm", "default.htm",
+                                "index.lighttpd.html" )
+
+static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
+
+### Options that are useful but not always necessary:
+#server.chroot               = "/"
+#server.port                 = 81
+#server.bind                 = "localhost"
 #server.tag                  = "lighttpd"
 #server.errorlog-use-syslog  = "enable"
 #server.network-backend      = "write"
 
-index-file.names            = ( "index.php", "index.html",
-                                "index.htm", "default.htm",
-                               " index.lighttpd.html" )
-
-static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
-
-## Use ipv6 if available
+### Use IPv6 if available
 #include_shell "/usr/share/lighttpd/use-ipv6.pl"
 
 #dir-listing.encoding        = "utf-8"
@@ -33,6 +30,3 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
 
 include       "/etc/lighttpd/mime.conf"
 include_shell "cat /etc/lighttpd/conf.d/*.conf"
-
-
-