diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp
index e2a9b69f0..f44f1dc85 100644
--- a/src/game/WorldSocket.cpp
+++ b/src/game/WorldSocket.cpp
@@ -174,11 +174,11 @@ int WorldSocket::SendPacket (const WorldPacket& pct)
     {
         // Put the packet on the buffer.
         if (m_OutBuffer->copy ((char*) header.header, header.getHeaderLength()) == -1)
-            ACE_ASSERT (false);
+            MANGOS_ASSERT (false);
 
         if (!pct.empty ())
             if (m_OutBuffer->copy ((char*) pct.contents (), pct.size ()) == -1)
-                ACE_ASSERT (false);
+                MANGOS_ASSERT (false);
     }
     else
     {
@@ -466,9 +466,9 @@ int WorldSocket::Update (void)
 
 int WorldSocket::handle_input_header (void)
 {
-    ACE_ASSERT (m_RecvWPct == NULL);
+    MANGOS_ASSERT (m_RecvWPct == NULL);
 
-    ACE_ASSERT (m_Header.length () == sizeof (ClientPktHeader));
+    MANGOS_ASSERT (m_Header.length () == sizeof (ClientPktHeader));
 
     m_Crypt.DecryptRecv ((uint8*) m_Header.rd_ptr (), sizeof (ClientPktHeader));
 
@@ -497,7 +497,7 @@ int WorldSocket::handle_input_header (void)
     }
     else
     {
-        ACE_ASSERT(m_RecvPct.space() == 0);
+        MANGOS_ASSERT(m_RecvPct.space() == 0);
     }
 
     return 0;
@@ -508,9 +508,9 @@ int WorldSocket::handle_input_payload (void)
     // set errno properly here on error !!!
     // now have a header and payload
 
-    ACE_ASSERT (m_RecvPct.space () == 0);
-    ACE_ASSERT (m_Header.space () == 0);
-    ACE_ASSERT (m_RecvWPct != NULL);
+    MANGOS_ASSERT (m_RecvPct.space () == 0);
+    MANGOS_ASSERT (m_Header.space () == 0);
+    MANGOS_ASSERT (m_RecvWPct != NULL);
 
     const int ret = ProcessIncoming (m_RecvWPct);
 
@@ -564,7 +564,7 @@ int WorldSocket::handle_input_missing_data (void)
             if (m_Header.space () > 0)
             {
                 // Couldn't receive the whole header this time.
-                ACE_ASSERT (message_block.length () == 0);
+                MANGOS_ASSERT (message_block.length () == 0);
                 errno = EWOULDBLOCK;
                 return -1;
             }
@@ -572,7 +572,7 @@ int WorldSocket::handle_input_missing_data (void)
             // We just received nice new header
             if (handle_input_header () == -1)
             {
-                ACE_ASSERT ((errno != EWOULDBLOCK) && (errno != EAGAIN));
+                MANGOS_ASSERT ((errno != EWOULDBLOCK) && (errno != EAGAIN));
                 return -1;
             }
         }
@@ -598,7 +598,7 @@ int WorldSocket::handle_input_missing_data (void)
             if (m_RecvPct.space () > 0)
             {
                 // Couldn't receive the whole data this time.
-                ACE_ASSERT (message_block.length () == 0);
+                MANGOS_ASSERT (message_block.length () == 0);
                 errno = EWOULDBLOCK;
                 return -1;
             }
@@ -607,7 +607,7 @@ int WorldSocket::handle_input_missing_data (void)
         //just received fresh new payload
         if (handle_input_payload () == -1)
         {
-            ACE_ASSERT ((errno != EWOULDBLOCK) && (errno != EAGAIN));
+            MANGOS_ASSERT ((errno != EWOULDBLOCK) && (errno != EAGAIN));
             return -1;
         }
     }
@@ -656,7 +656,7 @@ int WorldSocket::schedule_wakeup_output (GuardType& g)
 
 int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
 {
-    ACE_ASSERT (new_pct);
+    MANGOS_ASSERT (new_pct);
 
     // manage memory ;)
     ACE_Auto_Ptr<WorldPacket> aptr (new_pct);
diff --git a/src/game/WorldSocketMgr.cpp b/src/game/WorldSocketMgr.cpp
index 634cf1505..c1e7ae9ea 100644
--- a/src/game/WorldSocketMgr.cpp
+++ b/src/game/WorldSocketMgr.cpp
@@ -154,7 +154,7 @@ class ReactorRunnable : protected ACE_Task_Base
 
             WorldDatabase.ThreadStart ();
 
-            ACE_ASSERT (m_Reactor);
+            MANGOS_ASSERT (m_Reactor);
 
             SocketSet::iterator i, t;
 
@@ -353,7 +353,7 @@ WorldSocketMgr::OnSocketOpen (WorldSocket* sock)
     // we skip the Acceptor Thread
     size_t min = 1;
 
-    ACE_ASSERT (m_NetThreadsCount >= 1);
+    MANGOS_ASSERT (m_NetThreadsCount >= 1);
 
     for (size_t i = 1; i < m_NetThreadsCount; ++i)
         if (m_NetThreads[i].Connections () < m_NetThreads[min].Connections ())
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index b9711fb25..a348ae3af 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 "10613"
+ #define REVISION_NR "10614"
 #endif // __REVISION_NR_H__