5 files changed, 55 insertions, 0 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index fbbbf44c77f..1ff50664213 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -312,6 +312,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_captured_sunhawk_agent' WHERE `
 UPDATE `creature_template` SET `ScriptName`='npc_surristrasz' WHERE `entry`=24795;
 UPDATE `creature_template` SET `ScriptName`='npc_tiare' WHERE `entry`=30051;
 UPDATE `creature_template` SET `ScriptName`='npc_sinkhole_kill_credit' WHERE `entry` IN (26248,26249);
+UPDATE `creature_template` SET `ScriptName`='npc_khunok_the_behemoth' WHERE (`entry`='25862');
 
 /* BURNING STEPPES */
 UPDATE `creature_template` SET `ScriptName`='npc_ragged_john' WHERE `entry`=9563;
@@ -1069,6 +1070,10 @@ UPDATE `creature_template` SET `ScriptName`='do_nothing' WHERE `entry`=24187;
 UPDATE `creature_template` SET `ScriptName`='mob_zuljin_vortex' WHERE `entry`=24136;
 UPDATE `creature_template` SET `ScriptName`='npc_zulaman_hostage' WHERE `entry` IN (23790, 23999, 24024, 24001);
 
+/* ZUL'DRAK */
+UPDATE `creature_template` SET `ScriptName`='npc_captured_rageclaw' WHERE (`entry`='29686');
+UPDATE `creature_template` SET `ScriptName`='npc_drakuru_shackles' WHERE (`entry`='29700');
+
 /* ZUL'FARRAK */
 UPDATE `creature_template` SET `ScriptName`='npc_sergeant_bly' WHERE `entry`=7604;
 UPDATE `creature_template` SET `ScriptName`='npc_weegli_blastfuse' WHERE `entry`=7607;
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql
index 667b2346950..bf8c94b7227 100644
--- a/sql/FULL/world_spell_full.sql
+++ b/sql/FULL/world_spell_full.sql
@@ -483,6 +483,10 @@ INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
 ('48714', '2', '27236'),
 ('57806', '2', '31043');
 
+--- Zul'Drak
+DELETE FROM `spell_script_target` WHERE `entry` IN (55083,55223,59951,59952);
+INSERT INTO `spell_script_target` VALUES (55083, 1, 29700),(55223, 1, 29686),(59951, 1, 29686),(59952, 1, 29686);
+
 -- --------
 -- POSITION
 -- --------
diff --git a/sql/FULL/world_tmp_full.sql b/sql/FULL/world_tmp_full.sql
index 8b9e65d3f65..71e7749f201 100644
--- a/sql/FULL/world_tmp_full.sql
+++ b/sql/FULL/world_tmp_full.sql
@@ -1,3 +1,6 @@
+--- Khunok Will Know ----
+UPDATE `quest_template` SET `SrcSpell`='46232' WHERE (`entry`='11878');
+
 -- --------
 -- TRIGGER
 -- --------
diff --git a/sql/updates/4549_world_script.sql b/sql/updates/4549_world_script.sql
new file mode 100644
index 00000000000..88c24c3659d
--- /dev/null
+++ b/sql/updates/4549_world_script.sql
@@ -0,0 +1,4 @@
+UPDATE `creature_template` SET `ScriptName`='npc_khunok_the_behemoth' WHERE (`entry`='25862');
+
+--- DB CONTENT ----
+UPDATE `quest_template` SET `SrcSpell`='46232' WHERE (`entry`='11878');
diff --git a/src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp b/src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp
index c45ef53a81a..7a8a2de4a39 100644
--- a/src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp
+++ b/src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp
@@ -197,6 +197,40 @@ CreatureAI* GetAI_npc_sinkhole_kill_credit(Creature* pCreature)
     return new npc_sinkhole_kill_creditAI(pCreature);
 }
 
+/*######
+## npc_khunok_the_behemoth
+######*/
+
+struct TRINITY_DLL_DECL npc_khunok_the_behemothAI : public ScriptedAI
+{
+    npc_khunok_the_behemothAI(Creature *c) : ScriptedAI(c) {}
+
+    void MoveInLineOfSight(Unit *who)
+    {
+        ScriptedAI::MoveInLineOfSight(who);
+
+        if(who->GetTypeId() != TYPEID_UNIT)
+            return;
+
+        if(who->GetEntry() == 25861 && me->IsWithinDistInMap(who, 10.0f))
+        {
+            if(Unit *owner = who->GetOwner())
+            {
+                if(owner->GetTypeId() == TYPEID_PLAYER)
+                {
+                    DoCast(owner, 46231, true);
+                    ((Creature*)who)->ForcedDespawn();
+                }
+            }
+        }
+    }
+};
+
+CreatureAI* GetAI_npc_khunok_the_behemoth(Creature *_Creature)
+{
+    return new npc_khunok_the_behemothAI(_Creature);
+}
+
 void AddSC_borean_tundra()
 {
     Script *newscript;
@@ -217,4 +251,9 @@ void AddSC_borean_tundra()
     newscript->Name="npc_sinkhole_kill_credit";
     newscript->GetAI = &GetAI_npc_sinkhole_kill_credit;
     newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name="npc_khunok_the_behemoth";
+    newscript->GetAI = &GetAI_npc_khunok_the_behemoth;
+    newscript->RegisterSelf();
 }