diff -r 7e62f7060ecc src/game/SpellEffects.cpp
--- a/src/game/SpellEffects.cpp    Wed Mar 10 16:24:48 2010 +0100
+++ b/src/game/SpellEffects.cpp    Thu Mar 11 16:52:05 2010 +0200
@@ -496,9 +496,12 @@
                      // found Immolate or Shadowflame
                      if (aura)
                      {
-                        uint32 pdamage = aura->GetAmount() > 0 ? aura->GetAmount() : 0;
-                        pdamage = m_caster->SpellDamageBonus(unitTarget, aura->GetSpellProto(), pdamage, DOT, aura->GetBase()->GetStackAmount());
-                        damage += pdamage * aura->GetTotalTicks() * 60 / 100;
+  uint32 damagetick = aura->GetAmount() > 0 ? aura->GetAmount() : 0;
+  // Conflagrate DOT
+                        damagetick = m_caster->SpellDamageBonus(unitTarget, aura->GetSpellProto(), aura->GetBase()->GetStackAmount(), DOT);
+                        // Save value of further damage
+                        m_currentBasePoints[1] = damagetick * 2 / 3;
+                        damage += damagetick * 3;
                          apply_direct_bonus = false;
                          // Glyph of Conflagrate
                          if (!m_caster->HasAura(56235))