diff --git a/CHANGES b/CHANGES
index e5fc359643..c54a717631 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_mime: Workaround to prevent a segfault if r->filename=NULL
+     [Brian Pane]
+ 
   *) Added character set support to mod_auth_LDAP to allow it to 
      convert extended characters used in the user ID to UTF-8 
      before authenticating against the LDAP directory. The new
diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index e91cdf9872..eecd8d1ac7 100644
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -790,6 +790,10 @@ static int find_ct(request_rec *r)
         return OK;
     }
 
+    if (!r->filename) {
+        return DECLINED;
+    }
+
     conf = (mime_dir_config *)ap_get_module_config(r->per_dir_config,
                                                    &mime_module);
     exception_list = apr_array_make(r->pool, 2, sizeof(char *));