diff --git a/sql/database-create.sql b/sql/database-create.sql
index c4a06cf360139ce6e445b3b2998d56b3da460792..b5e4e141745a1ddbb091f93ef7d4f18131adf724 100644
--- a/sql/database-create.sql
+++ b/sql/database-create.sql
@@ -2380,7 +2380,9 @@ CREATE TABLE `node_history` (
   KEY `node_id` (`node_id`,`history_id`),
   KEY `exptidx` (`exptidx`),
   KEY `stamp` (`stamp`),
-  KEY `cnet_IP` (`cnet_IP`)
+  KEY `cnet_IP` (`cnet_IP`),
+  KEY `nodestamp` (`node_id`,`stamp`);
+  KEY `ipstamp` (`cnet_IP`,`stamp`);
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 --
diff --git a/sql/updates/4/294 b/sql/updates/4/294
new file mode 100644
index 0000000000000000000000000000000000000000..c0354e385bbf709c6d4aedee740870d0a209915a
--- /dev/null
+++ b/sql/updates/4/294
@@ -0,0 +1,26 @@
+#
+# Add keys to node_history.
+#
+use strict;
+use libdb;
+
+sub DoUpdate($$$)
+{
+    my ($dbhandle, $dbname, $version) = @_;
+
+    if (!DBKeyExists("node_history", "nodestamp")) {
+	DBQueryFatal("alter table node_history add " .
+		     "  KEY `nodestamp` (`node_id`,`stamp`)");
+    }
+    if (!DBKeyExists("node_history", "ipstamp")) {
+	DBQueryFatal("alter table node_history add " .
+		     "  KEY `ipstamp` (`cnet_IP`,`stamp`)");
+    }
+    return 0;
+}
+
+1;
+
+# Local Variables:
+# mode:perl
+# End: