diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 17e4024d75a4eb35cc2dcdc8a16cf0751c7a1d36..d038dbcd85072acbf15f56282ba6e54ce9a47bcc 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,8 @@
Drupal 7.17, xxxx-xx-xx (development version)
-----------------------
+- Changed the default value of the '404_fast_html' variable to have a DOCTYPE
+ declaration.
- Made it possible to use associative arrays for the 'items' variable in
theme_item_list().
- Fixed a bug which prevented required form elements without a title from being
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index d9ad8563a810c5fa0ca16259bc919cf9d0be3a26..d6c0d93f80d6029c8481ea0680828dbe6c58f54f 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -2518,7 +2518,7 @@ function drupal_fast_404() {
$fast_paths = variable_get('404_fast_paths', FALSE);
if ($fast_paths && preg_match($fast_paths, $_GET['q'])) {
drupal_add_http_header('Status', '404 Not Found');
- $fast_404_html = variable_get('404_fast_html', '404 Not FoundNot Found
The requested URL "@path" was not found on this server.
');
+ $fast_404_html = variable_get('404_fast_html', '404 Not FoundNot Found
The requested URL "@path" was not found on this server.
');
// Replace @path in the variable with the page path.
print strtr($fast_404_html, array('@path' => check_plain(request_uri())));
exit;
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 2ac6ed56b118395a406c2fdc0426d29dffd08df6..2b207f224138f6a0a3c6bc9ece062eedb2366796 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -490,7 +490,7 @@
*/
$conf['404_fast_paths_exclude'] = '/\/(?:styles)\//';
$conf['404_fast_paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i';
-$conf['404_fast_html'] = '404 Not FoundNot Found
The requested URL "@path" was not found on this server.
';
+$conf['404_fast_html'] = '404 Not FoundNot Found
The requested URL "@path" was not found on this server.
';
/**
* By default the page request process will return a fast 404 page for missing