diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index 4586bad5ff13..77f49f4152aa 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -55,7 +55,7 @@ let
       "cern_meta" "expires" "headers" "usertrack" /* "unique_id" */ "setenvif"
       "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
-      "userdir" "alias" "rewrite"
+      "userdir" "alias" "rewrite" "proxy" "proxy_http"
     ] ++ optional cfg.enableSSL "ssl_module";
     
 
@@ -193,6 +193,8 @@ let
     }
 
     ${concatMapStrings (svc: svc.extraConfig) subservices}
+
+    ${cfg.extraConfig}
   '';
 
   
diff --git a/upstart-jobs/apache-httpd/per-server-options.nix b/upstart-jobs/apache-httpd/per-server-options.nix
index 08f60b2cc6d1..f98412b0a90c 100644
--- a/upstart-jobs/apache-httpd/per-server-options.nix
+++ b/upstart-jobs/apache-httpd/per-server-options.nix
@@ -61,15 +61,14 @@
     ";
   };
 
-  # !!! this is a mis-nomer, should be "extraConfig" or something.
-  extraDirectories = mkOption {
+  extraConfig = mkOption {
     default = "";
-    example = "
+    example = ''
       <Directory /home>
         Options FollowSymlinks
         AllowOverride All
       </Directory>
-    ";
+    '';
     description = "
       These lines go to httpd.conf verbatim. They will go after
       directories and directory aliases defined by default.