diff --git a/ACID/acid_tbc.sql b/ACID/acid_tbc.sql
index d874b2e5e..0aa1b6dd5 100644
--- a/ACID/acid_tbc.sql
+++ b/ACID/acid_tbc.sql
@@ -28933,14 +28933,11 @@ INSERT INTO `creature_ai_scripts` (`id`,`creature_id`,`event_type`,`event_invers
 -- Ossirian the Unscarred (15339) - boss_ossirian
 -- Moam (15340) - boss_moam
 -- General Rajaxx 15341
-('1534101','15341','9','0','100','1025','0','5','7000','9000','0','0','11','6713','4','0','0','0','0','0','0','0','0','0','General Rajaxx - Cast Disarm'),
-('1534102','15341','0','0','100','1025','12000','18000','16000','21000','0','0','11','25599','0','0','0','0','0','0','0','0','0','0','General Rajaxx - Cast Thundercrash'),
-('1534103','15341','0','0','100','1025','30000','60000','45000','60000','0','0','13','-99','1','0','1','11067','0','0','0','0','0','0','General Rajaxx - Drop Aggro and Yell'),
-('1534104','15341','9','0','100','1025','50','120','8000','12000','0','0','11','20477','9','0','0','0','0','0','0','0','0','0','General Rajaxx - Cast Summon Player'),
-('1534105','15341','0','0','100','1025','600000','600000','120000','120000','0','0','11','8269','0','0','1','1191','0','0','0','0','0','0','General Rajaxx - Cast Frenzy after 10 Minutes'),
-('1534106','15341','6','0','100','0','0','0','0','0','0','0','1','11434','0','0','0','0','0','0','0','0','0','0','General Rajaxx - Yell on Death'),
-('1534107','15341','11','0','100','0','0','0','0','0','0','0','11','18943','0','34','0','0','0','0','0','0','0','0','General Rajaxx - Cast Double Attack on Spawn'),
-('1534108','-155940','29','0','100','1','0','0','300000','300000','0','0','54','11429','0','0','18','832','0','0','0','0','0','0','General Rajaxx (War Effort) (Guid EAI) - Yell, Set UnitFlags on Spawn'),
+('1534101','15341','36','0','100','1025','50','120','8000','12000','0','0','11','20477','9','0','0','0','0','0','0','0','0','0','General Rajaxx - Cast Summon Player when unreachable'),
+('1534102','15341','11','0','100','0','0','0','0','0','0','0','11','18943','0','34','0','0','0','0','0','0','0','0','General Rajaxx - Cast Double Attack on Spawn'),
+('1534103','15341','6','0','100','0','0','0','0','0','0','0','1','11434','0','0','0','0','0','0','0','0','0','0','General Rajaxx - Yell on Death'),
+('1534104','15341','5','0','100','1025','5000','5000','1','0','0','0','1','11067','0','0','1','11433','0','0','0','0','0','0','General Rajaxx - Yell on Player Kill'),
+('1534105','-155940','29','0','100','1','0','0','300000','300000','0','0','54','11429','0','0','18','832','0','0','0','0','0','0','General Rajaxx (War Effort) (Guid EAI) - Yell, Set UnitFlags on Spawn'),
 -- Qiraji Swarmguard 15343
 ('1534301','15343','0','0','100','1025','0','10000','4000','12000','0','0','11','25174','1','0','0','0','0','0','0','0','0','0','Qiraji Swarmguard - Cast Sundering Cleave'),
 ('1534302','15343','0','0','100','1025','5000','15000','6000','18000','0','0','11','25175','15','0','0','0','0','0','0','0','0','0','Qiraji Swarmguard - Cast Triple Attack'),
diff --git a/Updates/0534_general_rajaxx.sql b/Updates/0534_general_rajaxx.sql
new file mode 100644
index 000000000..5b02194f0
--- /dev/null
+++ b/Updates/0534_general_rajaxx.sql
@@ -0,0 +1,19 @@
+UPDATE broadcast_text SET SoundEntriesId1=8604,ChatTypeID=1 WHERE Id IN(11433);
+
+DELETE FROM `creature_spell_list` WHERE `Id` IN (1534100);
+INSERT INTO `creature_spell_list` (`Id`, `Position`, `SpellId`, `InitialMin`, `InitialMax`, `RepeatMin`, `RepeatMax`, `Flags`, `TargetId`, `ScriptId`, `Availability`, `Probability`, `Comments`) VALUES
+(1534100, 0, 6713, 7000, 9000, 7000, 9000, 0, 100, 0, 100, 2, 'General Rajaxx - Disarm on Random Player'),
+(1534100, 1, 25599, '12000','18000','16000','21000', 0, 0, 0, 100, 2, 'General Rajaxx - Thundercrash'),
+(1534100, 2, 8269, '600000','600000','120000','120000', 0, 0, 9005, 100, 2, 'General Rajaxx - Enrage');
+
+DELETE FROM `creature_spell_list_entry` WHERE `Id` IN (1534100);
+INSERT INTO `creature_spell_list_entry` VALUES
+(1534100, 'AQ20 - General Rajaxx', 0, 0);
+
+UPDATE `creature_template` SET `SpellList`=1534100 WHERE `entry` IN (15341);
+
+DELETE FROM dbscripts_on_relay WHERE Id IN(9005) AND command=0;
+INSERT INTO dbscripts_on_relay(id, delay, priority, command, datalong, datalong2, datalong3, buddy_entry, search_radius, data_flags, dataint, dataint2, dataint3, dataint4, datafloat, x, y, z, o, speed, condition_id, comments) VALUES
+('9005', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1191', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', 'General Rajaxx - Say Frenzy');
+
+