diff --git a/.gitmodules b/.gitmodules
index 85232c6..1148725 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -139,39 +139,30 @@
 [submodule "mana"]
 	path = mana
 	url = https://sys4.fr/gitea/mff/minetest_mana.git
-	branch = mff
 [submodule "mapfix"]
 	path = mapfix
 	url = https://sys4.fr/gitea/minetest/mapfix.git
-	branch = master
 [submodule "maptools"]
 	path = maptools
 	url = https://sys4.fr/gitea/mff/maptools.git
-	branch = mff
 [submodule "markers"]
 	path = markers
 	url = https://sys4.fr/gitea/mff/markers.git
-	branch = mff
 [submodule "maze"]
 	path = maze
 	url = https://sys4.fr/gitea/mff/maze.git
-	branch = master
 [submodule "meru"]
 	path = meru
-	url = https://sys4.fr/gitea/nalc/meru.git
-	branch = mff
+	url = https://sys4.fr/gitea/mff/meru.git
 [submodule "mesecons"]
 	path = mesecons
 	url = https://sys4.fr/gitea/mff/mesecons.git
-	branch = mff
 [submodule "metatools"]
 	path = metatools
 	url = https://sys4.fr/gitea/mff/minetest-mod-metatools.git
-	branch = mff
 [submodule "mff"]
 	path = mff
-	url = https://sys4.fr/gitea/nalc/mff.git
-	branch = mff
+	url = https://sys4.fr/gitea/mff/mff.git
 [submodule "minercantile"]
 	path = minercantile
 	url = https://sys4.fr/gitea/nalc/minercantile.git
diff --git a/mff b/mff
index 88bbac4..20d348c 160000
--- a/mff
+++ b/mff
@@ -1 +1 @@
-Subproject commit 88bbac46d138d40d0780112b4f86dee3abbf3b38
+Subproject commit 20d348c4815404d370bb254d8c1edc2804427d72