diff --git a/config.lua b/config.lua
index 2eae855..29d1dc9 100644
--- a/config.lua
+++ b/config.lua
@@ -40,6 +40,11 @@ mg_villages.MAX_HEIGHT_TREATED = 200;
 -- choose the debug level you want
 mg_villages.DEBUG_LEVEL = mg_villages.DEBUG_LEVEL_NORMAL
 
+-- if set to true, a water source will be added all 2-3 blocks on a field for farming;
+-- as long as you do not plan to dig up all fields, hoe them and use them manually,
+-- better keep this to "false" as that is much faster
+mg_villages.PLACE_WATER_FOR_FARMING = false
+
 -- if set to true (or anything else but nil or false), highlandpools by paramat (see
 -- https://forum.minetest.net/viewtopic.php?t=8400) will be created
 mg_villages.CREATE_HIGHLANDPOOLS = true
diff --git a/mapgen.lua b/mapgen.lua
index 8ee4bc4..9960a10 100644
--- a/mapgen.lua
+++ b/mapgen.lua
@@ -832,10 +832,6 @@ mg_villages.village_area_fill_with_plants = function( village_area, villages, mi
 	-- these extra nodes are used in order to avoid abms on the huge fields around the villages
 	cid.c_soil_wet        = minetest.get_content_id( 'mg_villages:soil' ); --'farming:soil_wet' );
 	cid.c_soil_sand       = minetest.get_content_id( 'mg_villages:desert_sand_soil'); --'farming:desert_sand_soil_wet' );
-	-- desert sand soil is only available in minetest_next
-	if( not( cid.c_soil_sand )) then
-		cid.c_soil_sand = cid.c_soil_wet;
-	end
 	local c_feldweg         = minetest.get_content_id( 'cottages:feldweg');
 	if( not( c_feldweg )) then
 		c_feldweg = cid.c_dirt_with_grass;
@@ -942,7 +938,7 @@ mg_villages.village_area_fill_with_plants = function( village_area, villages, mi
 				end
 
 				-- place a water source now and then so that the fake soil can later be turned into real soil if needed
-				if( on_soil and x%3==0 and z%3==0 and h>minp.y) then
+				if( mg_villages.PLACE_WATER_FOR_FARMING and on_soil and x%3==0 and z%3==0 and h>minp.y) then
 					data[a:index( x, h-1, z)] = cid.c_water;
 				end
 			end
diff --git a/nodes.lua b/nodes.lua
index 4e75c28..9ad3810 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -31,7 +31,7 @@ minetest.register_node("mg_villages:soil", {
 	tiles = {"default_dirt.png^farming_soil_wet.png", "default_dirt.png"},
 	drop = "default:dirt",
 	is_ground_content = true,
-	groups = {crumbly=3, not_in_creative_inventory=1, grassland = 1},
+	groups = {crumbly=3, not_in_creative_inventory=1, grassland = 1, soil=3, wet=1},
 	sounds = default.node_sound_dirt_defaults(),
 })
 
@@ -40,7 +40,7 @@ minetest.register_node("mg_villages:desert_sand_soil", {
 	tiles = {"default_desert_sand.png^farming_soil_wet.png", "default_desert_sand.png"},
 	is_ground_content = true,
 	drop   = "default:desert_sand",
-	groups = {crumbly=3, not_in_creative_inventory = 1, sand=1, desert = 1},
+	groups = {crumbly=3, not_in_creative_inventory = 1, sand=1, desert = 1, soil=3, wet=1},
 	sounds = default.node_sound_sand_defaults(),
 })