diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
index 4d37e4d0fc17..eebcfd763056 100644
--- a/content/base/src/nsContentSink.cpp
+++ b/content/base/src/nsContentSink.cpp
@@ -349,19 +349,21 @@ nsContentSink::ScriptAvailable(nsresult aResult,
     mParser->ScriptExecuting();
   }
 
-  if (count == 0) {
-    return NS_OK;
-  }
-
   // aElement will not be in mScriptElements if a <script> was added
   // using the DOM during loading, or if the script was inline and thus
   // never blocked.
-  NS_ASSERTION(mScriptElements.IndexOf(aElement) == PRUint32(count - 1) ||
+  NS_ASSERTION(count == 0 ||
+               mScriptElements.IndexOf(aElement) == PRUint32(count - 1) ||
                mScriptElements.IndexOf(aElement) == PRUint32(-1),
                "script found at unexpected position");
 
   // Check if this is the element we were waiting for
-  if (aElement != mScriptElements[count - 1]) {
+  if (count == 0 || aElement != mScriptElements[count - 1]) {
+    if (mDidGetReadyToCallDidBuildModelCall &&
+        !mScriptLoader->HasPendingOrCurrentScripts() &&
+        mParser && mParser->IsParserEnabled()) {
+      ContinueInterruptedParsingAsync();
+    }
     return NS_OK;
   }
 
@@ -406,6 +408,11 @@ nsContentSink::ScriptEvaluated(nsresult aResult,
   // Check if this is the element we were waiting for
   PRInt32 count = mScriptElements.Count();
   if (count == 0 || aElement != mScriptElements[count - 1]) {
+    if (mDidGetReadyToCallDidBuildModelCall &&
+        !mScriptLoader->HasPendingOrCurrentScripts() &&
+        mParser && mParser->IsParserEnabled()) {
+      ContinueInterruptedParsingAsync();
+    }
     return NS_OK;
   }
 
@@ -1749,6 +1756,24 @@ nsContentSink::ContinueInterruptedParsingAsync()
   NS_DispatchToCurrentThread(ev);
 }
 
+PRBool
+nsContentSink::ReadyToCallDidBuildModelImpl()
+{
+  if (!mDidGetReadyToCallDidBuildModelCall) {
+    if (mDocument) {
+      mDocument->SetReadyStateInternal(nsIDocument::READYSTATE_INTERACTIVE);
+    }
+
+    if (mScriptLoader) {
+      mScriptLoader->EndDeferringScripts();
+    }
+  }
+
+  mDidGetReadyToCallDidBuildModelCall = PR_TRUE;
+  
+  return !mScriptLoader || !mScriptLoader->HasPendingOrCurrentScripts();
+}
+
 // URIs: action, href, src, longdesc, usemap, cite
 PRBool 
 IsAttrURI(nsIAtom *aName)
diff --git a/content/base/src/nsContentSink.h b/content/base/src/nsContentSink.h
index e26496bda8cf..eab279f42228 100644
--- a/content/base/src/nsContentSink.h
+++ b/content/base/src/nsContentSink.h
@@ -138,6 +138,7 @@ class nsContentSink : public nsICSSLoaderObserver,
   NS_HIDDEN_(nsresult) DidProcessATokenImpl(void);
   NS_HIDDEN_(void) WillBuildModelImpl(void);
   NS_HIDDEN_(void) DidBuildModelImpl(void);
+  NS_HIDDEN_(PRBool) ReadyToCallDidBuildModelImpl(void);
   NS_HIDDEN_(void) DropParserAndPerfHint(void);
 
   void NotifyAppend(nsIContent* aContent, PRUint32 aStartIndex);
@@ -350,6 +351,8 @@ protected:
   PRUint8 mDeferredLayoutStart : 1;
   // If true, we deferred notifications until sheets load
   PRUint8 mDeferredFlushTags : 1;
+  // If true, we did get a ReadyToCallDidBuildModel call
+  PRUint8 mDidGetReadyToCallDidBuildModelCall : 1;
   
   // -- Can interrupt parsing members --
   PRUint32 mDelayTimerStart;
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index ab05765059e6..e92b1e9ec984 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -3966,10 +3966,6 @@ nsDocument::DispatchContentLoadedEvents()
     } while (parent);
   }
 
-  if (mScriptLoader) {
-    mScriptLoader->EndDeferringScripts();
-  }
-
   UnblockOnload(PR_TRUE);
 }
 
@@ -3986,8 +3982,6 @@ nsDocument::EndLoad()
   
   NS_DOCUMENT_NOTIFY_OBSERVERS(EndLoad, (this));
   
-  SetReadyStateInternal(READYSTATE_INTERACTIVE);
-
   if (!mSynchronousDOMContentLoaded) {
     nsRefPtr<nsIRunnable> ev =
       new nsRunnableMethod<nsDocument>(this,
diff --git a/content/base/src/nsScriptLoader.h b/content/base/src/nsScriptLoader.h
index 1d9b78ced114..b0e71eef0181 100644
--- a/content/base/src/nsScriptLoader.h
+++ b/content/base/src/nsScriptLoader.h
@@ -208,6 +208,14 @@ public:
    */
   void EndDeferringScripts();
 
+  /**
+   * Returns the number of pending scripts, deferred or not.
+   */
+  PRUint32 HasPendingOrCurrentScripts()
+  {
+    return mCurrentScript || GetFirstPendingRequest();
+  }
+
   /**
    * Adds aURI to the preload list and starts loading it.
    *
diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in
index 22bc98bb6502..74abf79b5232 100644
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -282,6 +282,7 @@ _TEST_FILES = 	test_bug5141.html \
 		file_XHRSendData_doc.xml \
 		file_XHRSendData_doc.xml^headers^ \
 		test_bug466751.xhtml \
+		test_bug461555.html \
 		$(NULL)
 
 # Disabled for now. Mochitest isn't reliable enough for these.
diff --git a/content/base/test/test_bug28293.html b/content/base/test/test_bug28293.html
index a14c016d861f..953aa6408667 100644
--- a/content/base/test/test_bug28293.html
+++ b/content/base/test/test_bug28293.html
@@ -37,7 +37,7 @@ onload = function () {
 }
 
 function done() {
-  is(res, "ABCDEFGHIJ1abcdefM2g34hi", "scripts executed in the wrong order");
+  is(res, "ABCDEFGHIJabcdef1M2g34hi", "scripts executed in the wrong order");
   ok(!fHadExecuted, "Dynamic script executed too late");
   SimpleTest.finish();
 }
diff --git a/content/base/test/test_bug461555.html b/content/base/test/test_bug461555.html
new file mode 100644
index 000000000000..9594b71d8063
--- /dev/null
+++ b/content/base/test/test_bug461555.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=461555
+-->
+<head>
+  <title>Test for Bug 461555</title>
+  <script type="application/javascript" src="/MochiKit/MochiKit.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=461555">Mozilla Bug 461555</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<script>
+
+SimpleTest.waitForExplicitFinish();
+
+function writeIt(n) {
+  document.write("<span>" + n + "</span>");
+}
+
+var recur = 0;
+function externalScript() {
+  if (++recur == 3) {
+    return;
+  }
+
+  base = (recur-1) * 4
+
+  writeIt(6 + base);
+  s = document.createElement("script");
+  s.src = "data:text/plain,writeIt(" + (8+base) + ");writeIt(" + (9+base) + ");externalScript();";
+  document.body.appendChild(s);
+  writeIt(7 + base);
+}
+
+function done() {
+  nodes = document.getElementsByTagName('span');
+  is(nodes.length, 13, "wrong length");
+  for (i = 0; i < nodes.length; ++i) {
+    is(nodes[i].textContent, i+1, "wrong order");
+  }
+  SimpleTest.finish();
+}
+
+document.addEventListener("DOMContentLoaded", function() {
+  done();
+}, false);
+
+writeIt(1);
+
+</script>
+<script defer>
+writeIt(3);
+</script>
+<script>
+writeIt(2);
+</script>
+<script defer src="data:text/plain,writeIt(4);writeIt(5);"></script>
+<script defer src="data:text/plain,externalScript();"></script>
diff --git a/content/html/document/src/nsHTMLContentSink.cpp b/content/html/document/src/nsHTMLContentSink.cpp
index 6eb2532b6e22..443bcf06db80 100644
--- a/content/html/document/src/nsHTMLContentSink.cpp
+++ b/content/html/document/src/nsHTMLContentSink.cpp
@@ -185,6 +185,7 @@ public:
   NS_IMETHOD WillParse(void);
   NS_IMETHOD WillBuildModel(void);
   NS_IMETHOD DidBuildModel(void);
+  virtual PRBool ReadyToCallDidBuildModel(void);
   NS_IMETHOD WillInterrupt(void);
   NS_IMETHOD WillResume(void);
   NS_IMETHOD SetParser(nsIParser* aParser);
@@ -1837,6 +1838,12 @@ HTMLContentSink::DidBuildModel(void)
   return NS_OK;
 }
 
+PRBool
+HTMLContentSink::ReadyToCallDidBuildModel()
+{
+  return ReadyToCallDidBuildModelImpl();
+}
+
 NS_IMETHODIMP
 HTMLContentSink::SetParser(nsIParser* aParser)
 {
diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp
index 2cfd643913c7..f3203a54cd41 100644
--- a/content/xml/document/src/nsXMLContentSink.cpp
+++ b/content/xml/document/src/nsXMLContentSink.cpp
@@ -383,6 +383,12 @@ nsXMLContentSink::DidBuildModel()
   return NS_OK;
 }
 
+PRBool
+nsXMLContentSink::ReadyToCallDidBuildModel()
+{
+  return ReadyToCallDidBuildModelImpl();
+}
+
 NS_IMETHODIMP
 nsXMLContentSink::OnDocumentCreated(nsIDocument* aResultDocument)
 {
diff --git a/content/xml/document/src/nsXMLContentSink.h b/content/xml/document/src/nsXMLContentSink.h
index e12d478c3e5a..a3b77e9ad24a 100644
--- a/content/xml/document/src/nsXMLContentSink.h
+++ b/content/xml/document/src/nsXMLContentSink.h
@@ -93,6 +93,7 @@ public:
   NS_IMETHOD WillParse(void);
   NS_IMETHOD WillBuildModel(void);
   NS_IMETHOD DidBuildModel(void);
+  virtual PRBool ReadyToCallDidBuildModel(void);
   NS_IMETHOD WillInterrupt(void);
   NS_IMETHOD WillResume(void);
   NS_IMETHOD SetParser(nsIParser* aParser);  
diff --git a/parser/htmlparser/public/nsIContentSink.h b/parser/htmlparser/public/nsIContentSink.h
index 55bed1f5c7ab..3cc8f6ea3d2e 100644
--- a/parser/htmlparser/public/nsIContentSink.h
+++ b/parser/htmlparser/public/nsIContentSink.h
@@ -56,8 +56,8 @@
 class nsIParser;
 
 #define NS_ICONTENT_SINK_IID \
-{ 0x94ec4df1, 0x6885, 0x4b1f, \
- { 0x85, 0x10, 0xe3, 0x5f, 0x4f, 0x36, 0xea, 0xaa } }
+{ 0xcfa3643b, 0xee60, 0x4bf0, \
+  { 0xbc, 0x83, 0x49, 0x95, 0xdb, 0xbc, 0xda, 0x75 } }
 
 class nsIContentSink : public nsISupports {
 public:
@@ -88,6 +88,12 @@ public:
    */
   NS_IMETHOD DidBuildModel()=0;
 
+  /**
+   * Thie method gets caller right before DidBuildModel is called.
+   * If false
+   */
+  virtual PRBool ReadyToCallDidBuildModel() { return PR_TRUE; };
+
   /**
    * This method gets called when the parser gets i/o blocked,
    * and wants to notify the sink that it may be a while before
diff --git a/parser/htmlparser/src/nsParser.cpp b/parser/htmlparser/src/nsParser.cpp
index abcb16f352ec..574b2c58f573 100644
--- a/parser/htmlparser/src/nsParser.cpp
+++ b/parser/htmlparser/src/nsParser.cpp
@@ -1525,7 +1525,12 @@ nsParser::DidBuildModel(nsresult anErrorCode)
 
   if (IsComplete()) {
     if (mParserContext && !mParserContext->mPrevContext) {
-      if (mParserContext->mDTD) {
+      // If mInternalState == NS_ERROR_HTMLPARSER_STOPPARSING then we got in
+      // here through Terminate() and so we always want to Call DidBuildModel
+      // on the DTD, even if the sink says 'no'.
+      if (mParserContext->mDTD && mSink &&
+          (mInternalState == NS_ERROR_HTMLPARSER_STOPPARSING ||
+           mSink->ReadyToCallDidBuildModel())) {
         result = mParserContext->mDTD->DidBuildModel(anErrorCode,PR_TRUE,this,mSink);
       }