diff --git a/checkin_notes b/checkin_notes
index b0068c626d..a7aaaf3c6e 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -19539,3 +19539,9 @@ Rom    15 Nov 2004
         boinc_gui.vcproj
     win_build/installerv2/
         BOINC.ism
+
+David  16 Nov 2004
+    - Validator bug: look for file name in xml_doc_out, not xml_doc_in
+
+    sched/
+        validate_util.C
diff --git a/doc/download.php b/doc/download.php
index a3f6dafd42..30a8b8f31e 100755
--- a/doc/download.php
+++ b/doc/download.php
@@ -2,40 +2,66 @@
 
 require_once("docutil.php");
 
-page_head("Download BOINC client software");
-
-function version_start($num, $date) {
+function version_start($num, $date, $xml) {
+    if ($xml) return;
     list_start();
     list_bar("Version $num (released $date)");
     list_heading("Platform", "click to download", "MD5 checksum");
 }
 
-function version($platform, $filename) {
+function version($platform, $filename, $xml) {
     $path = "dl/$filename";
     $dlink = "<a href=$path>Download</a>";
     $md = md5($path);
-    list_item($platform, $dlink, $md);
+    if ($xml) {
+        echo "
+<version>
+    <platform>$platform</platform>
+    <url>http://boinc.berkeley.edu/$path</url>
+    <filename>$filename</filename>
+    <md5>$md5</md5>
+</version>
+";
+    } else {
+        list_item($platform, $dlink, $md);
+    }
 }
 
-function version_end() {
+function version_end($xml) {
+    if ($xml) return;
     list_end();
 }
 
-function show_455() {
-    version_start("4.55", "13 Nov 2004");
-    version("Windows", "boinc_4.55_windows_intelx86.exe");
-    version_end();
+function show_455($xml=false) {
+    version_start("4.55", "13 Nov 2004", $xml);
+    version("Windows", "boinc_4.55_windows_intelx86.exe", $xml);
+    version_end($xml);
 }
 
-function show_413() {
-    version_start("4.13", "13 Oct 2004");
-    version("Windows", "boinc_4.13_windows_intelx86.exe");
-    version("Linux/x86", "boinc_4.13_i686-pc-linux-gnu.gz");
-    version("Mac OS X", "boinc_4.13_powerpc-apple-darwin.gz");
-    version("Solaris/SPARC", "boinc_4.13_sparc-sun-solaris2.7.gz");
-    version_end();
+function show_413($xml=false) {
+    version_start("4.13", "13 Oct 2004", $xml);
+    version("Windows", "boinc_4.13_windows_intelx86.exe", $xml);
+    version("Linux/x86", "boinc_4.13_i686-pc-linux-gnu.gz", $xml);
+    version("Mac OS X", "boinc_4.13_powerpc-apple-darwin.gz", $xml);
+    version("Solaris/SPARC", "boinc_4.13_sparc-sun-solaris2.7.gz", $xml);
+    version_end($xml);
 }
 
+if ($_GET["xml"]) {
+    header ("Content-Type: text/xml");
+    echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>
+<core_versions>
+    ";
+    echo "<stable_version>4.13</stable_version>\n";
+    show_413(true);
+    echo "<development_version>4.55</development_version>\n";
+    show_455(true);
+    echo "</core_versions>\n";
+    exit();
+}
+
+page_head("Download BOINC client software");
+
 echo "
 <p>
 Learn more about BOINC
diff --git a/sched/validate_util.C b/sched/validate_util.C
index 9ef0e0f04b..f40196d5be 100644
--- a/sched/validate_util.C
+++ b/sched/validate_util.C
@@ -44,7 +44,7 @@ int get_output_file_path(RESULT const& result, string& path_str) {
     char buf[256], path[256];
     bool flag;
 
-    flag = parse_str(result.xml_doc_in, "<name>", buf, sizeof(buf));
+    flag = parse_str(result.xml_doc_out, "<name>", buf, sizeof(buf));
     if (!flag) return ERR_XML_PARSE;
     dir_hier_path(buf, config.upload_dir, config.uldl_dir_fanout, path);
     path_str = path;