diff --git a/mods/ctf/ctf_map/maps b/mods/ctf/ctf_map/maps
index 9e25819..1595c65 160000
--- a/mods/ctf/ctf_map/maps
+++ b/mods/ctf/ctf_map/maps
@@ -1 +1 @@
-Subproject commit 9e2581925aed31e5572507a0aba8120c18f41fa0
+Subproject commit 1595c6532532daf6745e42865db33f1b7dc1bfd8
diff --git a/mods/ctf/ctf_map/schem_map.lua b/mods/ctf/ctf_map/schem_map.lua
index e95d11d..91d3d02 100644
--- a/mods/ctf/ctf_map/schem_map.lua
+++ b/mods/ctf/ctf_map/schem_map.lua
@@ -28,6 +28,30 @@ local max_r  = 120
 local mapdir = minetest.get_modpath("ctf_map") .. "/maps/"
 ctf_map.map  = nil
 
+-- Modify server status message to include map info
+local map_str
+local old_server_status = minetest.get_server_status
+function minetest.get_server_status(name, joined)
+	local status = old_server_status()
+
+	if not ctf_map.map or not map_str then
+		return status
+	end
+
+	local str = map_str
+	if minetest.get_player_by_name(name) then
+		str = minetest.colorize("#44FF44", str)
+	end
+	status = status .. "\n" .. str
+
+	-- If player just joined, also display map hint
+	if joined and ctf_map.map.hint then
+		status = status .. "\n" .. minetest.colorize("#22FF22", ctf_map.map.hint)
+	end
+
+	return status
+end
+
 
 local next_idx
 minetest.register_chatcommand("set_next", {
@@ -115,7 +139,7 @@ function ctf_map.place_map(map)
 		end
 
 		minetest.after(2, function()
-			local msg = "Map: " .. map.name .. " by " .. map.author
+			local msg = map_str
 			if map.hint then
 				msg = msg .. "\n" .. map.hint
 			end
@@ -164,6 +188,8 @@ function ctf_match.load_map_meta(idx, name)
 	map.pos1 = vector.add(offset, { x = -map.r, y = -map.h / 2, z = -map.r })
 	map.pos2 = vector.add(offset, { x =  map.r, y = map.h / 2,  z =  map.r })
 
+	map_str = "Map: " .. map.name .. " by " .. map.author
+
 	-- Read teams from config
 	local i = 1
 	while meta:get("team." .. i) do
@@ -304,16 +330,3 @@ function ctf_match.create_teams()
 		end
 	end
 end
-
-minetest.register_on_joinplayer(function(player)
-	local map = ctf_map.map
-	if not map then
-		return
-	end
-
-	local msg = "Map: " .. map.name .. " by " .. map.author
-	if map.hint then
-		msg = msg .. "\n" .. map.hint
-	end
-	minetest.chat_send_player(player:get_player_name(), msg)
-end)