diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 34872b5dc6f..c6f233f2ce7 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -897,6 +897,25 @@ nsWebShell::Destroy()
 {
   nsresult rv = NS_OK;
 
+  //Fire unload event before we blow anything away.
+  if (nsnull != mScriptGlobal) {
+    nsIDocumentViewer* docViewer;
+    if (nsnull != mContentViewer && 
+        NS_OK == mContentViewer->QueryInterface(kIDocumentViewerIID, (void**)&docViewer)) {
+      nsIPresContext *presContext;
+      if (NS_OK == docViewer->GetPresContext(presContext)) {
+        nsEventStatus status = nsEventStatus_eIgnore;
+        nsMouseEvent event;
+        event.eventStructType = NS_EVENT;
+        event.message = NS_PAGE_UNLOAD;
+        rv = mScriptGlobal->HandleDOMEvent(*presContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
+
+        NS_RELEASE(presContext);
+      }
+      NS_RELEASE(docViewer);
+    }
+  }
+
   // Stop any URLs that are currently being loaded...
   Stop();
 
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index 34872b5dc6f..c6f233f2ce7 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -897,6 +897,25 @@ nsWebShell::Destroy()
 {
   nsresult rv = NS_OK;
 
+  //Fire unload event before we blow anything away.
+  if (nsnull != mScriptGlobal) {
+    nsIDocumentViewer* docViewer;
+    if (nsnull != mContentViewer && 
+        NS_OK == mContentViewer->QueryInterface(kIDocumentViewerIID, (void**)&docViewer)) {
+      nsIPresContext *presContext;
+      if (NS_OK == docViewer->GetPresContext(presContext)) {
+        nsEventStatus status = nsEventStatus_eIgnore;
+        nsMouseEvent event;
+        event.eventStructType = NS_EVENT;
+        event.message = NS_PAGE_UNLOAD;
+        rv = mScriptGlobal->HandleDOMEvent(*presContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
+
+        NS_RELEASE(presContext);
+      }
+      NS_RELEASE(docViewer);
+    }
+  }
+
   // Stop any URLs that are currently being loaded...
   Stop();