diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp
index 676b10385..9acf7be2d 100644
--- a/SQF/dayz_code/Configs/CfgMagazines.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines.hpp
@@ -1276,7 +1276,27 @@ class CfgMagazines {
 			
 		};
 	};
-
+	class ItemGunRackKit: CA_Magazine
+        {
+                scope = 2;
+                count = 1;
+                type = 256;
+                displayName = "Gun Rack Kit";
+                descriptionShort = "A Gun Rack for 20 weapons";
+                model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
+                picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+                weight = 20;
+                class ItemActions
+                {
+                        class Build
+                        {
+                                text = "$STR_ACTIONS_BUILD";
+                                script = "spawn player_build;";
+                                require[] = {"ItemToolbox"};
+                                create = "GunRack_DZ";
+                        };
+                };
+        };
 	class ItemOilBarrel: CA_Magazine
 	{
 		scope = 2;
@@ -1328,7 +1348,7 @@ class CfgMagazines {
                 descriptionShort = "Fire Barrel";
                 model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
                 picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-                weight = 25;
+                weight = 45;
                 class ItemActions
                 {
                         class Build
@@ -3160,14 +3180,23 @@ class CfgMagazines {
 				
 			};
 			class Crafting5
-            {
-                text = $STR_EPOCH_PLAYER_259;
-                Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;";
-                neednearby[] = {"workshop"};
-                requiretools[] = {"ItemToolbox"};
-                output[] = {{"PartPlankPack",1}};
-                input[] = {{"PartWoodLumber",3}};
-            };
+        		{
+		                text = $STR_EPOCH_PLAYER_259;
+		                Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;";
+		                neednearby[] = {"workshop"};
+		                requiretools[] = {"ItemToolbox"};
+		                output[] = {{"PartPlankPack",1}};
+		                input[] = {{"PartWoodLumber",3}};
+        		};
+        		class Crafting6
+        		{
+        			text = $STR_EPOCH_PLAYER_277;
+		                Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;";
+		                neednearby[] = {"workshop"};
+		                requiretools[] = {"ItemToolbox"};
+		                output[] = {{"ItemGunRackKit",1}};
+		                input[] = {{"PartWoodLumber",6}};
+			};
 		};
 	};
 	class PartWoodPlywood: CA_Magazine
diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp
index 6bb5ef1d2..5cf2e3f8e 100644
--- a/SQF/dayz_code/Configs/cfgVehicles.hpp
+++ b/SQF/dayz_code/Configs/cfgVehicles.hpp
@@ -1942,7 +1942,17 @@ class CfgVehicles {
                 constructioncount = 3;
                 removeoutput[] = {{"ItemFuelBarrelEmpty",1}};
         };
-
+	class Gunrack1;
+	class GunRack_DZ: Gunrack1
+        {
+		armor = 200;
+		scope = 2;
+		displayName = "Gun Rack";
+                vehicleClass = "Fortifications";
+                transportMaxWeapons = 20;
+                offset[] = {0,2.5,0};
+                removeoutput[] = {{"ItemGunRackKit",1}};
+        };
 	// modular
 	class MetalFloor_DZ: ModularItems
 	{
diff --git a/SQF/dayz_epoch_b/stringtable.xml b/SQF/dayz_epoch_b/stringtable.xml
index fd4dc3b22..932f97a47 100644
--- a/SQF/dayz_epoch_b/stringtable.xml
+++ b/SQF/dayz_epoch_b/stringtable.xml
@@ -5284,5 +5284,15 @@
 		  <French></French>
 		  <Czech></Czech>
 		</Key>
+		<Key ID="STR_EPOCH_PLAYER_277">
+		  <Original>Craft Gun Rack</Original>
+		  <English>Craft Gun Rack</English>
+		  <German></German>
+		  <Russian></Russian>
+		  <Spanish></Spanish>
+		  <Dutch></Dutch>
+		  <French></French>
+		  <Czech></Czech>
+		</Key>
 	</Package>
 </Project>