diff --git a/sql/updates/0.17/11436_01_characters_character_queststatus.sql b/sql/updates/0.17/11436_01_characters_character_queststatus.sql
index b93fa42d8..2c07f03f3 100644
--- a/sql/updates/0.17/11436_01_characters_character_queststatus.sql
+++ b/sql/updates/0.17/11436_01_characters_character_queststatus.sql
@@ -3,3 +3,4 @@ ALTER TABLE character_db_version CHANGE COLUMN required_11391_01_characters_auct
 ALTER TABLE character_queststatus
   ADD COLUMN itemcount5 int(11) unsigned NOT NULL default '0' AFTER itemcount4,
   ADD COLUMN itemcount6 int(11) unsigned NOT NULL default '0' AFTER itemcount5;
+
diff --git a/sql/updates/0.17/11597_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11597_01_mangos_spell_proc_event.sql
index f4b692291..5ccf9dbee 100644
--- a/sql/updates/0.17/11597_01_mangos_spell_proc_event.sql
+++ b/sql/updates/0.17/11597_01_mangos_spell_proc_event.sql
@@ -3,3 +3,4 @@ ALTER TABLE db_version CHANGE COLUMN required_11595_09_mangos_spell_elixir requi
 DELETE FROM `spell_proc_event` WHERE entry IN (17767);
 INSERT INTO `spell_proc_event` VALUE
 (17767, 0x00,  5, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00080000, 0x00040000, 0.000000, 0.000000,  0);
+
diff --git a/sql/updates/0.17/11598_01_mangos_spell_proc_event.sql b/sql/updates/0.17/11598_01_mangos_spell_proc_event.sql
index 81f0b9793..c0ef4ca82 100644
--- a/sql/updates/0.17/11598_01_mangos_spell_proc_event.sql
+++ b/sql/updates/0.17/11598_01_mangos_spell_proc_event.sql
@@ -3,3 +3,4 @@ ALTER TABLE db_version CHANGE COLUMN required_11597_01_mangos_spell_proc_event r
 DELETE FROM `spell_proc_event` WHERE entry IN (64914);
 INSERT INTO `spell_proc_event` VALUE
 (64914, 0x00,  8, 0x00000000, 0x00000000, 0x00000000, 0x00080000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000,  0);
+
diff --git a/sql/updates/0.17/12087_01_mangos_mangos_string.sql b/sql/updates/0.17/12087_01_mangos_mangos_string.sql
new file mode 100644
index 000000000..410e27adf
--- /dev/null
+++ b/sql/updates/0.17/12087_01_mangos_mangos_string.sql
@@ -0,0 +1,12 @@
+ALTER TABLE db_version CHANGE COLUMN required_12012_01_mangos_spell_template required_12087_01_mangos_mangos_string bit;
+
+UPDATE mangos_string SET content_default='This item(s) has problems with equipping/storing to inventory.' WHERE entry=706;
+UPDATE mangos_string SET content_default='Arenas are set to 1v1 for debugging. You cannot join as a group.' WHERE entry=737;
+UPDATE mangos_string SET content_default='Account name cannot be longer than 16 characters (client limit), account not created!' WHERE entry=1005;
+UPDATE mangos_string SET content_default='Can only quit from a Remote Admin console or the quit command was not entered in full (quit).' WHERE entry=1015;
+UPDATE mangos_string SET content_default='ERROR: You can only assign a new name for a single selected character!' WHERE entry=1022;
+UPDATE mangos_string SET content_default='Character \'%s\' (GUID: %u Account %u) can\'t be restored: account doesn\'t exist!' WHERE entry=1023;
+UPDATE mangos_string SET content_default='Character \'%s\' (GUID: %u Account %u) can\'t be restored: name already in use!' WHERE entry=1025;
+UPDATE mangos_string SET content_default='Command can only be called from a Remote Admin console.' WHERE entry=1029;
+UPDATE mangos_string SET content_default='Account %s (Id: %u) has been granted %u expansion rights.' WHERE entry=1100;
+UPDATE mangos_string SET content_default='Cannot add spawn because no free guids for static spawn in reserved guids range. Server restart is required before command can be used. Also look GuidReserveSize.* config options.' WHERE entry=1503;
diff --git a/sql/updates/0.17/12087_02_mangos_command.sql b/sql/updates/0.17/12087_02_mangos_command.sql
new file mode 100644
index 000000000..3b5e075ca
--- /dev/null
+++ b/sql/updates/0.17/12087_02_mangos_command.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12087_01_mangos_mangos_string required_12087_02_mangos_command bit;
+
+UPDATE command SET help='Syntax: .honor addkill\r\n\r\nAdd the targeted unit as one of your pvp kills today (you only get honor if it\'s a racial leader or a player)' WHERE name LIKE 'honor addkill';
diff --git a/sql/updates/0.17/12091_01_mangos_spell_template.sql b/sql/updates/0.17/12091_01_mangos_spell_template.sql
new file mode 100644
index 000000000..6570ce1f3
--- /dev/null
+++ b/sql/updates/0.17/12091_01_mangos_spell_template.sql
@@ -0,0 +1,5 @@
+ALTER TABLE db_version CHANGE COLUMN required_12087_02_mangos_command required_12091_01_mangos_spell_template bit;
+
+DELETE FROM spell_template WHERE id IN (26133);
+INSERT INTO spell_template VALUES
+(26133, 0x00000000, 101,  21,  76,  18,   0,   0, 180795, 0,     'Summon Sandworm Base');
diff --git a/sql/updates/0.17/12093_01_mangos_spell_template.sql b/sql/updates/0.17/12093_01_mangos_spell_template.sql
new file mode 100644
index 000000000..efd32aeb2
--- /dev/null
+++ b/sql/updates/0.17/12093_01_mangos_spell_template.sql
@@ -0,0 +1,12 @@
+ALTER TABLE db_version CHANGE COLUMN required_12091_01_mangos_spell_template required_12093_01_mangos_spell_template bit;
+
+DELETE FROM spell_template WHERE id IN (44920, 44924, 44928, 44932, 45158, 45162, 45166, 45170);
+INSERT INTO spell_template VALUES
+(44920, 0x00000000, 101,  21,   6,   1,   0,  56, 24941,  0,     'Model - Shattered Sun Marksman - BE Male Tier 4'),
+(44924, 0x00000000, 101,  21,   6,   1,   0,  56, 24945,  0,     'Model - Shattered Sun Marksman - BE Female Tier 4'),
+(44928, 0x00000000, 101,  21,   6,   1,   0,  56, 24949,  0,     'Model - Shattered Sun Marksman - Draenei Male Tier 4'),
+(44932, 0x00000000, 101,  21,   6,   1,   0,  56, 24953,  0,     'Model - Shattered Sun Marksman - Draenei Female Tier 4'),
+(45158, 0x00000000, 101,  21,   6,   1,   0,  56, 25119,  0,     'Model - Shattered Sun Warrior - BE Female Tier 4'),
+(45162, 0x00000000, 101,  21,   6,   1,   0,  56, 25123,  0,     'Model - Shattered Sun Warrior - BE Male Tier 4'),
+(45166, 0x00000000, 101,  21,   6,   1,   0,  56, 25127,  0,     'Model - Shattered Sun Warrior - Draenei Female Tier 4'),
+(45170, 0x00000000, 101,  21,   6,   1,   0,  56, 25131,  0,     'Model - Shattered Sun Warrior - Draenei Male Tier 4');
diff --git a/sql/updates/0.17/12094_01_mangos_creature_template.sql b/sql/updates/0.17/12094_01_mangos_creature_template.sql
new file mode 100644
index 000000000..542fe6e7c
--- /dev/null
+++ b/sql/updates/0.17/12094_01_mangos_creature_template.sql
@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_12093_01_mangos_spell_template required_12094_01_mangos_creature_template bit;
+
+UPDATE creature_template SET flags_extra=flags_extra|0x800;
diff --git a/sql/updates/0.17/12097_01_mangos_mangos_string.sql b/sql/updates/0.17/12097_01_mangos_mangos_string.sql
new file mode 100644
index 000000000..31eed3227
--- /dev/null
+++ b/sql/updates/0.17/12097_01_mangos_mangos_string.sql
@@ -0,0 +1,42 @@
+ALTER TABLE db_version CHANGE COLUMN required_12094_01_mangos_creature_template required_12097_01_mangos_mangos_string bit;
+
+DELETE FROM mangos_string WHERE entry BETWEEN 1600 AND 1636;
+
+INSERT INTO mangos_string VALUES
+(1600,'|cffffff00Northpass Tower has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1601,'|cffffff00Northpass Tower has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1602,'|cffffff00Crown Guard Tower has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1603,'|cffffff00Crown Guard Tower has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1604,'|cffffff00Eastwall Tower has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1605,'|cffffff00Eastwall Tower has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1606,'|cffffff00The Plaguewood Tower has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1607,'|cffffff00The Plaguewood Tower has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1608,'|cffffff00The Overlook has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1609,'|cffffff00The Overlook has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1610,'|cffffff00The Stadium has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1611,'|cffffff00The Stadium has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1612,'|cffffff00Broken Hill has been taken by the Horde!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1613,'|cffffff00Broken Hill has been taken by the Alliance!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1614,'|cffffff00The Horde has taken control of the East Beacon!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1615,'|cffffff00The Alliance has taken control of the East Beacon!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1616,'|cffffff00The Horde has taken control of the West Beacon!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1617,'|cffffff00The Alliance has taken control of the West Beacon!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1618,'|cffffff00The Horde has taken control of both beacons!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1619,'|cffffff00The Alliance has taken control of both beacons!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1620,'|cffffff00The Horde Field Scout is now issuing battle standards.|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1621,'|cffffff00The Alliance Field Scout is now issuing battle standards.|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1622,'|cffffff00The Horde has taken control of Twin Spire Ruins!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1623,'|cffffff00The Alliance has taken control of Twin Spire Ruins!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1624,'|cffffff00The Horde has taken control of a Spirit Tower!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1625,'|cffffff00The Alliance has taken control of a Spirit Tower!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1626,'|cffffff00The Horde has lost control of a Spirit Tower!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1627,'|cffffff00The Alliance has lost control of a Spirit Tower!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1628,'|cffffff00The Horde has taken control of The Bone Wastes!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1629,'|cffffff00The Alliance has taken control of The Bone Wastes!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1630,'|cffffff00The Horde is gaining control of Halaa!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1631,'|cffffff00The Alliance is gaining control of Halaa!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1632,'|cffffff00The Horde has taken control of Halaa!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1633,'|cffffff00The Alliance has taken control of Halaa!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1634,'|cffffff00Halaa is defenseless!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1635,'|cffffff00The Horde has collected 200 silithyst!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(1636,'|cffffff00The Alliance has collected 200 silithyst!|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/updates/12112_01_mangos_item_template.sql b/sql/updates/12112_01_mangos_item_template.sql
index a27c993a6..5addd387f 100644
--- a/sql/updates/12112_01_mangos_item_template.sql
+++ b/sql/updates/12112_01_mangos_item_template.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_12012_01_mangos_spell_template required_12112_01_mangos_item_template bit;
+ALTER TABLE db_version CHANGE COLUMN required_12097_01_mangos_mangos_string required_12112_01_mangos_item_template bit;
 
 ALTER TABLE `item_template` ADD COLUMN `Unknown` float NOT NULL AFTER `Flags2`;
 ALTER TABLE `item_template` ADD COLUMN `Unknown1` float NOT NULL AFTER `Unknown`;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 33de05992..c2d4754d0 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12134"
+ #define REVISION_NR "12135"
 #endif // __REVISION_NR_H__