diff --git a/checkin_notes b/checkin_notes
index 967f7b7958..c21c4eedd4 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -3144,3 +3144,13 @@ Rom    April 7 2008 (HEAD)
     /
         configure.ac
         version.h
+
+David  April 7 2008
+    - client: send client_cap_plan_class as <x>1</x> rather than <x/>
+        in scheduler request; the latter breaks older schedulers.
+    - old parse code: make skip_unexpected() work with <x/>
+
+    client/
+        cs_scheduler.C
+    lib/
+        parse.C
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index 8832bccd20..613ae88f40 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -137,7 +137,7 @@ int CLIENT_STATE::make_scheduler_request(PROJECT* p) {
     // write client capabilities
     //
     fprintf(f,
-        "    <client_cap_plan_class/>\n"
+        "    <client_cap_plan_class>1</client_cap_plan_class>\n"
     );
 
     write_platforms(p, mf);
diff --git a/lib/parse.C b/lib/parse.C
index ed69c7814a..92eca80930 100644
--- a/lib/parse.C
+++ b/lib/parse.C
@@ -358,6 +358,7 @@ void xml_unescape(const char* in, char* out) {
 
 // we got an unrecognized line.
 // If it has two <'s (e.g. <foo>xx</foo>) return 0.
+// If it's of the form <foo/> return 0.
 // If it's of the form <foo> then scan for </foo> and return 0.
 // Otherwise return ERR_XML_PARSE
 //
@@ -376,6 +377,7 @@ int skip_unrecognized(char* buf, MIOFILE& fin) {
     if (!q) {
         return ERR_XML_PARSE;
     }
+    if (q[-1] == '/') return 0;
     *q = 0;
     close_tag = string("</") + string(p+1) + string(">");
     while (fin.fgets(buf2, 256)) {