diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp
index d052558e9c1..318701f4969 100644
--- a/mozilla/caps/src/nsScriptSecurityManager.cpp
+++ b/mozilla/caps/src/nsScriptSecurityManager.cpp
@@ -1265,7 +1265,7 @@ nsScriptSecurityManager::CheckLoadURI(nsIURI *aSourceURI, nsIURI *aTargetURI,
         { "javascript",      AllowProtocol  },
         { "ftp",             AllowProtocol  },
         { "about safe",      AllowProtocol  },
-        { "about",           DenyProtocol   },
+        { "about",           ChromeProtocol },
         { "mailto",          AllowProtocol  },
         { "aim",             AllowProtocol  },
         { "data",            AllowProtocol  },
diff --git a/mozilla/netwerk/build/nsNetModule.cpp b/mozilla/netwerk/build/nsNetModule.cpp
index c118d414241..9691fe4e493 100644
--- a/mozilla/netwerk/build/nsNetModule.cpp
+++ b/mozilla/netwerk/build/nsNetModule.cpp
@@ -956,6 +956,11 @@ static const nsModuleComponentInfo gNetModuleInfo[] = {
       NS_ABOUT_MODULE_CONTRACTID_PREFIX "buildconfig",
       nsAboutRedirector::Create
     },
+    { "about:about",
+      NS_ABOUT_REDIRECTOR_MODULE_CID,
+      NS_ABOUT_MODULE_CONTRACTID_PREFIX "about",
+      nsAboutRedirector::Create
+    },
 
     { "about:cache", 
       NS_ABOUT_CACHE_MODULE_CID,
diff --git a/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp b/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp
index 186030142f0..e1040ca78db 100644
--- a/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp
+++ b/mozilla/netwerk/protocol/about/src/nsAboutRedirector.cpp
@@ -57,7 +57,6 @@ struct RedirEntry {
     PRBool dropChromePrivs; // if PR_TRUE, the page will not have chrome privileges
 };
 
-// if you add something here, make sure you update the total
 /*
   Entries with dropChromePrivs == PR_FALSE will run with chrome
   privileges. This is potentially dangerous. Please use PR_TRUE
@@ -72,6 +71,7 @@ static RedirEntry kRedirMap[] = {
     { "config", "chrome://global/content/config.xul", PR_FALSE },
     { "logo", "chrome://global/content/logo.gif", PR_TRUE },
     { "buildconfig", "chrome://global/content/buildconfig.html", PR_TRUE },
+    { "about", "chrome://global/content/aboutAbout.html", PR_FALSE }
 };
 static const int kRedirTotal = sizeof(kRedirMap)/sizeof(*kRedirMap);
 
diff --git a/mozilla/xpfe/global/jar.mn b/mozilla/xpfe/global/jar.mn
index 69e3a63ae5d..3d352b656d6 100644
--- a/mozilla/xpfe/global/jar.mn
+++ b/mozilla/xpfe/global/jar.mn
@@ -11,6 +11,7 @@ toolkit.jar:
         content/global/commonDialog.js              (resources/content/commonDialog.js) 
         content/global/strres.js                    (resources/content/strres.js) 
         content/global/logo.gif                     (resources/content/logo.gif) 
+        content/global/aboutAbout.html              (resources/content/aboutAbout.html) 
         content/global/about.xul                    (resources/content/about.xul) 
         content/global/about.js                     (resources/content/about.js) 
         content/global/config.xul                   (resources/content/config.xul) 
diff --git a/mozilla/xpfe/global/resources/content/aboutAbout.html b/mozilla/xpfe/global/resources/content/aboutAbout.html
new file mode 100644
index 00000000000..400f1e3c14d
--- /dev/null
+++ b/mozilla/xpfe/global/resources/content/aboutAbout.html
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+
+<!-- ***** BEGIN LICENSE BLOCK *****
+     Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+     The contents of this file are subject to the Mozilla Public License Version
+     1.1 (the "License"); you may not use this file except in compliance with
+     the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS" basis,
+     WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+     for the specific language governing rights and limitations under the
+     License.
+
+     The Original Code is about:about.
+
+     The Initial Developer of the Original Code is
+     Christopher A. Aillon <christopher@aillon.com>.
+     Portions created by the Initial Developer are Copyright (C) 2003
+     the Initial Developer. All Rights Reserved.
+
+     Contributor(s):
+       Christopher A. Aillon <christopher@aillon.com>
+
+     Alternatively, the contents of this file may be used under the terms of
+     either the GNU General Public License Version 2 or later (the "GPL"), or
+     the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+     in which case the provisions of the GPL or the LGPL are applicable instead
+     of those above. If you wish to allow use of your version of this file only
+     under the terms of either the GPL or the LGPL, and not to allow others to
+     use your version of this file under the terms of the MPL, indicate your
+     decision by deleting the provisions above and replace them with the notice
+     and other provisions required by the LGPL or the GPL. If you do not delete
+     the provisions above, a recipient may use your version of this file under
+     the terms of any one of the MPL, the GPL or the LGPL.
+
+     ***** END LICENSE BLOCK ***** -->
+
+<html>
+<head>
+<title>About About</title>
+<style type="text/css">
+h1 {
+  text-align: center;
+}
+
+table {
+  border-collapse: collapse;
+  border: 1px solid black;
+  width: 300px;
+  margin: auto;
+}
+
+tr {
+  background-color: #eeeeee;
+  border: 1px solid black;
+}
+
+td {
+  text-align: center;
+}
+
+a {
+  display: block;
+  padding: 0.5em;
+  vertical-align: middle;
+}
+
+.note {
+  text-align: center;
+  font-style: italic;
+}
+</style>
+<script type="application/x-javascript">
+
+var gProtocols = new Array();
+var gContainer;
+window.onload = Start;
+function Start()
+{
+  gContainer = document.getElementById("abouts");
+
+  findAbouts();
+}
+
+function findAbouts()
+{
+  for (var cid in Components.classes) {
+    var result = cid.match(/@mozilla.org\/network\/protocol\/about;1\?what\=(.*)$/);
+    if (result) {
+      gProtocols.push(result[1]);
+    }
+  }
+
+  gProtocols.sort();
+  for (var i in gProtocols) {
+    createProtocolListing(gProtocols[i]);
+  }
+}
+
+function createProtocolListing(aProtocol)
+{
+  var uri = "about:" + aProtocol;
+
+  var tr = document.createElement("tr");
+  var td = document.createElement("td");
+  var link = document.createElement("a");
+  var text = document.createTextNode(uri);
+
+  link.href = uri;
+  link.appendChild(text);
+  td.appendChild(link);
+  tr.appendChild(td);
+  gContainer.appendChild(tr);
+}
+
+</script>
+</head>
+
+<body>
+<h1>about:about</h1>
+<p class="note">Note: not all of the following URIs may be useful as listed.  For instance, some may require query strings.</p>
+<table id="abouts"></table>
+</body>
+</html>
