diff --git a/Repository.mk b/Repository.mk
index 10c8f62b4393..b2030852bdb0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -607,6 +607,20 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbina
 	) \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activex, \
+	$(if $(DISABLE_ACTIVEX),,\
+		so_activex \
+	) \
+))
+
+ifneq ($(BUILD_X64),)
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexwin64, \
+	$(if $(DISABLE_ACTIVEX),,\
+		so_activex_x64 \
+	) \
+))
+endif
+
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinarytable, \
 	$(if $(WINDOWS_SDK_HOME),\
 		instooofiltmsi \
@@ -636,8 +650,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	fop \
 	jfregca \
 	regpatchactivex \
-	so_activex \
-	so_activex_x64 \
 	thidxmsi \
 ))
 endif
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 1fe02e5328f5..271d225e1093 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -10,6 +10,8 @@
 $(eval $(call gb_AutoInstall_AutoInstall))
 
 $(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE))
+$(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
 $(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
diff --git a/scp2/InstallModule_activex.mk b/scp2/InstallModule_activex.mk
index 2e3b28faa065..ea9b4731313b 100644
--- a/scp2/InstallModule_activex.mk
+++ b/scp2/InstallModule_activex.mk
@@ -9,12 +9,10 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/activex))
 
-$(eval $(call gb_InstallModule_define_if_set,scp2/activex,\
-	BUILD_X64 \
-))
-
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/activex,\
-    scp2/source/activex/file_activex \
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/activex,\
+	activexbinarytable \
+	activex \
+	activexwin64 \
 ))
 
 $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/activex,\
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
deleted file mode 100644
index e6864b83e6b9..000000000000
--- a/scp2/source/activex/file_activex.scp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-File gid_File_Lib_Soactivex
-    LIB_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "so_activex.dll";
-End
-
-#ifdef BUILD_X64
-	File gid_File_Lib_Soactivex64
-		LIB_FILE_BODY;
-		Styles = (PACKED);
-		Dir = SCP2_OOO_BIN_DIR;
-		Name = "so_activex_x64.dll";
-		ComponentCondition = "VersionNT64";
-	End
-#endif
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
index e56ced78b120..fbcbaba58ff6 100644
--- a/scp2/source/activex/module_activex.scp
+++ b/scp2/source/activex/module_activex.scp
@@ -17,7 +17,10 @@
  */
 
 #include "macros.inc"
+
 #include "AutoInstall/activexbinarytable"
+#include "AutoInstall/activex"
+#include "AutoInstall/activexwin64"
 
 Module gid_Module_Optional_Activexcontrol
     PackageInfo = "packinfo_office.txt";
@@ -26,8 +29,8 @@ Module gid_Module_Optional_Activexcontrol
     Default = NO;
     Minimal = NO;
     ParentID = gid_Module_Optional;
-    Files = (auto_activexbinarytable_ALL
-        gid_File_Lib_Soactivex,
-        gid_File_Lib_Soactivex64,
+    Files = (auto_activexbinarytable_ALL,
+        auto_activex_ALL,
+        auto_activexwin64_ALL,
         gid_File_Lib_Regpatchactivex_Msi);
 End