diff --git a/src/main/java/mapeper/ticonautotoolstation/AutoToolStationBlock.java b/src/main/java/mapeper/ticonautotoolstation/AutoToolStationBlock.java
index d52e95f..f1695e7 100644
--- a/src/main/java/mapeper/ticonautotoolstation/AutoToolStationBlock.java
+++ b/src/main/java/mapeper/ticonautotoolstation/AutoToolStationBlock.java
@@ -25,6 +25,7 @@ protected AutoToolStationBlock() {
 		super(Material.rock);
 		this.setHardness(1.0F);
 		this.setBlockName("ats_autotoolstation");
+		this.setCreativeTab(TiConAutoToolStation.creativeTab);
 	}
 
 	@Override
diff --git a/src/main/java/mapeper/ticonautotoolstation/CreativeTab.java b/src/main/java/mapeper/ticonautotoolstation/CreativeTab.java
new file mode 100644
index 0000000..c72660d
--- /dev/null
+++ b/src/main/java/mapeper/ticonautotoolstation/CreativeTab.java
@@ -0,0 +1,20 @@
+package mapeper.ticonautotoolstation;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+
+public class CreativeTab extends CreativeTabs {
+	public CreativeTab()
+	{
+		super(TiConAutoToolStation.MODID);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public Item getTabIconItem()
+	{
+		return TiConAutoToolStation.autoToolStationBlockItem;
+	}
+}
diff --git a/src/main/java/mapeper/ticonautotoolstation/TiConAutoToolStation.java b/src/main/java/mapeper/ticonautotoolstation/TiConAutoToolStation.java
index d802349..96aa19f 100644
--- a/src/main/java/mapeper/ticonautotoolstation/TiConAutoToolStation.java
+++ b/src/main/java/mapeper/ticonautotoolstation/TiConAutoToolStation.java
@@ -8,6 +8,7 @@
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
@@ -23,7 +24,11 @@ public class TiConAutoToolStation {
 	@Mod.Instance(MODID)
 	public static TiConAutoToolStation instance;
 
-	AutoToolStationBlock autoToolStationBlockBlock;
+	public static CreativeTab creativeTab = new CreativeTab();
+
+	static AutoToolStationBlock autoToolStationBlockBlock;
+	static Item autoToolStationBlockItem;
+
 
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent event) {
@@ -31,6 +36,7 @@ public void preInit(FMLPreInitializationEvent event) {
 		autoToolStationBlockBlock = new AutoToolStationBlock();
 		GameRegistry.registerBlock(autoToolStationBlockBlock, ItemBlock.class, "ats_autotoolstation");
 		GameRegistry.registerTileEntity(AutoToolStationTileEntity.class, "ats_autotoolstationTile");
+		autoToolStationBlockItem = Item.getItemFromBlock(autoToolStationBlockBlock);
 	}
 
 	@EventHandler
diff --git a/src/main/resources/assets/autotoolstation/lang/de_DE.lang b/src/main/resources/assets/autotoolstation/lang/de_DE.lang
index bce398a..5af4dd2 100644
--- a/src/main/resources/assets/autotoolstation/lang/de_DE.lang
+++ b/src/main/resources/assets/autotoolstation/lang/de_DE.lang
@@ -7,4 +7,6 @@ ats.autotoolstation.thanksticon=Danke an Tinkers Construct für ihre Creative Co
 ats.autotoolstation.currentMode=Modus:
 ats.autotoolstation.modechange=Modus geändert zu: %s
 ats.autotoolstation.mode.applyUntilDone=Hinzufügen bis fertig.
-ats.autotoolstation.mode.fillOne=Nur ein Modifikator
\ No newline at end of file
+ats.autotoolstation.mode.fillOne=Nur ein Modifikator
+
+itemGroup.TiConAutoToolStation=TConstruct Auto Werkzeugstation
\ No newline at end of file
diff --git a/src/main/resources/assets/autotoolstation/lang/en_US.lang b/src/main/resources/assets/autotoolstation/lang/en_US.lang
index 9f946aa..487918c 100644
--- a/src/main/resources/assets/autotoolstation/lang/en_US.lang
+++ b/src/main/resources/assets/autotoolstation/lang/en_US.lang
@@ -7,4 +7,6 @@ ats.autotoolstation.thanksticon=Thanks to Tinkers Construct for the Creative Com
 ats.autotoolstation.currentMode=Mode:
 ats.autotoolstation.modechange=Mode changed to: %s
 ats.autotoolstation.mode.applyUntilDone=Apply until done
-ats.autotoolstation.mode.fillOne=Only One Modifier
\ No newline at end of file
+ats.autotoolstation.mode.fillOne=Only One Modifier
+
+itemGroup.TiConAutoToolStation=TConstruct Auto Tool Station
\ No newline at end of file