diff --git a/apache/v2/httpd.conf-ops.in b/apache/v2/httpd.conf-ops.in
index 84f2874f91eae4557234f0f8ad6a0a2c50140d30..b8497455d780cd716117d29571025c06644ad217 100644
--- a/apache/v2/httpd.conf-ops.in
+++ b/apache/v2/httpd.conf-ops.in
@@ -404,18 +404,6 @@ DocumentRoot "/usr/local/www/data"
     Deny from all
 </Directory>
 
-#
-# Flyspray
-#
-<Directory /usr/local/www/data/flyspray>
-    Options FollowSymLinks
-    AllowOverride All
-    Order allow,deny
-    Allow from all
-    SSLRequireSSL
-    Satisfy all
-</Directory>
-
 #
 # CVSWEB
 #
@@ -428,22 +416,6 @@ DocumentRoot "/usr/local/www/data"
     Allow from all
 </Directory>
 
-#
-# Jeti
-#
-<Directory /usr/local/www/data/jeti>
-    Options None
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
-<Directory /usr/testbed/www/jabber>
-    Options None
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
-
 #
 # UserDir: The name of the directory that is appended onto a user's home
 # directory if a ~user request is received.
@@ -715,6 +687,7 @@ Alias /jabber/ "/usr/testbed/www/jabber/"
 
 ScriptAlias /spewrpmtar  /usr/testbed/cgi-bin/spewrpmtar_cgi
 ScriptAlias /d77e8041d1ad /usr/testbed/cgi-bin/shellinabox.pl
+Alias /accept_cert.html /usr/testbed/www/accept_cert.html
 
 <Directory "/usr/testbed/cgi-bin">
     Options FollowSymLinks
@@ -722,6 +695,12 @@ ScriptAlias /d77e8041d1ad /usr/testbed/cgi-bin/shellinabox.pl
     Order allow,deny
     Allow from all
 </Directory>
+<Directory "/usr/testbed/www">
+    Options None
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
 
 #
 # Redirect allows you to tell clients about documents which used to exist in