diff --git a/mods/mapfix/LICENSE b/mods/mapfix/LICENSE
new file mode 100755
index 00000000..cb155751
--- /dev/null
+++ b/mods/mapfix/LICENSE
@@ -0,0 +1,4 @@
+GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+See http://www.gnu.org/licenses/gpl-3.0.en.html
diff --git a/mods/mapfix/README.md b/mods/mapfix/README.md
new file mode 100755
index 00000000..39c92423
--- /dev/null
+++ b/mods/mapfix/README.md
@@ -0,0 +1,4 @@
+mapfix
+======
+
+Fix some map errors (flow and light problems)
diff --git a/mods/mapfix/depends.txt b/mods/mapfix/depends.txt
deleted file mode 100755
index e69de29b..00000000
diff --git a/mods/mapfix/init.lua b/mods/mapfix/init.lua
index 8c9dd35e..f55ece60 100755
--- a/mods/mapfix/init.lua
+++ b/mods/mapfix/init.lua
@@ -1,19 +1,39 @@
+local function mapfix(minp, maxp)
+	local vm = minetest.get_voxel_manip(minp, maxp)
+	vm:update_liquids()
+	vm:write_to_map()
+	vm:update_map()
+end
+
+local previous = -math.huge
+
+local default_size = tonumber(minetest.setting_get("mapfix_default_size")) or 40
+local max_size = tonumber(minetest.setting_get("mapfix_max_size")) or 50
+local delay = tonumber(minetest.setting_get("mapfix_delay")) or 15
+
 minetest.register_chatcommand("mapfix", {
 	params = "<size>",
-	description = "Recalculate the flowing liquids of a chunk",
+	description = "Recalculate the flowing liquids and the light of a chunk",
 	func = function(name, param)
 		local pos = minetest.get_player_by_name(name):getpos()
 		local size = tonumber(param) or 40
-		if size > 50 and not minetest.check_player_privs(name, {server=true}) then
-			return false, "You need the server privilege to exceed the radius of 50 blocks"
+		local privs = minetest.check_player_privs(name, {server=true})
+		local time = os.clock()
+
+		if not privs then
+			if size > 50 and not privs then
+				return false, "You need the server privilege to exceed the radius of " .. max_size .. " blocks"
+			elseif time - previous < 15 then
+				return false, "Wait at least " .. delay .. " seconds from the previous \"/mapfix\"."
+			end
+			previous = time
 		end
-		local minp, maxp = {x = math.floor(pos.x - size), y = math.floor(pos.y - size), z = math.floor(pos.z - size)}, {x = math.ceil(pos.x + size), y = math.ceil(pos.y + size), z = math.ceil(pos.z + size)}
-		local vm = minetest.get_voxel_manip()
-		vm:read_from_map(minp, maxp)
-		vm:calc_lighting()
-		vm:update_liquids()
-		vm:write_to_map()
-		vm:update_map()
+
+		local minp = vector.round(vector.subtract(pos, size - 0.5))
+		local maxp = vector.round(vector.add(pos, size + 0.5))
+
+		minetest.log("action", name .. " uses mapfix at " .. minetest.pos_to_string(vector.round(pos)) .. " with radius " .. size)
+		mapfix(minp, maxp)
 		return true, "Done."
 	end,
 })