diff --git a/sql/updates/6953_world_trinity_string.sql b/sql/updates/6953_world_trinity_string.sql
new file mode 100644
index 0000000000..aa6dede9ec
--- /dev/null
+++ b/sql/updates/6953_world_trinity_string.sql
@@ -0,0 +1,3 @@
+DELETE FROM `trinity_string` WHERE `entry`=5021;
+INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES (5021, 'Armor: %u');
+
diff --git a/sql/world.sql b/sql/world.sql
index 1c99fd1184..ab5ef58457 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -7657,6 +7657,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_
 (5018, '[Heroic reset time: %s]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (5019, '[Mountable]', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (5020, 'Phasemask: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(5021, 'Armor: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (6613, '|cfff00000[GM Announcement]: %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (6614, 'Notification to GM''s - ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
 (6615, '|cffffff00[|c1f40af20GM Announce by|r |cffff0000%s|cffffff00]:|r %s|r', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
diff --git a/src/game/Language.h b/src/game/Language.h
index 617b7f8c01..4ccafe552d 100644
--- a/src/game/Language.h
+++ b/src/game/Language.h
@@ -886,7 +886,8 @@ enum TrinityStrings
     LANG_HEROIC                         = 5018,
     LANG_MOUNTABLE                      = 5019,
     LANG_NPCINFO_PHASEMASK              = 5020,
-    // Room for more Trinity strings      5021-9999
+    LANG_NPCINFO_ARMOR                  = 5021,
+    // Room for more Trinity strings      5022-9999
     // Used for GM Announcements
     LANG_GM_BROADCAST                    = 6613,
     LANG_GM_NOTIFY                       = 6614,
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index 7aee776c71..1a91b770ce 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -4612,6 +4612,7 @@ bool ChatHandler::HandleNpcInfoCommand(const char* /*args*/)
     PSendSysMessage(LANG_NPCINFO_LOOT,  cInfo->lootid,cInfo->pickpocketLootId,cInfo->SkinLootId);
     PSendSysMessage(LANG_NPCINFO_DUNGEON_ID, target->GetInstanceId());
     PSendSysMessage(LANG_NPCINFO_PHASEMASK, target->GetPhaseMask());
+    PsendSysMessage(LANG_NPCINFO_ARMOR, target->GetArmor());
     PSendSysMessage(LANG_NPCINFO_POSITION,float(target->GetPositionX()), float(target->GetPositionY()), float(target->GetPositionZ()));
     if(const CreatureData* const linked = target->GetLinkedRespawnCreatureData())
         if(CreatureInfo const *master = GetCreatureInfo(linked->id))