diff --git a/README.confd b/README.confd
index d82037a..c12e149 100644
--- a/README.confd
+++ b/README.confd
@@ -2,3 +2,8 @@
 This directory holds Apache 2.0 module-specific configuration files;
 any files in this directory which have the ".conf" extension will be
 processed as Apache configuration files.
+
+Files are processed in alphabetical order, so if using configuration
+directives which depend on, say, mod_perl being loaded, ensure that
+these are placed in a filename later in the sort order than "perl.conf".
+
diff --git a/httpd.conf b/httpd.conf
index cb75586..01d6220 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -478,8 +478,7 @@ LogFormat "%{User-agent}i" agent
 # define per-<VirtualHost> access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-# CustomLog logs/access_log common
-CustomLog logs/access_log combined
+#CustomLog logs/access_log common
 
 #
 # If you would like to have agent and referer logfiles, uncomment the
@@ -489,10 +488,10 @@ CustomLog logs/access_log combined
 #CustomLog logs/agent_log agent
 
 #
-# If you prefer a single logfile with access, agent, and referer information
-# (Combined Logfile Format) you can use the following directive.
+# For a single logfile with access, agent, and referer information
+# (Combined Logfile Format), use the following directive:
 #
-#CustomLog logs/access_log combined
+CustomLog logs/access_log combined
 
 #
 # Optionally add a line containing the server version and virtual host
diff --git a/httpd.init b/httpd.init
index 698c66f..d705aba 100755
--- a/httpd.init
+++ b/httpd.init
@@ -17,6 +17,9 @@ if [ -f /etc/sysconfig/httpd ]; then
         . /etc/sysconfig/httpd
 fi
 
+# Start httpd in the C locale by default.
+HTTPD_LANG=${HTTPD_LANG-"C"}
+
 # This will prevent initlog from swallowing up a pass-phrase prompt if
 # mod_ssl needs a pass-phrase from the user.
 INITLOG_ARGS=""
@@ -39,7 +42,7 @@ check13 () {
 	GONE="(ServerType|BindAddress|Port|AddModule|ClearModuleList|"
 	GONE="${GONE}AgentLog|RefererLog|RefererIgnore|FancyIndexing|"
 	GONE="${GONE}AccessConfig|ResourceConfig)"
-	if grep -Eiq "^[[:space:]]*($GONE)" $CONFFILE; then
+	if LANG=C grep -Eiq "^[[:space:]]*($GONE)" $CONFFILE; then
 		echo
 		echo 1>&2 " Apache 1.3 configuration directives found"
 		echo 1>&2 " please read @docdir@/migration.html"
@@ -56,7 +59,7 @@ check13 () {
 start() {
         echo -n $"Starting $prog: "
         check13 || exit 1
-        daemon $httpd $OPTIONS
+        LANG=$HTTPD_LANG daemon $httpd $OPTIONS
         RETVAL=$?
         echo
         [ $RETVAL = 0 ] && touch ${lockfile}
diff --git a/httpd.spec b/httpd.spec
index 3de19a7..930a556 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -1,13 +1,13 @@
 %define contentdir /var/www
 %define suexec_caller apache
 %define mmn 20020903
-%define vstring Red Hat
-%define distro Red Hat Enterprise Linux
+%define vstring Fedora
+%define distro Fedora Core
 
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.0.50
-Release: 3.ent
+Release: 4
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -50,6 +50,7 @@ Patch30: httpd-2.0.48-davmisc.patch
 Patch32: httpd-2.0.48-vhost.patch
 Patch35: httpd-2.0.49-eocbucket.patch
 Patch37: httpd-2.0.46-autoindex.patch
+Patch38: httpd-2.0.50-userdir.patch
 # Features/functional changes
 Patch70: httpd-2.0.48-release.patch
 Patch71: httpd-2.0.40-xfsz.patch
@@ -162,6 +163,7 @@ executed by SSI pages) as a user other than the 'apache' user.
 %patch32 -p1 -b .vhost
 %patch35 -p1 -b .eocbucket
 %patch37 -p1 -b .autoindex
+%patch38 -p1 -b .userdir
 
 %patch71 -p0 -b .xfsz
 %patch72 -p1 -b .pod
@@ -578,6 +580,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/suexec.8*
 
 %changelog
+* Tue Aug 17 2004 Joe Orton <jorton@redhat.com> 2.0.50-4
+- start httpd in the C locale by default (#128002)
+- fix CustomLog comments in default httpd.conf (#43223)
+- ensure correct mod_suexec vs mod_userdir hook ordering 
+  (Joshua Slive, upstream #18156)
+
 * Tue Jun 29 2004 Joe Orton <jorton@redhat.com> 2.0.50-3
 - update -proxy11 patch
 - explain where suexec went if SuexecUserGroup is used but
diff --git a/index.html b/index.html
index 7f33e0f..37d41a8 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 	<head>
-		<title>Test Page for the Apache HTTP Server on Red Hat Enterprise Linux</title>
+		<title>Test Page for the Apache HTTP Server on Fedora Core</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 		<style type="text/css">
 			/*<![CDATA[*/
@@ -27,7 +27,7 @@
 				text-align: center;
 				margin: 0;
 				padding: 0.6em 2em 0.4em;
-				background-color: #900;
+				background-color: #22437f;
 				color: #fff;
 				font-weight: normal;
 				font-size: 1.75em;
@@ -85,7 +85,7 @@
 	</head>
 
 	<body>
-		<h1>Red Hat Enterprise Linux <strong>Test Page</strong></h1>
+		<h1>Fedora Core <strong>Test Page</strong></h1>
 
 		<div class="content">
 			<div class="content-middle">
@@ -103,7 +103,7 @@
 
 					<p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster@example.com".</p>
 
-					<p>For information on Red Hat Enterprise Linux, please visit the <a href="http://www.redhat.com/">Red Hat, Inc. website</a>. The documentation for Red Hat Enterprise Linux is <a href="http://www.redhat.com/docs/manuals/enterprise/">available on the Red Hat, Inc. website</a>.</p>
+					<p>For information on Fedora Core, please visit the <a href="http://fedora.redhat.com/">Fedora Project website</a>.</p>
 					<hr />
 				</div>
 
@@ -113,9 +113,9 @@
 					<p>You may now add content to the directory <tt>/var/www/html/</tt>. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file <tt>/etc/httpd/conf.d/welcome.conf</tt>.</p>
 
 					<div class="logos">
-						<p>You are free to use the images below on Apache and Red Hat powered HTTP servers.  Thanks for using Apache and Red Hat Enterprise Linux!</p>
+						<p>You are free to use the images below on Apache and Fedora Core powered HTTP servers. Thanks for using Apache and Fedora Core!</p>
 
-						<p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://www.redhat.com/"><img src="/icons/powered_by_rh.png" alt="[ Powered by Red Hat ]" width="88" height="31" /></a></p>
+						<p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedora.redhat.com/"><img src="/icons/powered_by_fedora.png" alt="[ Powered by Fedora Core ]" width="88" height="31" /></a></p>
 					</div>
 				</div>
 			</div>