diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index b6aa9337c..8c96febbc 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1619,6 +1619,8 @@ float Map::GetHeight(float x, float y, float z, bool pUseVmaps) const
     }
 }
 
+#include "World.h"
+
 uint16 Map::GetAreaFlag(float x, float y, float z) const
 {
     uint16 areaflag;
@@ -1646,7 +1648,13 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const
         case 1593:
         case 2484:
         case 2492:
-            if( (x < 6116 && x > 5568) && (y < 982 && y > 282) && z > 563.0f) areaflag = 2153; break;
+            if (x > 5568.0f && x < 6116.0f && y > 282.0f && y < 982.0f && z > 563.0f) areaflag = 2153; break;
+        // Maw of Neltharion (cave)
+        case 164:                                           // Dragonblight
+        case 1797:                                          // Obsidian Dragonshrine (Dragonblight)
+        case 1827:                                          // Wintergrasp
+        case 2591:                                          // The Cauldron of Flames (Wintergrasp)
+            if (x > 4364.0f && x < 4632.0f && y > 1545.0f && y < 1886.0f && z < 200.0f) areaflag = 1853; break;
     }
 
     return areaflag;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 5413e7c48..c06f87436 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 "7555"
+ #define REVISION_NR "7556"
 #endif // __REVISION_NR_H__