diff --git a/.gitmodules b/.gitmodules
old mode 100755
new mode 100644
index cd6e5770..f7d32774
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,3 +34,6 @@
 [submodule "mods/mysql_auth"]
 	path = mods/mysql_auth
 	url = https://github.com/MinetestForFun/mysql_auth.git
+[submodule "mods/mapfix"]
+	path = mods/mapfix
+	url = https://github.com/minetest-mods/mapfix.git
diff --git a/mods/mapfix b/mods/mapfix
new file mode 160000
index 00000000..d4e9de50
--- /dev/null
+++ b/mods/mapfix
@@ -0,0 +1 @@
+Subproject commit d4e9de50a98544923be71f5be49139ed25e52cfc
diff --git a/mods/mapfix/LICENSE b/mods/mapfix/LICENSE
deleted file mode 100755
index cb155751..00000000
--- a/mods/mapfix/LICENSE
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100755
index 2ea9d903..00000000
--- a/mods/mapfix/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-#mapfix
-
-Fix some map errors (flow and light problems)
-
-![Before](http://i.imgur.com/T3csYME.png)
-![After](http://i.imgur.com/d0V0aO7.png)
-Look at the water and the jungle trunk at the center.
-
-
-##minetest.conf settings
-* mapfix_default_size (by default 40) : size used when omitted
-* mapfix_max_size (by default 50) : maximum size allowed for players
-* mapfix_delay (by default 15) : minimal delay in seconds between 2 "/mapfix" (to avoid server freezing)
\ No newline at end of file
diff --git a/mods/mapfix/init.lua b/mods/mapfix/init.lua
deleted file mode 100755
index bad5f816..00000000
--- a/mods/mapfix/init.lua
+++ /dev/null
@@ -1,39 +0,0 @@
-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 = os.time()
-
-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 and the light of a chunk",
-	func = function(name, param)
-		local pos = minetest.get_player_by_name(name):getpos()
-		local size = tonumber(param) or default_size
-		local privs = minetest.check_player_privs(name, {server=true})
-		local time = os.time()
-
-		if not privs then
-			if size > max_size then
-				return false, "You need the server privilege to exceed the radius of " .. max_size .. " blocks"
-			elseif time - previous < delay then
-				return false, "Wait at least " .. delay .. " seconds from the previous \"/mapfix\"."
-			end
-			previous = time
-		end
-
-		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,
-})