diff --git a/VERSION b/VERSION
index 1f3ae31e..a9189776 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.4 (2012-02-19 22:40:59) stable
+Version 1.99.4 (2012-02-19 22:47:06) stable
diff --git a/cgihandler.py b/cgihandler.py
index 66d13b30..05843cb6 100755
--- a/cgihandler.py
+++ b/cgihandler.py
@@ -5,6 +5,49 @@
 This file is part of the web2py Web Framework
 Copyrighted by Massimo Di Pierro <mdipierro@cs.depaul.edu>
 License: LGPLv3 (http://www.gnu.org/licenses/lgpl.html)
+
+This is a CGI handler for Apache
+Requires apache+[mod_cgi or mod_cgid].
+
+In httpd.conf put something like:
+
+    LoadModule cgi_module modules/mod_cgi.so
+    ScriptAlias / /path/to/cgihandler.py/
+
+Example of httpd.conf ------------
+<VirtualHost *:80>
+  ServerName web2py.example.com
+  ScriptAlias / /users/www-data/web2py/cgihandler.py/
+
+  <Directory /users/www-data/web2py>
+    AllowOverride None
+    Order Allow,Deny
+    Deny from all
+    <Files cgihandler.py>
+      Allow from all
+    </Files>
+  </Directory>
+
+  AliasMatch ^/([^/]+)/static/(.*) \
+           /users/www-data/web2py/applications/$1/static/$2
+  <Directory /users/www-data/web2py/applications/*/static/>
+    Order Allow,Deny
+    Allow from all
+  </Directory>
+
+  <Location /admin>
+  Deny from all
+  </Location>
+
+  <LocationMatch ^/([^/]+)/appadmin>
+  Deny from all
+  </LocationMatch>
+
+  CustomLog /private/var/log/apache2/access.log common
+  ErrorLog /private/var/log/apache2/error.log
+</VirtualHost>
+----------------------------------
+
 """
 
 import os