diff --git a/src/docs/configuration/configuration_guide.diviner b/src/docs/configuration/configuration_guide.diviner
index 1fd98c9c48..4b562d449f 100644
--- a/src/docs/configuration/configuration_guide.diviner
+++ b/src/docs/configuration/configuration_guide.diviner
@@ -171,6 +171,36 @@ For nginx, use a configuration like this:
     }
   }
 
+= Webserver: Configuring lighttpd =
+
+For lighttpd, add a section like this to your lighttpd.conf:
+
+  $HTTP["host"] =~ "phabricator(\.example\.com)?" {
+      server.document-root = "/path/to/phabricator/webroot"
+      url.rewrite-once = (
+          "^(/rsrc/.*)$" => "$1",
+          "^(/favicon.ico)$" => "$1",
+          # This simulates QSA ("query string append") mode in apache
+          "^(/[^?]*)\?(.*)" => "/index.php?__path__=$1&$2",
+          "^(/.*)$" => "/index.php?__path__=$1",
+      )
+      setenv.add-environment = (
+         "PHABRICATOR_ENV" => "custom/myconfig",
+      )
+  }
+
+You should also ensure the following modules are listed in your
+server.modules list:
+
+  mod_fastcgi
+  mod_rewrite
+  mod_setenv
+
+Finally, you should run the following commands to enable php support:
+
+  $ sudo apt-get install php5-cgi  # for ubuntu; other distros should be similar
+  $ sudo lighty-enable-mod fastcgi-php
+
 = Setup =
 
 Now, restart your webserver and navigate to whichever subdomain you set up. You
diff --git a/src/docs/installation_guide.diviner b/src/docs/installation_guide.diviner
index 3e6651a09a..a4c1330324 100644
--- a/src/docs/installation_guide.diviner
+++ b/src/docs/installation_guide.diviner
@@ -14,8 +14,9 @@ Phabricator is a LAMP application suite, so you basically need LAMP:
     patches.) Phabricator has active contributors running it on Mac OS X, Amazon
     Linux, Ubuntu, RHEL and CentOS; if you run into issues on other flavors,
     send patches or complaints.
-  - **Apache** (or nginx): You need Apache (or nginx). You might be able to use
-    something else, but you're on your own.
+  - **Apache** (or nginx, or lighttpd): You need Apache (or another
+    tested webserver). You can probably use something else, but you're
+    on your own.
   - **MySQL**: You need MySQL.
   - **PHP**: You need PHP 5.2 or newer.