diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
index ec1085d8a..c198785e8 100644
--- a/src/game/AchievementMgr.cpp
+++ b/src/game/AchievementMgr.cpp
@@ -614,7 +614,26 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     SetCriteriaProgress(achievementCriteria, 1);
                 break;
             }
+           case ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT:
+           case ACHIEVEMENT_CRITERIA_TYPE_ROLL_NEED_ON_LOOT:
+           {
+               // miscvalue1 = itemid
+               // miscvalue2 = diced value
+               if(!miscvalue1)
+                   continue;
+               if(miscvalue2 != achievementCriteria->roll_greed_on_loot.rollValue)
+                   continue;
+               ItemPrototype const *pProto = objmgr.GetItemPrototype( miscvalue1 );
 
+               uint32 requiredItemLevel = 0;
+               if (achievementCriteria->ID == 2412 || achievementCriteria->ID == 2358)
+                   requiredItemLevel = 185;
+
+               if(!pProto || pProto->ItemLevel <requiredItemLevel)
+                   continue;
+               SetCriteriaProgress(achievementCriteria, 1, true);
+               break;
+           }
         }
         if(IsCompletedCriteria(achievementCriteria))
             CompletedCriteria(achievementCriteria);
@@ -710,6 +729,9 @@ bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achieve
             return progress->counter >= achievementCriteria->gain_exalted_reputation.numberOfExaltedFactions;
         case ACHIEVEMENT_CRITERIA_TYPE_EXPLORE_AREA:
             return progress->counter >= 1;
+       case ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT:
+       case ACHIEVEMENT_CRITERIA_TYPE_ROLL_NEED_ON_LOOT:
+           return progress->counter >= achievementCriteria->roll_greed_on_loot.count;
 
         // handle all statistic-only criteria here
         case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND:
diff --git a/src/game/Group.cpp b/src/game/Group.cpp
index 8279f4c82..67e79bf47 100644
--- a/src/game/Group.cpp
+++ b/src/game/Group.cpp
@@ -727,6 +727,8 @@ void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers)
 
             if(player && player->GetSession())
             {
+                player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ROLL_NEED_ON_LOOT, roll->itemid, maxresul);
+
                 ItemPosCountVec dest;
                 LootItem *item = &(roll->getLoot()->items[roll->itemSlot]);
                 uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, roll->itemid, item->count );
@@ -772,6 +774,8 @@ void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers)
 
             if(player && player->GetSession())
             {
+                player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT, roll->itemid, maxresul);
+
                 ItemPosCountVec dest;
                 LootItem *item = &(roll->getLoot()->items[roll->itemSlot]);
                 uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, roll->itemid, item->count );
diff --git a/src/shared/Database/DBCStructure.h b/src/shared/Database/DBCStructure.h
index 39873ef9b..25b74b77a 100644
--- a/src/shared/Database/DBCStructure.h
+++ b/src/shared/Database/DBCStructure.h
@@ -325,6 +325,12 @@ struct AchievementCriteriaEntry
             uint32  rollValue;                              // 3
             uint32  count;                                  // 4
         } roll_need_on_loot;
+       // ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREEDON_LOOT= 51
+        struct
+        {
+            uint32  rollValue;                              // 3
+            uint32  count;                                  // 4
+        } roll_greed_on_loot;
 
         // ACHIEVEMENT_CRITERIA_TYPE_HK_CLASS = 52
         struct
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 84d9855a8..11595c659 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 "6998"
+ #define REVISION_NR "6999"
 #endif // __REVISION_NR_H__