diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua
index 31dc09af38..4f2f243b75 100644
--- a/mods/MAPGEN/mcl_mapgen_core/init.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/init.lua
@@ -659,6 +659,36 @@ local function register_mgv6_decorations()
 		decoration = "mcl_core:deadbush",
 	})
 
+	local function register_mgv6_flower(name, seed)
+		minetest.register_decoration({
+			deco_type = "simple",
+			place_on = {"mcl_core:dirt_with_grass"},
+			sidelen = 16,
+			noise_params = {
+				offset = 0,
+				scale = 0.006,
+				spread = {x = 100, y = 100, z = 100},
+				seed = seed,
+				octaves = 3,
+				persist = 0.6
+			},
+			y_min = 1,
+			y_max = 30,
+			decoration = "mcl_flowers:"..name,
+		})
+	end
+
+	register_mgv6_flower("tulip_red",  436)
+	register_mgv6_flower("tulip_orange", 536)
+	register_mgv6_flower("tulip_pink", 636)
+	register_mgv6_flower("tulip_white", 736)
+	register_mgv6_flower("azure_bluet", 800)
+	register_mgv6_flower("dandelion", 8)
+	register_mgv6_flower("allium", 0)
+	register_mgv6_flower("blue_orchid", 64500)
+	register_mgv6_flower("oxeye_daisy", 3490)
+	register_mgv6_flower("poppy", 9439)
+
 end
 
 minetest.register_on_generated(function(minp, maxp, seed)
diff --git a/mods/MAPGEN/mcl_mapgen_plants/depends.txt b/mods/MAPGEN/mcl_mapgen_plants/depends.txt
deleted file mode 100644
index a7031ce8fe..0000000000
--- a/mods/MAPGEN/mcl_mapgen_plants/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-mcl_core
-mcl_flowers
diff --git a/mods/MAPGEN/mcl_mapgen_plants/init.lua b/mods/MAPGEN/mcl_mapgen_plants/init.lua
deleted file mode 100644
index 7d55201ad0..0000000000
--- a/mods/MAPGEN/mcl_mapgen_plants/init.lua
+++ /dev/null
@@ -1,93 +0,0 @@
--- Don't generate flowers in flat mapgen
-local mg_name = minetest.get_mapgen_setting("mg_name")
-if mg_name ~= "flat" then
-
-minetest.register_on_generated(function(minp, maxp, seed)
-	if maxp.y >= 3 and minp.y <= 0 then
-		-- Generate flowers
-		local perlin1 = minetest.get_perlin(436, 3, 0.6, 100)
-		-- Assume X and Z lengths are equal
-		local divlen = 16
-		local divs = (maxp.x-minp.x)/divlen+1;
-		for divx=0,divs-1 do
-		for divz=0,divs-1 do
-			local x0 = minp.x + math.floor((divx+0)*divlen)
-			local z0 = minp.z + math.floor((divz+0)*divlen)
-			local x1 = minp.x + math.floor((divx+1)*divlen)
-			local z1 = minp.z + math.floor((divz+1)*divlen)
-			-- Determine flowers amount from perlin noise
-			local grass_amount = math.floor(perlin1:get2d({x=x0, y=z0}) * 9)
-			-- Find random positions for flowers based on this random
-			local pr = PseudoRandom(seed+456)
-			for i=0,grass_amount do
-				local x = pr:next(x0, x1)
-				local z = pr:next(z0, z1)
-				-- Find ground level (0...15)
-				local ground_y = nil
-				for y=30,0,-1 do
-					if minetest.get_node({x=x,y=y,z=z}).name ~= "air" then
-						ground_y = y
-						break
-					end
-				end
-				
-				if ground_y then
-					local p = {x=x,y=ground_y+1,z=z}
-					local nn = minetest.get_node(p).name
-					-- Check if the node can be replaced
-					if minetest.registered_nodes[nn] and
-						minetest.registered_nodes[nn].is_ground_content then
-						nn = minetest.get_node({x=x,y=ground_y,z=z}).name
-						if nn == "mcl_core:dirt_with_grass" then
-							--local flower_choice = pr:next(1, 11)
-							local flower_choice = math.random(0, 10)
-							local flower = "mcl_flowers:tallgrass"
-							if flower_choice == 1 then
-								flower = "mcl_flowers:dandelion"
-								minetest.set_node(p, {name=flower})
-							elseif flower_choice == 2 then
-								flower = "mcl_flowers:tallgrass"
-								minetest.set_node(p, {name=flower})
-							elseif flower_choice == 3 then
-								flower = "mcl_flowers:oxeye_daisy"
-								minetest.set_node(p, {name=flower})
-							elseif flower_choice == 4 then
-								flower = "mcl_flowers:tulip_orange"
-								minetest.set_node(p, {name=flower})
-							elseif flower_choice == 5 then
-								flower = "mcl_flowers:tulip_pink"
-								minetest.set_node(p, {name=flower})
-							elseif flower_choice == 6 then
-								flower = "mcl_flowers:tulip_red"
-								minetest.set_node(p, {name=flower})
-							elseif flower_choice == 7 then
-								flower = "mcl_flowers:tulip_white"
-								minetest.set_node(p, {name=flower})
-							elseif flower_choice == 8 then
-								flower = "mcl_flowers:allium"
-								minetest.set_node(p, {name=flower})
-							elseif flower_choice == 9 then
-								flower = "mcl_flowers:azure_bluet"
-								minetest.set_node(p, {name=flower})
-							elseif flower_choice == 10 then
-								flower = "mcl_flowers:poppy"
-								minetest.set_node(p, {name=flower})
-							elseif flower_choice == 11 then
-								flower = "mcl_flowers:blue_orchid"
-								minetest.set_node(p, {name=flower})
-							else
-								flower = "mcl_flowers:tallgrass"
-								minetest.set_node(p, {name=flower})
-							end
-							
-						end
-					end
-				end
-				
-			end
-		end
-		end
-	end
-end)
-
-end