diff --git a/Cataclysm/Deadmines/AdmiralRipsnarl.lua b/Cataclysm/Deadmines/AdmiralRipsnarl.lua
index d4e62dc57..03fbffb5c 100644
--- a/Cataclysm/Deadmines/AdmiralRipsnarl.lua
+++ b/Cataclysm/Deadmines/AdmiralRipsnarl.lua
@@ -5,7 +5,7 @@
 local mod, CL = BigWigs:NewBoss("Admiral Ripsnarl", 36, 92)
 if not mod then return end
 mod:RegisterEnableMob(47626) -- Admiral Ripsnarl
-mod:SetEncounterID(1062)
+mod:SetEncounterID(mod:Retail() and 2979 or 1062)
 mod:SetRespawnTime(30)
 
 --------------------------------------------------------------------------------
@@ -32,6 +32,17 @@ function mod:GetOptions()
 end
 
 function mod:OnBossEnable()
+	if self:Retail() then
+		if self:Normal() then
+			self:SetEncounterID(2974)
+		else -- Heroic
+			self:SetEncounterID(2979)
+		end
+		-- no ENCOUNTER_END in Retail since 11.0.5
+		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
+		self:Death("Win", 47626) -- Admiral Ripsnarl
+	end
+
 	-- Admiral Ripsnarl
 	self:RegisterUnitEvent("UNIT_SPELLCAST_SUCCEEDED", nil, "boss1") -- Vanish
 	self:Log("SPELL_CAST_SUCCESS", "GoForTheThroat", 88836)
diff --git a/Cataclysm/Deadmines/Cookie.lua b/Cataclysm/Deadmines/Cookie.lua
index 8378dc312..0af0d1d73 100644
--- a/Cataclysm/Deadmines/Cookie.lua
+++ b/Cataclysm/Deadmines/Cookie.lua
@@ -5,7 +5,7 @@
 local mod, CL = BigWigs:NewBoss("Captain Cookie", 36, 93)
 if not mod then return end
 mod:RegisterEnableMob(47739) -- Cookie
-mod:SetEncounterID(1060)
+mod:SetEncounterID(mod:Retail() and 2978 or 1060)
 mod:SetRespawnTime(30)
 
 --------------------------------------------------------------------------------
@@ -21,6 +21,17 @@ function mod:GetOptions()
 end
 
 function mod:OnBossEnable()
+	if self:Retail() then
+		if self:Normal() then
+			self:SetEncounterID(2973)
+		else -- Heroic
+			self:SetEncounterID(2978)
+		end
+		-- no ENCOUNTER_END in Retail since 11.0.5
+		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
+		self:Death("Win", 47739) -- Cookie
+	end
+
 	self:Log("SPELL_CAST_SUCCESS", "CauldronFire", 89252) -- Throw Food (first one only)
 	self:Log("SPELL_AURA_APPLIED", "SatiatedApplied", 89267)
 	self:Log("SPELL_AURA_APPLIED_DOSE", "SatiatedApplied", 89267)
diff --git a/Cataclysm/Deadmines/FoeReaper5000.lua b/Cataclysm/Deadmines/FoeReaper5000.lua
index 16bb70648..22d23c068 100644
--- a/Cataclysm/Deadmines/FoeReaper5000.lua
+++ b/Cataclysm/Deadmines/FoeReaper5000.lua
@@ -5,7 +5,7 @@
 local mod, CL = BigWigs:NewBoss("Foe Reaper 5000", 36, 91)
 if not mod then return end
 mod:RegisterEnableMob(43778) -- Foe Reaper 5000
-mod:SetEncounterID(1063)
+mod:SetEncounterID(mod:Retail() and 2980 or 1063)
 mod:SetRespawnTime(30)
 mod:SetStage(1)
 
@@ -22,6 +22,17 @@ function mod:GetOptions()
 end
 
 function mod:OnBossEnable()
+	if self:Retail() then
+		if self:Normal() then
+			self:SetEncounterID(2975)
+		else -- Heroic
+			self:SetEncounterID(2980)
+		end
+		-- no ENCOUNTER_END in Retail since 11.0.5
+		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
+		self:Death("Win", 43778) -- Foe Reaper 5000
+	end
+
 	self:Log("SPELL_CAST_START", "Overdrive", 88481)
 	self:Log("SPELL_CAST_START", "Harvest", 88495)
 	self:Log("SPELL_CAST_SUCCESS", "SafetyRestrictionsOffline", 88522)
diff --git a/Cataclysm/Deadmines/Glubtok.lua b/Cataclysm/Deadmines/Glubtok.lua
index c97b78b32..88d67c42c 100644
--- a/Cataclysm/Deadmines/Glubtok.lua
+++ b/Cataclysm/Deadmines/Glubtok.lua
@@ -5,7 +5,7 @@
 local mod, CL = BigWigs:NewBoss("Glubtok", 36, 89)
 if not mod then return end
 mod:RegisterEnableMob(47162) -- Glubtok
-mod:SetEncounterID(1064)
+mod:SetEncounterID(mod:Retail() and 2981 or 1064)
 mod:SetRespawnTime(30)
 mod:SetStage(1)
 
@@ -27,6 +27,17 @@ function mod:GetOptions()
 end
 
 function mod:OnBossEnable()
+	if self:Retail() then
+		if self:Normal() then
+			self:SetEncounterID(2976)
+		else -- Heroic
+			self:SetEncounterID(2981)
+		end
+		-- no ENCOUNTER_END in Retail since 11.0.5
+		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
+		self:Death("Win", 47162) -- Glubtok
+	end
+
 	-- Stage One: Fists of Flame and Frost
 	self:Log("SPELL_CAST_START", "FistsOfFlame", 87859)
 	self:Log("SPELL_CAST_START", "FistsOfFrost", 87861)
diff --git a/Cataclysm/Deadmines/HelixGearbreaker.lua b/Cataclysm/Deadmines/HelixGearbreaker.lua
index 4790d6c2b..ecab3070f 100644
--- a/Cataclysm/Deadmines/HelixGearbreaker.lua
+++ b/Cataclysm/Deadmines/HelixGearbreaker.lua
@@ -5,7 +5,7 @@
 local mod, CL = BigWigs:NewBoss("Helix Gearbreaker", 36, 90)
 if not mod then return end
 mod:RegisterEnableMob(47296, 47297) -- Helix Gearbreaker, Lumbering Oaf
-mod:SetEncounterID(1065)
+mod:SetEncounterID(mod:Retail() and 2982 or 1065)
 mod:SetRespawnTime(30)
 mod:SetStage(1)
 
@@ -26,6 +26,17 @@ function mod:GetOptions()
 end
 
 function mod:OnBossEnable()
+	if self:Retail() then
+		if self:Normal() then
+			self:SetEncounterID(2977)
+		else -- Heroic
+			self:SetEncounterID(2982)
+		end
+		-- no ENCOUNTER_END in Retail since 11.0.5
+		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
+		self:Death("Win", 47296) -- Helix Gearbreaker
+	end
+
 	-- Lumbering Oaf
 	self:Log("SPELL_CAST_SUCCESS", "Charge", 88288) -- Oaf Smash
 	self:Death("LumberingOafDeath", 47297)
diff --git a/Cataclysm/Deadmines/VanessaVanCleef.lua b/Cataclysm/Deadmines/VanessaVanCleef.lua
index 8e0e14b6f..fd0b33b7a 100644
--- a/Cataclysm/Deadmines/VanessaVanCleef.lua
+++ b/Cataclysm/Deadmines/VanessaVanCleef.lua
@@ -39,6 +39,12 @@ function mod:GetOptions()
 end
 
 function mod:OnBossEnable()
+	if self:Retail() then
+		-- no ENCOUNTER_END in Retail since 11.0.5
+		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT", "CheckBossStatus")
+		self:Death("Win", 49541) -- Vanessa VanCleef
+	end
+
 	-- Autotalk
 	self:RegisterEvent("GOSSIP_SHOW")