diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java b/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java
index 8c7cf099d..9745af86a 100644
--- a/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java
+++ b/src/main/java/com/gmail/nossr50/skills/gathering/Mining.java
@@ -85,6 +85,12 @@ public class Mining {
                 Misc.dropItem(location, item);
             }
             break;
+            
+        case EMERALD_ORE:
+            if (configInstance.getEmeraldDoubleDropsEnabled()) {
+                Misc.dropItem(location, item);
+            }
+            break;
 
         default:
             if (ModChecks.isCustomMiningBlock(block)) {
@@ -194,6 +200,13 @@ public class Mining {
                 Misc.dropItem(location, item);
             }
             break;
+        
+        case EMERALD_ORE:
+            if (configInstance.getEmeraldDoubleDropsEnabled()) {
+                item = new ItemStack(Material.EMERALD);
+                Misc.dropItem(location, item);
+            }
+            break;
 
         default:
             if (ModChecks.isCustomMiningBlock(block)) {
@@ -279,6 +292,10 @@ public class Mining {
         case STONE:
             xp += Config.getInstance().getMiningXPStone();
             break;
+            
+        case EMERALD_ORE:
+            xp += Config.getInstance().getMiningXPEmeraldOre();
+            break;
 
         default:
             if (ModChecks.isCustomMiningBlock(block)) {
@@ -367,6 +384,7 @@ public class Mining {
             case GOLD_ORE:
             case LAPIS_ORE:
             case REDSTONE_ORE:
+            case EMERALD_ORE;
                 if (tier < 3) {
                     return;
                 }