diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index b5e58d422..ef13ab924 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -640,6 +640,7 @@ CREATE TABLE `Storage` (
 	`Type`	enum('local','s3fs') NOT NULL default 'local',
   `DiskSpace`   bigint unsigned default NULL,
   `Scheme   enum('Deep','Medium','Shallow') NOT NULL default 'Medium',
+  `ServerId` int(10) unsigned,
 	PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
diff --git a/db/zm_update-1.31.18.sql b/db/zm_update-1.31.18.sql
new file mode 100644
index 000000000..56e15dd3a
--- /dev/null
+++ b/db/zm_update-1.31.18.sql
@@ -0,0 +1,12 @@
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Storage'
+      AND column_name = 'ServerId'
+    ) > 0,
+    "SELECT 'Column ServerId already exists in Storage'",
+    "ALTER TABLE Storage ADD `ServerId` int(10) unsigned AFTER `Scheme`"
+    ));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;