diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50d045c5a..11fd7f380 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Refined Storage Changelog
 
 ### 1.5.8
+- Updated Forge to 2400 (raoulvdberge)
 - Updated Storage Drawers API (raoulvdberge)
 - Fixed bug where disks have to be re-inserted in the Disk Drive in order to work again after rejoining a chunk (raoulvdberge)
 - Fixed bug where items inserted in Storage Drawers through External Storage with a Drawer Controller wouldn't respect drawer priority rules (raoulvdberge)
diff --git a/build.gradle b/build.gradle
index 468b0706b..021084c19 100755
--- a/build.gradle
+++ b/build.gradle
@@ -28,10 +28,10 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 minecraft {
-    version = "1.12-14.21.1.2387"
+    version = "1.12-14.21.1.2400"
     runDir = "run"
     useDepAts = true
-    mappings = "snapshot_20170629"
+    mappings = "snapshot_20170707"
 }
 
 repositories {
@@ -47,8 +47,8 @@ repositories {
 }
 
 dependencies {
-    deobfCompile "mezz.jei:jei_1.12:4.7.0.68:api"
-    runtime "mezz.jei:jei_1.12:4.7.0.68"
+    deobfCompile "mezz.jei:jei_1.12:4.7.1.71:api"
+    runtime "mezz.jei:jei_1.12:4.7.1.71"
     deobfCompile "MCMultiPart2:MCMultiPart:2.2.2"
     // deobfCompile "li.cil.oc:OpenComputers:MC1.11.2-1.7.0.28:api"
 }