diff --git a/Classic/Stratholme/MalekiThePallid.lua b/Classic/Stratholme/MalekiThePallid.lua
index fbfe36355..46674c606 100644
--- a/Classic/Stratholme/MalekiThePallid.lua
+++ b/Classic/Stratholme/MalekiThePallid.lua
@@ -6,7 +6,7 @@ local mod, CL = BigWigs:NewBoss("Maleki the Pallid", 329, 453)
 if not mod then return end
 mod:RegisterEnableMob(10438) -- Maleki the Pallid
 mod:SetEncounterID(481)
---mod:SetRespawnTime(0)
+--mod:SetRespawnTime(0) resets, doesn't respawn
 
 --------------------------------------------------------------------------------
 -- Initialization
@@ -14,25 +14,49 @@ mod:SetEncounterID(481)
 
 function mod:GetOptions()
 	return {
-
+		{16869, "DISPEL"}, -- Ice Tomb
+		17620, -- Drain Life
 	}
 end
 
 function mod:OnBossEnable()
-	if self:Retail() then
-		self:RegisterEvent("ENCOUNTER_START") -- XXX no boss frames
+	self:Log("SPELL_CAST_START", "IceTomb", 16869)
+	self:Log("SPELL_AURA_APPLIED", "IceTombApplied", 16869)
+	self:Log("SPELL_CAST_SUCCESS", "DrainLife", 17620)
+	self:Log("SPELL_AURA_APPLIED", "DrainLifeApplied", 17620)
+	if self:Heroic() then -- no encounter events in Timewalking
+		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
+		self:Death("Win", 10438)
 	end
 end
 
 function mod:OnEngage()
+	self:CDBar(16869, 6.4) -- Ice Tomb
+	self:CDBar(17620, 12.4) -- Drain Life
 end
 
 --------------------------------------------------------------------------------
 -- Event Handlers
 --
 
-function mod:ENCOUNTER_START(_, id) -- XXX no boss frames
-	if id == self.engageId then
-		self:Engage()
+function mod:IceTomb(args)
+	self:Message(args.spellId, "red", CL.casting:format(args.spellName))
+	self:CDBar(args.spellId, 12.1)
+	self:PlaySound(args.spellId, "alert")
+end
+
+function mod:IceTombApplied(args)
+	if self:Me(args.destGUID) or self:Dispeller("magic", nil, args.spellId) then
+		self:TargetMessage(args.spellId, "yellow", args.destName)
+		self:PlaySound(args.spellId, "warning", nil, args.destName)
 	end
 end
+
+function mod:DrainLife(args)
+	self:CDBar(args.spellId, 17.0)
+end
+
+function mod:DrainLifeApplied(args)
+	self:Message(args.spellId, "orange", CL.casting:format(args.spellName))
+	self:PlaySound(args.spellId, "alert")
+end
diff --git a/Classic/Stratholme/Options/Colors.lua b/Classic/Stratholme/Options/Colors.lua
index 0ca575085..cdc8d3597 100644
--- a/Classic/Stratholme/Options/Colors.lua
+++ b/Classic/Stratholme/Options/Colors.lua
@@ -33,6 +33,8 @@ BigWigs:AddColors("Nerub'enkan", {
 })
 
 BigWigs:AddColors("Maleki the Pallid", {
+	[16869] = {"blue","red","yellow"},
+	[17620] = "orange",
 })
 
 BigWigs:AddColors("Magistrate Barthilas", {
diff --git a/Classic/Stratholme/Options/Sounds.lua b/Classic/Stratholme/Options/Sounds.lua
index c236740e4..fbfbf0ade 100644
--- a/Classic/Stratholme/Options/Sounds.lua
+++ b/Classic/Stratholme/Options/Sounds.lua
@@ -33,6 +33,8 @@ BigWigs:AddSounds("Nerub'enkan", {
 })
 
 BigWigs:AddSounds("Maleki the Pallid", {
+	[16869] = {"alert","warning"},
+	[17620] = "alert",
 })
 
 BigWigs:AddSounds("Magistrate Barthilas", {