diff --git a/mods/MAPGEN/mcl_structures/api.lua b/mods/MAPGEN/mcl_structures/api.lua
index b33f171d76..cf47b4e309 100644
--- a/mods/MAPGEN/mcl_structures/api.lua
+++ b/mods/MAPGEN/mcl_structures/api.lua
@@ -227,9 +227,19 @@ local function process_queue()
 	minetest.after(0.5,process_queue)
 end
 
-function mcl_structures.spawn_mobs(mob,spawnon,p1,p2,pr,n)
+function mcl_structures.spawn_mobs(mob,spawnon,p1,p2,pr,n,water)
 	n = n or 1
-	local sp = minetest.find_nodes_in_area_under_air(p1,p2,spawnon)
+	local sp = {}
+	if water then
+		local nn = minetest.find_nodes_in_area(p1,p2,spawnon)
+		for k,v in pairs(nn) do
+			if minetest.get_item_group(minetest.get_node(vector.offset(v,0,1,0)).name,"water") > 0 then
+				table.insert(sp,v)
+			end
+		end
+	else
+		sp = minetest.find_nodes_in_area_under_air(p1,p2,spawnon)
+	end
 	table.shuffle(sp)
 	for i,node in pairs(sp) do
 		if not peaceful and i <= n then
diff --git a/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ocean_temple.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ocean_temple.mts
new file mode 100644
index 0000000000..0a16fa9b24
Binary files /dev/null and b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ocean_temple.mts differ
diff --git a/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ocean_temple_2.mts b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ocean_temple_2.mts
new file mode 100644
index 0000000000..8a5a6a3137
Binary files /dev/null and b/mods/MAPGEN/mcl_structures/schematics/mcl_structures_ocean_temple_2.mts differ
diff --git a/mods/MAPGEN/mcl_structures/shipwrecks.lua b/mods/MAPGEN/mcl_structures/shipwrecks.lua
index a6dbb4981a..38f790cb66 100644
--- a/mods/MAPGEN/mcl_structures/shipwrecks.lua
+++ b/mods/MAPGEN/mcl_structures/shipwrecks.lua
@@ -172,3 +172,92 @@ mcl_structures.register_structure("shipwreck",{
 		}
 	}
 })
+
+local spawnon = { "mcl_stairs:slab_prismarine_dark"}
+
+mcl_structures.register_structure("ocean_temple",{
+	place_on = {"group:sand","mcl_core:gravel"},
+	spawn_by = {"group:water"},
+	num_spawn_by = 4,
+	noise_params = {
+		offset = 0,
+		scale = 0.0000122,
+		spread = {x = 250, y = 250, z = 250},
+		seed = 32345,
+		octaves = 3,
+		persist = 0.001,
+		flags = "absvalue",
+	},
+	sidelen = 32,
+	flags = "force_placement",
+	biomes = ocean_biomes,
+	y_max = water_level-4,
+	y_min = mcl_vars.mg_overworld_min,
+	filenames = {
+		modpath .. "/schematics/mcl_structures_ocean_temple.mts",
+		modpath .. "/schematics/mcl_structures_ocean_temple_2.mts",
+	},
+	y_offset = function(pr) return pr:next(-2,0) end,
+	after_place = function(p,def,pr)
+		local p1 = vector.offset(p,-9,0,-9)
+		local p2 = vector.offset(p,9,32,9)
+		mcl_structures.spawn_mobs("mobs_mc:guardian",spawnon,p1,p2,pr,5,true)
+		mcl_structures.spawn_mobs("mobs_mc:guardian_elder",spawnon,p1,p2,pr,1,true)
+		mcl_structures.construct_nodes(p1,p2,{"group:wall"})
+	end,
+	loot = {
+		["mcl_chests:chest_small"] = {
+			stacks_min = 3,
+			stacks_max = 10,
+			items = {
+				{ itemstring = "mcl_sus_stew:stew", weight = 10, amount_min = 1, amount_max = 1 },
+				{ itemstring = "mcl_core:paper", weight = 8, amount_min = 1, amount_max = 12 },
+				{ itemstring = "mcl_fishing:fish_raw", weight = 5, amount_min = 8, amount_max = 21 },
+				{ itemstring = "mcl_fishing:salmon_raw", weight = 7, amount_min = 4, amount_max = 8 },
+				{ itemstring = "mcl_tnt:tnt", weight = 1, amount_min = 1, amount_max = 2 },
+			},
+			{
+			stacks_min = 2,
+			stacks_max = 6,
+			items = {
+				{ itemstring = "mcl_core:iron_ingot", weight = 10, amount_min = 1, amount_max = 5 },
+				{ itemstring = "mcl_core:goldblock", weight = 1, amount_min = 1, amount_max = 2 },
+				{ itemstring = "mcl_experience:bottle", weight = 5, amount_min = 1, amount_max = 1 },
+				{ itemstring = "mcl_core:diamond", weight = 5, amount_min = 1, amount_max = 1 },
+				{ itemstring = "mcl_fishing:fishing_rod", weight = 1, amount_min = 1, amount_max = 1 },
+				}
+			},
+			{
+			stacks_min = 4,
+			stacks_max = 4,
+			items = {
+				--{ itemstring = "FIXME TREASURE MAP", weight = 8, amount_min = 1, amount_max = 5 },
+				{ itemstring = "mcl_books:book", weight = 1, amount_min = 1, amount_max = 5 },
+				{ itemstring = "mcl_clock:clock", weight = 1, amount_min = 1, amount_max = 1 },
+				{ itemstring = "mcl_compass:compass", weight = 1, amount_min = 1, amount_max = 1 },
+				{ itemstring = "mcl_maps:empty_map", weight = 1, amount_min = 1, amount_max = 1 },
+				}
+			},
+		}
+	}
+})
+
+mcl_structures.register_structure_spawn({
+	name = "mobs_mc:guardian",
+	y_min = mcl_vars.mg_overworld_min,
+	y_max = mcl_vars.mg_overworld_max,
+	chance = 10,
+	interval = 60,
+	limit = 9,
+	spawnon = spawnon,
+})
+
+mcl_structures.register_structure_spawn({
+	name = "mobs_mc:guardian_elder",
+	y_min = mcl_vars.mg_overworld_min,
+	y_max = mcl_vars.mg_overworld_max,
+	chance = 100,
+	interval = 60,
+	limit = 4,
+	spawnon = spawnon,
+})