diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index aa47dfb47284..835e41ee7d7c 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	jvmfwk \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
 	librelogo \
-	$(call gb_Helper_optional,VISIO,libvisio) \
 	$(call gb_Helper_optional,WPD,libwpd) \
 	$(call gb_Helper_optional,WPG,libwpg) \
 	$(call gb_Helper_optional,WPS,libwps) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 13846f4d7734..2072aac28c1a 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
+	$(call gb_Helper_optional,VISIO,libvisio) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch b/external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch
similarity index 100%
rename from libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch
rename to external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch
diff --git a/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
similarity index 100%
rename from libvisio/ExternalProject_libvisio.mk
rename to external/libvisio/ExternalProject_libvisio.mk
diff --git a/libvisio/Makefile b/external/libvisio/Makefile
similarity index 71%
rename from libvisio/Makefile
rename to external/libvisio/Makefile
index ccb1c85a04da..e4968cf85fb6 100644
--- a/libvisio/Makefile
+++ b/external/libvisio/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/libvisio/Module_libvisio.mk b/external/libvisio/Module_libvisio.mk
similarity index 93%
rename from libvisio/Module_libvisio.mk
rename to external/libvisio/Module_libvisio.mk
index 9a8159f08489..00b05d25d18d 100644
--- a/libvisio/Module_libvisio.mk
+++ b/external/libvisio/Module_libvisio.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,libvisio))
 
-ifeq ($(SYSTEM_VISIO),NO)
-
 $(eval $(call gb_Module_add_targets,libvisio,\
 	ExternalProject_libvisio \
 	UnpackedTarball_libvisio \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/README b/external/libvisio/README
similarity index 100%
rename from libvisio/README
rename to external/libvisio/README
diff --git a/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk
similarity index 88%
rename from libvisio/UnpackedTarball_libvisio.mk
rename to external/libvisio/UnpackedTarball_libvisio.mk
index c2a2000a77b6..4680d78346b5 100644
--- a/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libvisio,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
-	libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch \
+	external/libvisio/0001-fdo-70480-do-not-crash-reading-malformed-zip.patch \
 ))
 
 # vim: set noet sw=4 ts=4: