diff --git a/html/inc/util_basic.inc b/html/inc/util_basic.inc
index 930388212b..33337ce9d7 100644
--- a/html/inc/util_basic.inc
+++ b/html/inc/util_basic.inc
@@ -1,4 +1,4 @@
-<runtime?php
+<?php
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
 // Copyright (C) 2008 University of California
diff --git a/sched/plan_class_spec.cpp b/sched/plan_class_spec.cpp
index 0826688aac..90654b7727 100644
--- a/sched/plan_class_spec.cpp
+++ b/sched/plan_class_spec.cpp
@@ -983,6 +983,14 @@ int PLAN_CLASS_SPEC::parse(XML_PARSER& xp) {
             have_cpu_vendor_regex = true;
             continue;
         }
+        if (xp.parse_str("cpu_model_regex", buf, sizeof(buf))) {
+            if (regcomp(&(cpu_model_regex), buf, REG_EXTENDED|REG_NOSUB) ) {
+                log_messages.printf(MSG_CRITICAL, "BAD CPU MODEL REGEXP: %s\n", buf);
+                return ERR_XML_PARSE;
+            }
+            have_cpu_model_regex = true;
+            continue;
+        }
         if (xp.parse_str("host_summary_regex", buf, sizeof(buf))) {
             if (regcomp(&(host_summary_regex), buf, REG_EXTENDED|REG_NOSUB) ) {
                 log_messages.printf(MSG_CRITICAL, "BAD HOST SUMMARY REGEXP: %s\n", buf);