diff --git a/mods/ctf_map/schem_map.lua b/mods/ctf_map/schem_map.lua
index 9faadd2..2df31b1 100644
--- a/mods/ctf_map/schem_map.lua
+++ b/mods/ctf_map/schem_map.lua
@@ -69,7 +69,14 @@ local function search_for_maps()
 
 	ctf_map.available_maps = {}
 	for key, _ in pairs(files_hash) do
-		table.insert(ctf_map.available_maps, key)
+		local conf = Settings(mapdir .. "/" .. key .. ".conf")
+		minetest.log("error", "ctf.maps." .. key:gsub("%./", ""):gsub("/", "."))
+		if not conf:get_bool("disabled", false) and
+				minetest.settings:get_bool("ctf.maps." .. key:gsub("%./", ""):gsub("/", "."), true) then
+			table.insert(ctf_map.available_maps, key)
+		else
+			minetest.log("error", key .. " disabled!")
+		end
 	end
 	if next(ctf_map.available_maps) == nil then
 		error("No maps found in directory " .. mapdir)
diff --git a/mods/ctf_pvp_engine b/mods/ctf_pvp_engine
index d341978..48f309e 160000
--- a/mods/ctf_pvp_engine
+++ b/mods/ctf_pvp_engine
@@ -1 +1 @@
-Subproject commit d341978b909b9fad5133c288e01930ffeaf9a9be
+Subproject commit 48f309ee1da5d84df3c4c3da0d219de2f4a3c450