diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 70eb666d30bc..5caf81a622d5 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	linguistic \
 	lotuswordpro \
 	$(call gb_Helper_optional,DESKTOP,l10ntools) \
-	$(call gb_Helper_optional,MOZ,moz) \
 	$(call gb_Helper_optional,MARIADBC,mysqlc) \
 	$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
 	np_sdk \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 8e7b93a99134..ae4580f79c9c 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,MARIADB,libmariadb) \
 	$(call gb_Helper_optional,MDDS,mdds) \
 	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
+	$(call gb_Helper_optional,MOZ,moz) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
diff --git a/moz/ExternalPackage_moz_lib.mk b/external/moz/ExternalPackage_moz_lib.mk
similarity index 100%
rename from moz/ExternalPackage_moz_lib.mk
rename to external/moz/ExternalPackage_moz_lib.mk
diff --git a/moz/ExternalPackage_runtime.mk b/external/moz/ExternalPackage_runtime.mk
similarity index 100%
rename from moz/ExternalPackage_runtime.mk
rename to external/moz/ExternalPackage_runtime.mk
diff --git a/moz/Makefile b/external/moz/Makefile
similarity index 71%
rename from moz/Makefile
rename to external/moz/Makefile
index ccb1c85a04da..e4968cf85fb6 100644
--- a/moz/Makefile
+++ b/external/moz/Makefile
@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/moz/Module_moz.mk b/external/moz/Module_moz.mk
similarity index 100%
rename from moz/Module_moz.mk
rename to external/moz/Module_moz.mk
diff --git a/moz/README b/external/moz/README
similarity index 100%
rename from moz/README
rename to external/moz/README
diff --git a/moz/UnpackedTarball_moz_inc.mk b/external/moz/UnpackedTarball_moz_inc.mk
similarity index 100%
rename from moz/UnpackedTarball_moz_inc.mk
rename to external/moz/UnpackedTarball_moz_inc.mk
diff --git a/moz/UnpackedTarball_moz_lib.mk b/external/moz/UnpackedTarball_moz_lib.mk
similarity index 100%
rename from moz/UnpackedTarball_moz_lib.mk
rename to external/moz/UnpackedTarball_moz_lib.mk
diff --git a/moz/UnpackedTarball_mozruntime.mk b/external/moz/UnpackedTarball_mozruntime.mk
similarity index 100%
rename from moz/UnpackedTarball_mozruntime.mk
rename to external/moz/UnpackedTarball_mozruntime.mk