4 files changed, 6 insertions, 21 deletions
diff --git a/languagetool/Package_languagetool.mk b/languagetool/ExtensionPackage_LanguageTool.mk
index a40a1e401e32..3b685d707449 100644
--- a/languagetool/Package_languagetool.mk
+++ b/languagetool/ExtensionPackage_LanguageTool.mk
@@ -7,12 +7,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,languagetool,$(call gb_UnpackedTarball_get_dir,languagetool)))
+$(eval $(call gb_ExtensionPackage_ExtensionPackage,LanguageTool,$(call gb_UnpackedTarball_get_dir,languagetool)/dist/LanguageTool.oxt))
 
-$(eval $(call gb_Package_set_outdir,languagetool,$(OUTDIR)))
-
-$(eval $(call gb_Package_use_external_project,languagetool,languagetool))
-
-$(eval $(call gb_Package_add_file,languagetool,bin/LanguageTool.oxt,dist/LanguageTool.oxt))
+$(eval $(call gb_ExtensionPackage_use_external_project,LanguageTool,languagetool))
 
 # vim: set noet sw=4 ts=4:
diff --git a/languagetool/Module_languagetool.mk b/languagetool/Module_languagetool.mk
index bc430c0368dd..565a14c6c439 100644
--- a/languagetool/Module_languagetool.mk
+++ b/languagetool/Module_languagetool.mk
@@ -13,7 +13,7 @@ ifneq ($(ENABLE_JAVA),)
 ifneq ($(filter LANGUAGETOOL,$(BUILD_TYPE)),)
 $(eval $(call gb_Module_add_targets,languagetool,\
 	ExternalProject_languagetool \
-	Package_languagetool \
+	ExtensionPackage_languagetool \
 	UnpackedTarball_languagetool \
 ))
 endif
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 84d65a5088fd..31f2e32985dd 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -143,17 +143,6 @@ End
 
 #endif
 
-/* ** LanguageTool ** */
-
-#ifdef WITH_EXTENSION_LANGUAGETOOL
-
-Directory gid_Brand_Dir_Share_Extensions_LanguageTool
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "LanguageTool";
-End
-
-#endif
-
 /* ** MySQL Connector ** */
 
 #ifdef WITH_EXTENSION_MARIADBC
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 77b99b1329a3..f76f25fe241e 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -171,9 +171,9 @@ End
 
 File gid_File_Oxt_LanguageTool
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_LanguageTool;
-    Name = "LanguageTool.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "LanguageTool.filelist";
 End
 
 #endif