diff --git a/README.md b/README.md
index 0d41269b..f9f5283a 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ this repository will have to be rejected.
 add the following to your build.gradle file
 ```
 dependencies {
-    compile 'com.mod-buildcraft:BuildCraft:5.0.0.+'
+    compile 'com.mod-buildcraft:buildcraft:5.0.0.+'
 }
 ```
 where `5.0.0` is the desired version of BuildCraft
diff --git a/build.gradle b/build.gradle
index 713e3279..f7b5e624 100755
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@ group= "com.mod-buildcraft"
 archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]
 
 minecraft {
-    version = "1.7.2-10.12.0.1029" // McVersion-ForgeVersion     this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version.  Yeah its stupid, and will be changed eentually.
+    version = "1.7.2-10.12.0.1047" // McVersion-ForgeVersion     this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version.  Yeah its stupid, and will be changed eentually.
 
     assetDir = "run/assets" // the place for ForgeGradle to download the assets. The assets that the launcher gets and stuff
 
diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java
index 903c7c1e..30d1d596 100644
--- a/common/buildcraft/BuildCraftEnergy.java
+++ b/common/buildcraft/BuildCraftEnergy.java
@@ -40,6 +40,7 @@ import buildcraft.energy.BlockBuildcraftFluid;
 import buildcraft.energy.BlockEnergyEmitter;
 import buildcraft.energy.BlockEnergyReceiver;
 import buildcraft.energy.BlockEngine;
+import buildcraft.energy.BucketHandler;
 import buildcraft.energy.EnergyProxy;
 import buildcraft.energy.GuiHandler;
 import buildcraft.energy.ItemBucketBuildcraft;
@@ -216,11 +217,10 @@ public class BuildCraftEnergy extends BuildCraftMod {
 			}
 		}
 
-		// TODO: Are these still really necessary? If not, remove the
-		// BucketHandler class as well.
-		//BucketHandler.INSTANCE.buckets.put(blockOil, bucketOil);
-		//BucketHandler.INSTANCE.buckets.put(blockFuel, bucketFuel);
-		//MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
+		// BucketHandler ensures empty buckets fill with the correct liquid.
+		BucketHandler.INSTANCE.buckets.put(blockOil, bucketOil);
+		BucketHandler.INSTANCE.buckets.put(blockFuel, bucketFuel);
+		MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
 
 		BuildcraftRecipes.refinery.addRecipe(new FluidStack(fluidOil, 1), new FluidStack(fluidFuel, 1), 12, 1);
 
diff --git a/common/buildcraft/energy/BucketHandler.java b/common/buildcraft/energy/BucketHandler.java
index efb86e9b..cb647c15 100644
--- a/common/buildcraft/energy/BucketHandler.java
+++ b/common/buildcraft/energy/BucketHandler.java
@@ -46,7 +46,7 @@ public class BucketHandler {
 	private ItemStack fillCustomBucket(World world, MovingObjectPosition pos) {
 		Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ);
 
-		Item bucket = Item.getItemFromBlock(block);
+		Item bucket = buckets.get(block);
 		
 		if (bucket != null && world.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) == 0) {
 			world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ);