diff --git a/sql/database-create.sql b/sql/database-create.sql
index 728efe97cfd3b4b90e76a735468acd4649447ddb..d08609a377c18095530fddeb1fdc2c617217242a 100644
--- a/sql/database-create.sql
+++ b/sql/database-create.sql
@@ -147,16 +147,6 @@ CREATE TABLE event_eventtypes (
   PRIMARY KEY  (idx)
 ) TYPE=MyISAM;
 
---
--- Table structure for table `event_objecttypes`
---
-
-CREATE TABLE event_objecttypes (
-  idx smallint(5) unsigned NOT NULL default '0',
-  type tinytext NOT NULL,
-  PRIMARY KEY  (idx)
-) TYPE=MyISAM;
-
 --
 -- Table structure for table `event_groups`
 --
@@ -172,6 +162,16 @@ CREATE TABLE event_groups (
   KEY agent_name (agent_name)
 ) TYPE=MyISAM;
 
+--
+-- Table structure for table `event_objecttypes`
+--
+
+CREATE TABLE event_objecttypes (
+  idx smallint(5) unsigned NOT NULL default '0',
+  type tinytext NOT NULL,
+  PRIMARY KEY  (idx)
+) TYPE=MyISAM;
+
 --
 -- Table structure for table `eventlist`
 --
@@ -723,6 +723,7 @@ CREATE TABLE new_nodes (
   contact tinytext,
   phone tinytext,
   room varchar(32) default NULL,
+  role varchar(32) NOT NULL default 'testnode',
   PRIMARY KEY  (new_node_id)
 ) TYPE=MyISAM;
 
@@ -1667,7 +1668,7 @@ CREATE TABLE virt_agents (
 CREATE TABLE virt_lan_lans (
   pid varchar(12) NOT NULL default '',
   eid varchar(32) NOT NULL default '',
-  idx int(11) NOT NULL auto_increment,  
+  idx int(11) NOT NULL auto_increment,
   vname varchar(32) NOT NULL default '',
   PRIMARY KEY  (pid,eid,idx),
   UNIQUE KEY vname (pid,eid,vname)
@@ -1700,7 +1701,6 @@ CREATE TABLE virt_lan_settings (
   PRIMARY KEY  (pid,eid,vname,capkey)
 ) TYPE=MyISAM;
 
-
 --
 -- Table structure for table `virt_lans`
 --
diff --git a/sql/database-migrate.txt b/sql/database-migrate.txt
index d5e938f4f3f8a1ec31d974463504401aa97a755a..b485c84fe6110a1c86d4b9a9fc2962739b165185 100644
--- a/sql/database-migrate.txt
+++ b/sql/database-migrate.txt
@@ -1842,3 +1842,8 @@ last_net_act,last_cpu_act,last_ext_act);
 	insert into virt_lan_lans (pid, eid, vname) 
             select distinct pid,eid,vname from virt_lans;
 
+1.270: Add a 'role' column to the newnodes table so that we can add nodes
+       other than experiment nodes (such as ops) using the newnode system.
+
+       alter table new_nodes add column role varchar(32) not null \
+	   default 'testnode';