diff --git a/src/main/java/com/hbm/config/CommonConfig.java b/src/main/java/com/hbm/config/CommonConfig.java
index 8d809ccf4..46acd791a 100644
--- a/src/main/java/com/hbm/config/CommonConfig.java
+++ b/src/main/java/com/hbm/config/CommonConfig.java
@@ -26,6 +26,7 @@ public class CommonConfig {
 	public static final String CATEGORY_STRUCTURES = "15_structures";
 	public static final String CATEGORY_POLLUTION = "16_pollution";
 	public static final String CATEGORY_BIOMES = "17_biomes";
+	public static final String CATEGORY_WEAPONS = "18_weapons";
 
 	public static final String CATEGORY_528 = "528";
 	public static final String CATEGORY_LBSM = "LESS BULLSHIT MODE";
diff --git a/src/main/java/com/hbm/config/WeaponConfig.java b/src/main/java/com/hbm/config/WeaponConfig.java
index 88c3dbdae..290641f86 100644
--- a/src/main/java/com/hbm/config/WeaponConfig.java
+++ b/src/main/java/com/hbm/config/WeaponConfig.java
@@ -15,6 +15,8 @@ public class WeaponConfig {
 	public static boolean dropStar = true;
 	public static boolean dropCrys = true;
 	public static boolean dropDead = true;
+
+	public static boolean linearAnimations = false;
 	
 	public static void loadFromConfig(Configuration config) {
 
@@ -38,5 +40,9 @@ public class WeaponConfig {
 		dropStar = CommonConfig.createConfigBool(config, CATEGORY_DROPS, "10.02_dropStar", "Whether rigged star blaster cells should explode when dropped", true);
 		dropCrys = CommonConfig.createConfigBool(config, CATEGORY_DROPS, "10.04_dropCrys", "Whether xen crystals should move blocks when dropped", true);
 		dropDead = CommonConfig.createConfigBool(config, CATEGORY_DROPS, "10.05_dropDead", "Whether dead man's explosives should explode when dropped", true);
+
+		final String CATEGORY_WEAPONS = CommonConfig.CATEGORY_WEAPONS;
+		linearAnimations = CommonConfig.createConfigBool(config, CATEGORY_WEAPONS, "18.00_linearAnimations", "Should heavily stylised weapon animations be replaced with more conventional ones?", false);
+
 	}
 }
diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponShotty.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponShotty.java
index 022a0a8a4..bcf4670e2 100644
--- a/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponShotty.java
+++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponShotty.java
@@ -2,6 +2,7 @@ package com.hbm.render.item.weapon;
 
 import org.lwjgl.opengl.GL11;
 
+import com.hbm.config.WeaponConfig;
 import com.hbm.items.weapon.ItemGunBase;
 import com.hbm.main.ResourceManager;
 import com.hbm.render.anim.HbmAnimations;
@@ -50,9 +51,7 @@ public class ItemRenderWeaponShotty implements IItemRenderer {
 		
 		case EQUIPPED_FIRST_PERSON:
 
-			boolean linear = false; // TODO: Config option
-
-			String animSuffix = linear ? "Lame" : "";
+			String animSuffix = WeaponConfig.linearAnimations ? "Lame" : "";
 			
 			GL11.glScalef(0.5F, 0.5F, 0.5F);
 			GL11.glRotatef(20F, 0.0F, 0.0F, 1.0F);