diff --git a/buildcraft_resources/lang/buildcraft/en_US.properties b/buildcraft_resources/lang/buildcraft/en_US.properties
index 4512f796..ec0bfa22 100644
--- a/buildcraft_resources/lang/buildcraft/en_US.properties
+++ b/buildcraft_resources/lang/buildcraft/en_US.properties
@@ -2,6 +2,9 @@
 
 chat.pipe.power.iron.mode=Switched to %d MJ/t limit
 
+fluid.oil=Oil
+fluid.fuel=Fuel
+
 gate.pipe.empty=Pipe Empty
 gate.pipe.containsItems=Items Traversing
 gate.pipe.containsFluids=Fluid Traversing
diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java
index 400b4c7d..0389e623 100644
--- a/common/buildcraft/BuildCraftEnergy.java
+++ b/common/buildcraft/BuildCraftEnergy.java
@@ -15,6 +15,7 @@ import buildcraft.core.BlockSpring;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.InterModComms;
 import buildcraft.core.Version;
+import buildcraft.core.fluids.BCFluid;
 import buildcraft.core.network.PacketHandler;
 import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.triggers.BCTrigger;
@@ -144,11 +145,12 @@ public class BuildCraftEnergy {
 
 
 		// Oil and fuel
-		buildcraftFluidOil = new Fluid("oil").setDensity(800).setViscosity(1500);
+		buildcraftFluidOil = new BCFluid("oil").setDensity(800).setViscosity(1500);
+		
 		FluidRegistry.registerFluid(buildcraftFluidOil);
 		fluidOil = FluidRegistry.getFluid("oil");
 
-		buildcraftFluidFuel = new Fluid("fuel");
+		buildcraftFluidFuel = new BCFluid("fuel");
 		FluidRegistry.registerFluid(buildcraftFluidFuel);
 		fluidFuel = FluidRegistry.getFluid("fuel");
 
diff --git a/common/buildcraft/core/fluids/BCFluid.java b/common/buildcraft/core/fluids/BCFluid.java
new file mode 100644
index 00000000..8df7bbd8
--- /dev/null
+++ b/common/buildcraft/core/fluids/BCFluid.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) SpaceToad, 2011-2012
+ * http://www.mod-buildcraft.com
+ * 
+ * BuildCraft is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ */
+package buildcraft.core.fluids;
+
+import buildcraft.core.utils.StringUtils;
+import net.minecraftforge.fluids.Fluid;
+
+/**
+ *
+ * @author CovertJaguar <http://www.railcraft.info/>
+ */
+public class BCFluid extends Fluid {
+
+	public BCFluid(String name) {
+		super(name);
+	}
+
+	@Override
+	public String getLocalizedName() {
+		return StringUtils.localize("fluid." + fluidName);
+	}
+}