diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 954fffb19..be4e65aab 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1994,6 +1994,9 @@ void Spell::SetTargetMap(uint32 effIndex,uint32 targetMode,UnitList& TagUnitMap)
             SpellTargetPosition const* st = sSpellMgr.GetSpellTargetPosition(m_spellInfo->Id);
             if(st)
             {
+                // teleportspells are handled in another way
+                if (m_spellInfo->Effect[effIndex] == SPELL_EFFECT_TELEPORT_UNITS)
+                    break;
                 if (st->target_mapId == m_caster->GetMapId())
                     m_targets.setDestination(st->target_X, st->target_Y, st->target_Z);
                 else
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 93fd9866e..ccd0b8d40 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 "8805"
+ #define REVISION_NR "8806"
 #endif // __REVISION_NR_H__