Index: contrib/conf/apache-fastcgi.conf.in
===================================================================
--- contrib/conf/apache-fastcgi.conf.in	(revision 1885)
+++ contrib/conf/apache-fastcgi.conf.in	(working copy)
@@ -1,7 +1,13 @@
-AddHandler fastcgi-script .fcgi
+<IfModule mod_fcgid.c>
+	AddHandler fcgid-script .fcgi
+</IfModule>
 
-FastCGIServer @sitedir@/htdocs/reviewboard.fcgi -socket @sitedir@/tmp/fastcgi.sock
+<IfModule mod_fastcgi.c>
+	AddHandler fastcgi-script .fcgi
 
+	FastCGIServer @sitedir@/htdocs/reviewboard.fcgi -socket @sitedir@/tmp/fastcgi.sock
+</IfModule>
+
 <VirtualHost *:80>
 	ServerName @sitedomain@
 	DocumentRoot @sitedir@/htdocs
@@ -19,6 +25,10 @@
 
 	# Direct all other requests to the fastcgi server
 	RewriteEngine on
+	<IfModule mod_fcgid.c>
+		RewriteRule ^/(media.*)$ /$1 [QSA,L,PT]
+		RewriteRule ^/(docs.*)$ /$1 [QSA,L,PT]
+	</IfModule>
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteRule ^/(.*)$ /reviewboard.fcgi/$1 [QSA,L]
 </VirtualHost>