diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java
index 65b06f961..baf7b9a43 100644
--- a/src/main/java/mekanism/common/MekanismItems.java
+++ b/src/main/java/mekanism/common/MekanismItems.java
@@ -113,6 +113,7 @@ public class MekanismItems
 		GameRegistry.registerItem(SpeedUpgrade, "SpeedUpgrade");
 		GameRegistry.registerItem(EnergyUpgrade, "EnergyUpgrade");
 		GameRegistry.registerItem(FilterUpgrade, "FilterUpgrade");
+		GameRegistry.registerItem(GasUpgrade, "GasUpgrade");
 		GameRegistry.registerItem(Robit, "Robit");
 		GameRegistry.registerItem(AtomicDisassembler, "AtomicDisassembler");
 		GameRegistry.registerItem(EnrichedAlloy, "EnrichedAlloy");
diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java
index 4ecff07cc..b7778b761 100644
--- a/src/main/java/mekanism/common/item/ItemBlockMachine.java
+++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java
@@ -299,7 +299,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
 
 			if(tileEntity instanceof TileEntityFactory)
 			{
-				((TileEntityFactory)tileEntity).recipeType = RecipeType.values()[getRecipeType(stack)];
+				RecipeType recipeType = RecipeType.values()[getRecipeType(stack)];
+						((TileEntityFactory)tileEntity).recipeType = recipeType;
+				((TileEntityFactory)tileEntity).upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades());
 				world.notifyBlocksOfNeighborChange(x, y, z, tileEntity.getBlockType());
 			}
 
diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
index 5c2c69766..c755f9f62 100644
--- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
+++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
@@ -131,6 +131,7 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
 		factory.ejectorComponent.tileEntity = factory;
 		factory.ejectorComponent.trackers = new int[factory.ejectorComponent.sideData.availableSlots.length];
 		factory.recipeType = type;
+		factory.upgradeComponent.setSupported(Upgrade.GAS, type.fuelEnergyUpgrades());
 		
 		//Advanced Machine
 		factory.gasTank.setGas(gasTank.getGas());
diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java
index e6d8ee69e..1cc75d815 100644
--- a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java
+++ b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java
@@ -100,7 +100,8 @@ public abstract class TileEntityElectricMachine<RECIPE extends BasicMachineRecip
 		factory.ejectorComponent.tileEntity = factory;
 		factory.ejectorComponent.trackers = new int[factory.ejectorComponent.sideData.availableSlots.length];
 		factory.recipeType = type;
-		
+		factory.upgradeComponent.setSupported(Upgrade.GAS, type.fuelEnergyUpgrades());
+
 		factory.inventory[5] = inventory[0];
 		factory.inventory[1] = inventory[1];
 		factory.inventory[5+3] = inventory[2];
diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java
index 9b5171e55..4ad60d531 100644
--- a/src/main/java/mekanism/common/tile/TileEntityFactory.java
+++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java
@@ -669,6 +669,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
 		clientActive = dataStream.readBoolean();
 		RecipeType oldRecipe = recipeType;
 		recipeType = RecipeType.values()[dataStream.readInt()];
+		upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades());
 
 		if(recipeType != oldRecipe)
 		{
@@ -716,6 +717,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
 		clientActive = isActive = nbtTags.getBoolean("isActive");
 		RecipeType oldRecipe = recipeType;
 		recipeType = RecipeType.values()[nbtTags.getInteger("recipeType")];
+		upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades());
 
 		if(recipeType != oldRecipe)
 		{
diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang
index 8c369e232..d0fcca475 100644
--- a/src/main/resources/assets/mekanism/lang/en_US.lang
+++ b/src/main/resources/assets/mekanism/lang/en_US.lang
@@ -11,6 +11,7 @@ item.EnergyTablet.name=Energy Tablet
 item.SpeedUpgrade.name=Speed Upgrade
 item.EnergyUpgrade.name=Energy Upgrade
 item.FilterUpgrade.name=Filter Upgrade
+item.GasUpgrade.name=Gas Upgrade
 item.Robit.name=Robit
 item.AtomicDisassembler.name=Atomic Disassembler
 item.ElectricBow.name=Electric Bow
@@ -339,6 +340,8 @@ upgrade.speed=Speed
 upgrade.speed.desc=Increases speed of machinery.
 upgrade.filter=Filter
 upgrade.filter.desc=A filter that separates !nheavy water from regular water.
+upgrade.gas=Gas
+upgrade.gas.desc=Increases the efficiency !nof gas-using    machinery.
 
 //Key description text
 key.mode=Mode Switch
diff --git a/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png b/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png
new file mode 100644
index 000000000..be83d4918
Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/items/GasUpgrade.png differ