diff --git a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
index abdad6177..f9141b2b4 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
@@ -465,7 +465,7 @@ class CfgVehicles
 	#include "Veins.hpp" //Veins and Wrecks
 	#include "SupplyCrate.hpp" //Supply Crate and Wreck
 	#include "InfectedCamps.hpp"		
-	#include "Rubbish.hpp"
+	#include "Rubbish.hpp"	
 	
 	//Buildables
 	class DZ_storage_base : Land_A_tent {
@@ -507,25 +507,9 @@ class CfgVehicles
 	
 	//WeaponHolder	
 	class WeaponHolder;	// External class reference
-	#include "WeaponHolder.hpp"	
-	
-	class Plant_Base: WeaponHolder {
-		scope = 2;
-		icon = "";
-		mapSize = 0;
-		transportMaxWeapons = 0;
-		accuracy = 1000;
-		class DestructionEffects{};
-		favouritezones = "(meadow) * (forest) * (1 - houses) * (1 - sea)";
-		displayName = "$STR_ITEM_NAME_comfrey";
-		class eventHandlers {
-			init="(_this select 0)setVariable['permaLoot',true];";
-		};
-		supplyRadius = 1;
-	};	
-	
-	#include "gathered_plants.hpp"
-	
+	#include "WeaponHolder.hpp"
+	#include "Plants.hpp"	
+
 	//Antihack
 	#include "AntiHack\antihack_logic.hpp"
 	#include "AntiHack\antihack_plants.hpp"
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Plants.hpp b/SQF/dayz_code/Configs/CfgVehicles/Plants.hpp
new file mode 100644
index 000000000..4f9d63a7e
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgVehicles/Plants.hpp
@@ -0,0 +1,81 @@
+class Plant_Base: WeaponHolder {
+	scope = 0;
+	icon = "";
+	mapSize = 0;
+	transportMaxWeapons = 0;
+	accuracy = 1000;
+	class DestructionEffects{};
+	favouritezones = "(meadow) * (forest) * (1 - houses) * (1 - sea)";
+	displayName = "$STR_ITEM_NAME_comfrey";
+	class eventHandlers {
+		init="(_this select 0)setVariable['permaLoot',true];";
+	};
+	supplyRadius = 1;
+	vehicleClass = "DayZ Epoch Plants";
+};
+	
+
+class Dayz_Plant3: Plant_Base {
+	scope = 2;
+	model = "z\addons\dayz_communityassets\models\comfrey_up_small.p3d";
+	transportMaxMagazines = 1;
+	class TransportMagazines {
+		class _xx_leaf {
+			magazine = "equip_comfreyleafs";
+			count = 1;
+		};
+	};
+};
+
+class Dayz_Plant2: Plant_Base {
+	scope = 2;
+	model = "z\addons\dayz_communityassets\models\comfrey_up_mid.p3d";
+	transportMaxMagazines = 2;
+	class TransportMagazines {
+		class _xx_leaf {
+			magazine = "equip_comfreyleafs";
+			count = 2;
+		};
+	};
+};
+
+class Dayz_Plant1: Plant_Base {
+	scope = 2;
+	model = "z\addons\dayz_communityassets\models\comfrey_up.p3d";
+	transportMaxMagazines = 3;
+	class TransportMagazines {
+		class _xx_leaf {
+			magazine = "equip_comfreyleafs";
+			count = 3;
+		};
+	};
+};
+
+class Plant_Patch_Base_DZE : NonStrategic {
+	scope = 0;
+	model = "\z\addons\dayz_communityassets\models\stash_small.p3d";
+	icon = "\ca\data\data\Unknown_object.paa";
+	armor = 100;
+	mapsize = 2;
+	vehicleClass = "DayZ Epoch Plants";
+};	
+
+class Plant_Patch_Pumpkin_DZE : Plant_Patch_Base_DZE {
+	scope = 2;
+	displayname = $STR_EPOCH_PLANT_PATCH_PUMPKIN;
+};
+
+class Plant_Patch_Sunflower_DZE : Plant_Patch_Base_DZE {
+	scope = 2;
+	displayname = $STR_EPOCH_PLANT_PATCH_SUNFLOWER;
+};
+
+class Plant_Patch_Carrot_DZE : Plant_Patch_Base_DZE {
+	scope = 2;
+	displayname = $STR_EPOCH_PLANT_PATCH_CARROT;
+};
+
+class Plant_Patch_Potato_DZE : Plant_Patch_Base_DZE {
+	scope = 2;
+	displayname = $STR_EPOCH_PLANT_PATCH_POTATO;
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgVehicles/gathered_plants.hpp b/SQF/dayz_code/Configs/CfgVehicles/gathered_plants.hpp
deleted file mode 100644
index 56ce6ad38..000000000
--- a/SQF/dayz_code/Configs/CfgVehicles/gathered_plants.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-class Dayz_Plant3: Plant_Base {
-	model = "z\addons\dayz_communityassets\models\comfrey_up_small.p3d";
-	vehicleClass = "DayZ Epoch Buildings";
-	transportMaxMagazines = 1;
-	class TransportMagazines {
-		class _xx_leaf {
-			magazine = "equip_comfreyleafs";
-			count = 1;
-		};
-	};
-};
-
-class Dayz_Plant2: Plant_Base {
-	model = "z\addons\dayz_communityassets\models\comfrey_up_mid.p3d";
-	vehicleClass = "DayZ Epoch Buildings";
-	transportMaxMagazines = 2;
-	class TransportMagazines {
-		class _xx_leaf {
-			magazine = "equip_comfreyleafs";
-			count = 2;
-		};
-	};
-};
-
-class Dayz_Plant1: Plant_Base {
-	model = "z\addons\dayz_communityassets\models\comfrey_up.p3d";
-	vehicleClass = "DayZ Epoch Buildings";
-	transportMaxMagazines = 3;
-	class TransportMagazines {
-		class _xx_leaf {
-			magazine = "equip_comfreyleafs";
-			count = 3;
-		};
-	};
-};
-
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 0f3b7dfd0..3e2a96e49 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -32204,6 +32204,22 @@
 			<English>Garbage heab</English>
 			<German>Müllhaufen</German>
 		</Key>		
+		<Key ID="STR_EPOCH_PLANT_PATCH_PUMPKIN">
+			<English>Pumpkin patch</English>
+			<German>Kürbisbeet</German>
+		</Key>
+		<Key ID="STR_EPOCH_PLANT_PATCH_SUNFLOWER">
+			<English>Sunflower patch</English>
+			<German>Sonnenblumenbeet</German>
+		</Key>	
+		<Key ID="STR_EPOCH_PLANT_PATCH_CARROT">
+			<English>Carrot patch</English>
+			<German>Karottenbeet</German>
+		</Key>	
+		<Key ID="STR_EPOCH_PLANT_PATCH_POTATO">
+			<English>Potato patch</English>
+			<German>Kartoffelbeet</German>
+		</Key>		
 
 		<!--Fix for missing strings from the buildings3.pbo, this is just a placeholder-->
 		<Key ID="STR_FAL_Street_Sign">