diff --git a/mysql/alter_tables_0.15.0.sql b/mysql/alter_tables_0.15.0.sql
index b1e8d15..95faa89 100644
--- a/mysql/alter_tables_0.15.0.sql
+++ b/mysql/alter_tables_0.15.0.sql
@@ -3,3 +3,9 @@ ALTER TABLE mxq_group
         job_max_per_node  INT2 UNSIGNED NOT NULL DEFAULT 0
     AFTER
         job_time;
+
+ALTER TABLE mxq_job
+    ADD COLUMN
+        host_id VARCHAR(1023) NOT NULL DEFAULT ""
+    AFTER
+        server_id;
diff --git a/mysql/create_tables.sql b/mysql/create_tables.sql
index cee2cd0..c203fa2 100644
--- a/mysql/create_tables.sql
+++ b/mysql/create_tables.sql
@@ -83,6 +83,7 @@ CREATE TABLE IF NOT EXISTS mxq_job (
    host_submit    VARCHAR(64)     NOT NULL DEFAULT "localhost",
 
    server_id      VARCHAR(1023)   NOT NULL DEFAULT "",
+   host_id        VARCHAR(1023)   NOT NULL DEFAULT "",
 
    host_hostname  VARCHAR(64)     NOT NULL DEFAULT "",
    host_pid       INT4 UNSIGNED   NOT NULL DEFAULT 0,
diff --git a/mysql/fix_host_id.sql b/mysql/fix_host_id.sql
new file mode 100644
index 0000000..c3c6fa3
--- /dev/null
+++ b/mysql/fix_host_id.sql
@@ -0,0 +1,7 @@
+UPDATE mxq_job
+    SET
+        host_id = CONCAT(host_hostname, '::', server_id)
+    WHERE
+        host_id = ""
+    AND server_id != ""
+    AND host_hostname != "";