diff --git a/sql/database-create.sql b/sql/database-create.sql
index 0831b659fd863df88baeb26d499c4014236990e9..6f37ebf39812b8c4ea3d20aa4366fa674129b895 100644
--- a/sql/database-create.sql
+++ b/sql/database-create.sql
@@ -407,6 +407,7 @@ CREATE TABLE experiments (
   paniced tinyint(1) NOT NULL default '0',
   panic_date datetime default NULL,
   delay_capacity tinyint(3) unsigned default NULL,
+  savedisk tinyint(1) NOT NULL default '0',
   locpiper_pid int(11) default '0',
   locpiper_port int(11) default '0',
   PRIMARY KEY  (eid,pid),
@@ -1443,6 +1444,8 @@ CREATE TABLE partitions (
   node_id varchar(32) NOT NULL default '',
   partition tinyint(4) NOT NULL default '0',
   osid varchar(35) default NULL,
+  imageid varchar(45) default NULL,
+  imagepid varchar(12) NOT NULL default '',
   PRIMARY KEY  (node_id,partition)
 ) TYPE=MyISAM;
 
diff --git a/sql/database-migrate.txt b/sql/database-migrate.txt
index b694fc3b27ff2b0cd9bd6f049608a31a43fff4b5..42dfd27a141a2bfc1961003c8eb5699b9c887838 100644
--- a/sql/database-migrate.txt
+++ b/sql/database-migrate.txt
@@ -2892,3 +2892,14 @@ last_net_act,last_cpu_act,last_ext_act);
        create_time datetime default NULL,
        PRIMARY KEY  (node_id)
      ) TYPE=MyISAM;
+
+4.19: Infrastructure for disk state saving.  Add imageid and imagepid
+      fields to partitions table to track what image is loaded on the disk
+      and savedisk field in experiments table.
+
+      alter table partitions add imageid varchar(45) default NULL \
+             after osid; 
+      alter table partitions add imagepid varchar(12) NOT NULL default '' \
+             after imageid; 
+      alter table experiments add savedisk tinyint(1) NOT NULL default 0 \
+             after delay_capacity;