diff --git a/CHANGELOG b/CHANGELOG
index c5c10fa84..5cee018fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Ndiff] Fixed the ordering of hostscript-related elements in XML
+  output. [Daniel Miller]
+
 o [NSE] Fixed a bug in the nrpe-enum script that would make it run for
   every port (when it was selected, which it was not by default).
   Daniel Miller reported the bug. [Patrick]
diff --git a/ndiff/ndiff b/ndiff/ndiff
index b7f324f7e..77f56edc0 100755
--- a/ndiff/ndiff
+++ b/ndiff/ndiff
@@ -720,13 +720,13 @@ class HostDiff(object):
             elif len(host_b.script_results) == 0:
                 a_elem = document.createElement(u"a")
                 for sr in host_a.script_results:
-                    a_elem.appendChild(sr.to_dom_fragment(document))
+                    hostscript_elem.appendChild(sr.to_dom_fragment(document))
                 a_elem.appendChild(hostscript_elem)
                 host_elem.appendChild(a_elem)
             elif len(host_a.script_results) == 0:
                 b_elem = document.createElement(u"b")
                 for sr in host_b.script_results:
-                    b_elem.appendChild(sr.to_dom_fragment(document))
+                    hostscript_elem.appendChild(sr.to_dom_fragment(document))
                 b_elem.appendChild(hostscript_elem)
                 host_elem.appendChild(b_elem)
             else: