diff --git a/sql/database-fill.sql b/sql/database-fill.sql
index 0cfe06c06e576770c41886877902f23871cbf769..cbf3a218ca4c9ecc7dde11128c96ca0c8295c57d 100644
--- a/sql/database-fill.sql
+++ b/sql/database-fill.sql
@@ -848,6 +848,7 @@ REPLACE INTO table_regex VALUES ('images','version','text','redirect','os_info:v
 REPLACE INTO table_regex VALUES ('images','osfeatures','text','redirect','os_info:osfeatures',0,0,NULL);
 REPLACE INTO table_regex VALUES ('images','op_mode','text','redirect','os_info:op_mode',0,0,NULL);
 REPLACE INTO table_regex VALUES ('images','wholedisk','text','redirect','default:boolean',0,0,NULL);
+REPLACE INTO table_regex VALUES ('images','mbr_version','text','redirect','default:int',0,0,NULL);
 REPLACE INTO table_regex VALUES ('images','max_concurrent','text','redirect','default:int',0,0,NULL);
 REPLACE INTO table_regex VALUES ('images','reboot_waittime','text','redirect','default:int',0,0,NULL);
 
@@ -938,6 +939,7 @@ REPLACE INTO table_regex VALUES ('virt_node_motelog','pid','text','redirect','pr
 REPLACE INTO table_regex VALUES ('virt_node_motelog','eid','text','redirect','experiments:eid',0,0,NULL);
 REPLACE INTO `table_regex` VALUES ('virt_nodes','plab_plcnet','text','regex','^[\\w\\_\\d]+$',0,0,NULL);
 REPLACE INTO table_regex VALUES ('os_info','osid','text','regex','^[-\\w\\.+]+$',2,35,NULL);
+REPLACE INTO table_regex VALUES ('os_info','pid','text','redirect','projects:pid',0,0,NULL);
 REPLACE INTO table_regex VALUES ('os_info','pid_idx','text','redirect','projects:pid_idx',0,0,NULL);
 REPLACE INTO table_regex VALUES ('os_info','osname','text','regex','^[-\\w\\.+]+$',2,20,NULL);
 REPLACE INTO table_regex VALUES ('os_info','description','text','redirect','default:fulltext',1,256,NULL);
diff --git a/sql/updates/4/196 b/sql/updates/4/196
new file mode 100644
index 0000000000000000000000000000000000000000..2ec7574d85823afce8ab68f307cc861dcbd77fdf
--- /dev/null
+++ b/sql/updates/4/196
@@ -0,0 +1,22 @@
+use strict;
+use libdb;
+
+#
+# Regular expressions added for images and os_info tables, to support
+# changes in how we dump/load descriptors during initial install.
+#
+sub DoUpdate($$$)
+{
+    my ($dbhandle, $dbname, $version) = @_;
+
+    DBQueryFatal("replace into table_regex values ".
+		 " ('images','mbr_version','text','redirect', ".
+		 "  'default:int',0,0,NULL)");
+
+    DBQueryFatal("replace into table_regex values ".
+		 " ('os_info','pid','text','redirect',".
+		 "  'projects:pid',0,0,NULL)");
+    return 0;
+}
+1;
+