diff --git a/sql/updates/world/2016_08_20_00_world_from_335_was_2016_08_18_00_world.sql b/sql/updates/world/2016_08_20_00_world_from_335_was_2016_08_18_00_world.sql
new file mode 100644
index 00000000000..c0ea18c2775
--- /dev/null
+++ b/sql/updates/world/2016_08_20_00_world_from_335_was_2016_08_18_00_world.sql
@@ -0,0 +1,17 @@
+-- 
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=16014;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=16014 AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES 
+(16014, 0, 0, 1, 62, 0, 100, 0, 7083, 0, 0, 0, 11, 27754, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Mux Manascrambler - On Gossip Option 0 Selected - Cast Create Extra-Dimensional Ghost Revealer'),
+(16014, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Mux Manascrambler - On Gossip Option 0 Selected - Close Gossip');
+
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=7083 AND `id`=0;
+INSERT INTO `gossip_menu_option` (`menu_id`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `box_text`) VALUES 
+(7083, 'I seem to have misplaced the distiller, Mux.  Did I happen to leave it here?', 11908, 1, 1, NULL);
+
+DELETE FROM `conditions` WHERE  `SourceTypeOrReferenceId`=15 AND `SourceGroup`=7083 AND `SourceEntry`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(15, 7083, 0, 0, 0, 2, 0, 22115, 1, 0, 1, 0, 0, '', 'Show gossip option if player does not have Extra-Dimensional Ghost Revealer'),
+(15, 7083, 0, 0, 0, 8, 0, 8978, 0, 0, 0, 0, 0, '', 'Show gossip menu option if only player has \'Return to Mokvar\' quest Horde rewarded'),
+(15, 7083, 0, 0, 1, 2, 0, 22115, 1, 0, 1, 0, 0, '', 'Show gossip option if player does not have Extra-Dimensional Ghost Revealer'),
+(15, 7083, 0, 0, 1, 8, 0, 8977, 0, 0, 0, 0, 0, '', 'Show gossip menu option if only player has \'Return to Deliana\' quest Alliance rewarded');
diff --git a/sql/updates/world/2016_08_20_01_world_from_335_was_2016_08_19_00_world.sql b/sql/updates/world/2016_08_20_01_world_from_335_was_2016_08_19_00_world.sql
new file mode 100644
index 00000000000..208482f7d89
--- /dev/null
+++ b/sql/updates/world/2016_08_20_01_world_from_335_was_2016_08_19_00_world.sql
@@ -0,0 +1,2 @@
+-- fix Rider of the Unholy / Blood / Frost (issue #17817)
+UPDATE `smart_scripts` SET `target_type`=27 WHERE `source_type`=0 AND `entryorguid` IN (30954,30956,30953) AND `action_type`=33;
diff --git a/sql/updates/world/2016_08_20_02_world_from_335_was_2016_08_19_01_world.sql b/sql/updates/world/2016_08_20_02_world_from_335_was_2016_08_19_01_world.sql
new file mode 100644
index 00000000000..2cdb65bdeb3
--- /dev/null
+++ b/sql/updates/world/2016_08_20_02_world_from_335_was_2016_08_19_01_world.sql
@@ -0,0 +1,2 @@
+-- remove old (never used) param values from _CAST and _INVOKER_CAST
+UPDATE `smart_scripts` SET `action_param3`=0,`action_param4`=0,`action_param5`=0,`action_param6`=0 WHERE `action_type` IN (11,85);
diff --git a/sql/updates/world/2016_08_20_03_world_from_335_was_2016_08_19_02_world.sql b/sql/updates/world/2016_08_20_03_world_from_335_was_2016_08_19_02_world.sql
new file mode 100644
index 00000000000..261f3317835
--- /dev/null
+++ b/sql/updates/world/2016_08_20_03_world_from_335_was_2016_08_19_02_world.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `smart_scripts` SET `action_param2`=1 WHERE `action_type`=7;
+UPDATE `smart_scripts` SET `action_param2`=0 WHERE `source_type`=0 AND `entryorguid`=11216 AND `id`=3;
diff --git a/sql/updates/world/2016_08_20_04_world_from_335_was_2016_08_19_03_world.sql b/sql/updates/world/2016_08_20_04_world_from_335_was_2016_08_19_03_world.sql
new file mode 100644
index 00000000000..b10a117e6e9
--- /dev/null
+++ b/sql/updates/world/2016_08_20_04_world_from_335_was_2016_08_19_03_world.sql
@@ -0,0 +1,2 @@
+-- add AI to bloodworms to make them not stupid and suicidal
+UPDATE `creature_template` SET `ScriptName`='npc_pet_dk_guardian', `AIName`='' WHERE `entry` IN (26125,28017);