diff --git a/mods/ctf/ctf_map/nodes.lua b/mods/ctf/ctf_map/nodes.lua
index 967c9b9b49..bc9854e5c9 100644
--- a/mods/ctf/ctf_map/nodes.lua
+++ b/mods/ctf/ctf_map/nodes.lua
@@ -50,6 +50,32 @@ minetest.register_node("ctf_map:ind_glass_red", {
 })
 ctf_map.barrier_nodes[minetest.get_content_id("ctf_map:ind_glass_red")] = minetest.CONTENT_AIR
 
+minetest.register_node("ctf_map:ind_water", {
+	description = "Indestructible Water Barrier Glass",
+	drawtype = "glasslike",
+	tiles = {"ctf_map_ind_water.png"},
+	inventory_image = minetest.inventorycube("ctf_map_ind_water.png"),
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = false,
+	walkable = true,
+	buildable_to = false,
+	use_texture_alpha = false,
+	alpha = 0,
+	pointable = ctf_core.settings.server_mode == "mapedit",
+	groups = {immortal = 1},
+	sounds = default.node_sound_glass_defaults()
+})
+ctf_map.barrier_nodes[minetest.get_content_id("ctf_map:ind_water")] = minetest.get_content_id("default:water_source")
+
+minetest.register_node("ctf_map:ind_lava", {
+	description = "Indestructible Lava Barrier Stone",
+	groups = {immortal = 1},
+	tiles = {"ctf_map_ind_lava.png"},
+	is_ground_content = false
+})
+ctf_map.barrier_nodes[minetest.get_content_id("ctf_map:ind_lava")] = minetest.get_content_id("default:lava_source")
+
 minetest.register_node("ctf_map:ind_stone_red", {
 	description = "Indestructible Red Barrier Stone",
 	groups = {immortal = 1},
diff --git a/mods/ctf/ctf_map/textures/ctf_map_ind_lava.png b/mods/ctf/ctf_map/textures/ctf_map_ind_lava.png
new file mode 100644
index 0000000000..fcc1b26f7a
Binary files /dev/null and b/mods/ctf/ctf_map/textures/ctf_map_ind_lava.png differ
diff --git a/mods/ctf/ctf_map/textures/ctf_map_ind_water.png b/mods/ctf/ctf_map/textures/ctf_map_ind_water.png
new file mode 100644
index 0000000000..088af19ab0
Binary files /dev/null and b/mods/ctf/ctf_map/textures/ctf_map_ind_water.png differ