diff --git a/D6-core-simpletest.patch b/D6-core-simpletest.patch
index b9d5057..4803569 100644
--- a/D6-core-simpletest.patch
+++ b/D6-core-simpletest.patch
@@ -1,13 +1,10 @@
-? sites/all/modules
-? sites/default/files
-? sites/default/settings.php
 Index: install.php
 ===================================================================
 RCS file: /cvs/drupal/drupal/install.php,v
 retrieving revision 1.113.2.12
 diff -u -p -r1.113.2.12 install.php
 --- install.php	9 May 2010 14:13:31 -0000	1.113.2.12
-+++ install.php	7 Oct 2010 21:55:51 -0000
++++ install.php	27 Oct 2010 20:25:14 -0000
 @@ -20,6 +20,14 @@ function install_main() {
    require_once './includes/bootstrap.inc';
    drupal_bootstrap(DRUPAL_BOOTSTRAP_CONFIGURATION);
@@ -29,8 +26,33 @@ RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
 retrieving revision 1.206.2.29
 diff -u -p -r1.206.2.29 bootstrap.inc
 --- includes/bootstrap.inc	6 Aug 2010 11:50:24 -0000	1.206.2.29
-+++ includes/bootstrap.inc	7 Oct 2010 21:55:51 -0000
-@@ -1112,7 +1112,7 @@ function drupal_bootstrap($phase) {
++++ includes/bootstrap.inc	27 Oct 2010 20:25:14 -0000
+@@ -1066,6 +1066,24 @@ function drupal_is_denied($type, $mask) 
+ }
+ 
+ /**
++ * Calculate a base-64 encoded, URL-safe sha-256 hmac.
++ *
++ * @param $data
++ *   String to be validated with the hmac.
++ * @param $key
++ *   A secret string key.
++ *
++ * @return
++ *   A base-64 encoded sha-256 hmac, with + replaced with -, / with _ and
++ *   any = padding characters removed.
++ */
++function drupal_hmac_base64($data, $key) {
++  $hmac = base64_encode(hash_hmac('sha256', $data, $key, TRUE));
++  // Modify the hmac so it's safe to use in URLs.
++  return strtr($hmac, array('+' => '-', '/' => '_', '=' => ''));
++}
++
++/**
+  * Generates a default anonymous $user object.
+  *
+  * @return Object - the user object.
+@@ -1112,7 +1130,7 @@ function drupal_bootstrap($phase) {
  }
  
  function _drupal_bootstrap($phase) {
@@ -39,7 +61,7 @@ diff -u -p -r1.206.2.29 bootstrap.inc
  
    switch ($phase) {
  
-@@ -1138,6 +1138,19 @@ function _drupal_bootstrap($phase) {
+@@ -1138,6 +1156,19 @@ function _drupal_bootstrap($phase) {
        break;
  
      case DRUPAL_BOOTSTRAP_DATABASE:
@@ -59,7 +81,7 @@ diff -u -p -r1.206.2.29 bootstrap.inc
        // Initialize the default database.
        require_once './includes/database.inc';
        db_set_active();
-@@ -1331,3 +1344,46 @@ function ip_address() {
+@@ -1331,3 +1362,46 @@ function ip_address() {
  
    return $ip_address;
  }
@@ -81,7 +103,7 @@ diff -u -p -r1.206.2.29 bootstrap.inc
 +//  $key = sha1(serialize($databases) . filectime($filepath) . fileinode($filepath), TRUE);
 +  $key = sha1(serialize($db_url) . filectime($filepath) . fileinode($filepath), TRUE);
 +  // The HMAC must match.
-+  return $hmac == base64_encode(hash_hmac('sha1', $check_string, $key, TRUE));
++  return $hmac == drupal_hmac_base64($check_string, $key);
 +}
 +
 +/**
@@ -104,7 +126,7 @@ diff -u -p -r1.206.2.29 bootstrap.inc
 +   // Generate a moderately secure HMAC based on the database credentials.
 +   $salt = uniqid('', TRUE);
 +   $check_string = $prefix . ';' . time() . ';' . $salt;
-+   return  $check_string . ';' . base64_encode(hash_hmac('sha1', $check_string, $key, TRUE));
++   return  $check_string . ';' . drupal_hmac_base64($check_string, $key);
 +}
 Index: includes/common.inc
 ===================================================================
@@ -112,7 +134,7 @@ RCS file: /cvs/drupal/drupal/includes/common.inc,v
 retrieving revision 1.756.2.98
 diff -u -p -r1.756.2.98 common.inc
 --- includes/common.inc	6 Sep 2010 11:13:27 -0000	1.756.2.98
-+++ includes/common.inc	7 Oct 2010 21:55:51 -0000
++++ includes/common.inc	27 Oct 2010 20:25:14 -0000
 @@ -531,7 +531,7 @@ function drupal_http_request($url, $head
    // same time won't interfere with each other as they would if the database
    // prefix were stored statically in a file or database variable.
@@ -320,7 +342,7 @@ diff -u -p -r1.756.2.98 common.inc
 +  }
 +
 +  if ($fatal) {
-+    drupal_set_header('500 Service unavailable (with message)');
++    drupal_set_header('Status: 500 Service unavailable (with message)');
 +  }
 +
 +  if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') {