Index: xs/maps/apache2_functions.map
===================================================================
--- xs/maps/apache2_functions.map	(revision 1502446)
+++ xs/maps/apache2_functions.map	(working copy)
@@ -188,9 +188,17 @@
 MODULE=Apache2::ServerUtil   PACKAGE=Apache2::ServerUtil
  ap_exists_config_define
  ap_server_root_relative | | p, fname=""
+#_if_ do {                                                                  \
+          Apache2::Build->build_config                                      \
+	      ->httpd_version =~ /^(\d+)\.(\d+)\.(\d+)/                     \
+          ? ($1*1000+$2)*1000+$3                                            \
+          : die "Cannot get httpd version";                                 \
+      } > 2003000
  ap_get_server_banner
  ap_get_server_description
+#_else_
  ap_get_server_version
+#_end_
 
 MODULE=Apache2::ServerUtil   PACKAGE=guess
  ap_error_log2stderr