diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 786bd2e60..c53452e5a 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -3313,6 +3313,10 @@ void Aura::HandleAuraModStun(bool apply, bool Real)
     if(!Real)
         return;
 
+    // Frost stun aura -> freeze/unfreeze target
+    if (GetSpellSchoolMask(m_spellProto) & SPELL_SCHOOL_MASK_FROST)
+        m_target->ModifyAuraState(AURA_STATE_FROZEN, apply);
+
     if (apply)
     {
         m_target->addUnitState(UNIT_STAT_STUNNED);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 1be10ef40..1e66c4fa7 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7316"
+ #define REVISION_NR "7317"
 #endif // __REVISION_NR_H__