diff --git a/Classic/Stratholme/Nerubenkan.lua b/Classic/Stratholme/Nerubenkan.lua
index ee7a2e669..daf45e3a3 100644
--- a/Classic/Stratholme/Nerubenkan.lua
+++ b/Classic/Stratholme/Nerubenkan.lua
@@ -6,7 +6,7 @@ local mod, CL = BigWigs:NewBoss("Nerub'enkan", 329, 452)
 if not mod then return end
 mod:RegisterEnableMob(10437) -- Nerub'enkan
 mod:SetEncounterID(480)
---mod:SetRespawnTime(0)
+--mod:SetRespawnTime(0) resets, doesn't respawn
 
 --------------------------------------------------------------------------------
 -- Initialization
@@ -14,25 +14,58 @@ mod:SetEncounterID(480)
 
 function mod:GetOptions()
 	return {
-
+		17235, -- Raise Undead Scarab
+		{6016, "TANK"}, -- Pierce Armor
+		{4962, "DISPEL"}, -- Encasing Webs
 	}
 end
 
 function mod:OnBossEnable()
-	if self:Retail() then
-		self:RegisterEvent("ENCOUNTER_START") -- XXX no boss frames
+	self:Log("SPELL_CAST_START", "RaiseUndeadScarab", 17235)
+	self:Log("SPELL_CAST_SUCCESS", "PierceArmor", 6016)
+	self:Log("SPELL_CAST_SUCCESS", "EncasingWebs", 4962)
+	self:Log("SPELL_AURA_APPLIED", "EncasingWebsApplied", 4962)
+	if self:Heroic() then -- no encounter events in Timewalking
+		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
+		self:Death("Win", 10437)
 	end
 end
 
 function mod:OnEngage()
+	self:CDBar(4962, 6.1) -- Encasing Webs
+	self:CDBar(6016, 8.0) -- Pierce Armor
+	self:CDBar(17235, 8.5) -- Raise Undead Scarab
 end
 
 --------------------------------------------------------------------------------
 -- Event Handlers
 --
 
-function mod:ENCOUNTER_START(_, id) -- XXX no boss frames
-	if id == self.engageId then
-		self:Engage()
+function mod:RaiseUndeadScarab(args)
+	self:Message(args.spellId, "cyan")
+	self:CDBar(args.spellId, 27.9)
+	self:PlaySound(args.spellId, "info")
+end
+
+function mod:PierceArmor(args)
+	self:Message(args.spellId, "purple")
+	self:CDBar(args.spellId, 8.0)
+	self:PlaySound(args.spellId, "alert")
+end
+
+function mod:EncasingWebs(args)
+	-- also cast by trash
+	if self:MobId(args.sourceGUID) == 10437 then -- Nerub'enkan
+		self:CDBar(args.spellId, 10.9)
+	end
+end
+
+function mod:EncasingWebsApplied(args)
+	-- also cast by trash
+	if self:MobId(args.sourceGUID) == 10437 then -- Nerub'enkan
+		if self:Me(args.destGUID) or self:Dispeller("magic", nil, args.spellId) or self:Dispeller("movement", nil, args.spellId) then
+			self:TargetMessage(args.spellId, "yellow", args.destName)
+			self:PlaySound(args.spellId, "alarm", nil, args.destName)
+		end
 	end
 end
diff --git a/Classic/Stratholme/Options/Colors.lua b/Classic/Stratholme/Options/Colors.lua
index bd5d6d4ff..0ca575085 100644
--- a/Classic/Stratholme/Options/Colors.lua
+++ b/Classic/Stratholme/Options/Colors.lua
@@ -27,6 +27,9 @@ BigWigs:AddColors("Baroness Anastari", {
 })
 
 BigWigs:AddColors("Nerub'enkan", {
+	[4962] = {"blue","yellow"},
+	[6016] = "purple",
+	[17235] = "cyan",
 })
 
 BigWigs:AddColors("Maleki the Pallid", {
diff --git a/Classic/Stratholme/Options/Sounds.lua b/Classic/Stratholme/Options/Sounds.lua
index b5b0b99b9..c236740e4 100644
--- a/Classic/Stratholme/Options/Sounds.lua
+++ b/Classic/Stratholme/Options/Sounds.lua
@@ -27,6 +27,9 @@ BigWigs:AddSounds("Baroness Anastari", {
 })
 
 BigWigs:AddSounds("Nerub'enkan", {
+	[4962] = "alarm",
+	[6016] = "alert",
+	[17235] = "info",
 })
 
 BigWigs:AddSounds("Maleki the Pallid", {