diff --git a/src/client/protocolcodes.h b/src/client/protocolcodes.h
index 515e0a89..c5b6c688 100644
--- a/src/client/protocolcodes.h
+++ b/src/client/protocolcodes.h
@@ -102,6 +102,7 @@ namespace Proto {
         GameServerCreatureSkull             = 144,
         GameServerCreatureParty             = 145,
         GameServerCreatureUnpass            = 146,
+        GameServerCreatureMarks             = 147,
         GameServerPlayerHelpers             = 148,
         GameServerEditText                  = 150,
         GameServerEditList                  = 151,
diff --git a/src/client/protocolgame.h b/src/client/protocolgame.h
index 634c1633..477141de 100644
--- a/src/client/protocolgame.h
+++ b/src/client/protocolgame.h
@@ -215,6 +215,7 @@ private:
     void parseShowModalDialog(const InputMessagePtr& msg);
     void parseExtendedOpcode(const InputMessagePtr& msg);
     void parseChangeMapAwareRange(const InputMessagePtr& msg);
+    void parseCreaturesMark(const InputMessagePtr& msg);
 
 public:
     void setMapDescription(const InputMessagePtr& msg, int x, int y, int z, int width, int height);
diff --git a/src/client/protocolgameparse.cpp b/src/client/protocolgameparse.cpp
index 7a084b3d..42fa82ff 100644
--- a/src/client/protocolgameparse.cpp
+++ b/src/client/protocolgameparse.cpp
@@ -329,6 +329,10 @@ void ProtocolGame::parseMessage(const InputMessagePtr& msg)
             case Proto::GameServerPlayerHelpers:
                 parsePlayerHelpers(msg);
                 break;
+            // PROTOCOL>=1000
+            case Proto::GameServerCreatureMarks:
+                parseCreaturesMark(msg);
+                break;
             // otclient ONLY
             case Proto::GameServerExtendedOpcode:
                 parseExtendedOpcode(msg);
@@ -336,11 +340,6 @@ void ProtocolGame::parseMessage(const InputMessagePtr& msg)
             case Proto::GameServerChangeMapAwareRange:
                 parseChangeMapAwareRange(msg);
                 break;
-            // unknown
-            case 147: // proto >= 1000 ?
-                for(int i=0;i<19;++i)
-                    msg->getU8();
-                break;
             default:
                 stdext::throw_exception(stdext::format("unhandled opcode %d", (int)opcode));
                 break;
@@ -1674,6 +1673,28 @@ void ProtocolGame::parseChangeMapAwareRange(const InputMessagePtr& msg)
     g_lua.callGlobalField("g_game", "onMapChangeAwareRange", xrange, yrange);
 }
 
+void ProtocolGame::parseCreaturesMark(const InputMessagePtr& msg)
+{
+    int len = msg->getU8();
+    for(int i=0; i<len; ++i) {
+        uint32 id = msg->getU32();
+        bool isPermanent = msg->getU8() != 1;
+        uint8 markType = msg->getU8();
+
+        CreaturePtr creature = g_map.getCreatureById(id);
+        if(creature) {
+            if(isPermanent) {
+                if(markType == 0xff)
+                    creature->hideStaticSquare();
+                else
+                    creature->showStaticSquare(Color::from8bit(markType));
+            } else
+                creature->addTimedSquare(markType);
+        } else
+            g_logger.traceError("could not get creature");
+    }
+}
+
 void ProtocolGame::setMapDescription(const InputMessagePtr& msg, int x, int y, int z, int width, int height)
 {
     int startz, endz, zstep;
@@ -1906,14 +1927,22 @@ CreaturePtr ProtocolGame::getCreature(const InputMessagePtr& msg, int type)
         // emblem is sent only when the creature is not known
         int emblem = -1;
         bool unpass = true;
+        uint8 mark;
 
         if(g_game.getFeature(Otc::GameCreatureEmblems) && !known)
             emblem = msg->getU8();
 
         if(g_game.getFeature(Otc::GameThingMarks)) {
             msg->getU8(); // creature type for summons
-            msg->getU8(); // mark
+            uint8 mark = msg->getU8(); // mark
             msg->getU16(); // helpers
+
+            if(creature) {
+                if(mark == 0xff)
+                    creature->hideStaticSquare();
+                else
+                    creature->showStaticSquare(Color::from8bit(mark));
+            }
         }
 
         if(g_game.getProtocolVersion() >= 854)