diff --git a/Repository.mk b/Repository.mk
index b09482857655..811ed6de7ee6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -141,8 +141,17 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	$(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \
 	$(if $(filter unx,$(GUIBASE)),uri-encode) \
 	ui-previewer \
+	$(if $(filter WNT,$(OS)), \
+		senddoc \
+	) \
 ))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_executables_for_install,OOO,quickstart, \
+	quickstart \
+))
+endif
+
 ifneq ($(ENABLE_CRASHDUMP),)
 $(eval $(call gb_Helper_register_executables_for_install,OOO,crashrep, \
 	crashrep \
@@ -178,10 +187,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 	vcldemo \
 	tiledrendering \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
-	$(if $(filter WNT,$(OS)), \
-		quickstart \
-		senddoc \
-	) \
 ))
 
 $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 72a6340ba76f..9ab563bcf4d4 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE
 $(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
diff --git a/scp2/InstallModule_quickstart.mk b/scp2/InstallModule_quickstart.mk
index 3d9be72b1fbe..c29768c5d996 100644
--- a/scp2/InstallModule_quickstart.mk
+++ b/scp2/InstallModule_quickstart.mk
@@ -9,6 +9,10 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/quickstart))
 
+$(eval $(call gb_installmodule_use_auto_install_libs,scp2/quickstart,\
+	quickstart \
+))
+
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/quickstart,\
     scp2/source/quickstart/file_quickstart \
     scp2/source/quickstart/registryitem_quickstart \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 7e6187fec1b7..ce9d533b00c8 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -165,13 +165,6 @@ File gid_File_Bin_Senddoc
     Name = "shell_senddoc.filelist";
     Styles = (FILELIST, PACKED);
 End
-#elif defined WNT
-File gid_File_Bin_Senddoc
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = "senddoc.exe";
-    Styles = (PACKED);
-End
 #endif
 
 File gid_File_framework_dtd
diff --git a/scp2/source/quickstart/file_quickstart.scp b/scp2/source/quickstart/file_quickstart.scp
deleted file mode 100644
index 51e2d8bec4bc..000000000000
--- a/scp2/source/quickstart/file_quickstart.scp
+++ /dev/null
@@ -1,26 +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_Exe_Quickstart
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-    Name = "quickstart.exe";
-End
diff --git a/scp2/source/quickstart/module_quickstart.scp b/scp2/source/quickstart/module_quickstart.scp
index 62407d8606f3..108052691e83 100644
--- a/scp2/source/quickstart/module_quickstart.scp
+++ b/scp2/source/quickstart/module_quickstart.scp
@@ -18,10 +18,12 @@
 
 #include "macros.inc"
 
+#include "AutoInstall/quickstart"
+
 Module gid_Module_Optional_Quickstart
     MOD_NAME_DESC ( MODULE_OPTIONAL_QUICKSTART );
     Sortkey = "1400";
     Default = YES;
     ParentID = gid_Module_Optional;
-    Files = (gid_File_Exe_Quickstart, gid_File_Tmp_Userinstall_Quickstart_Inf);
+    Files = (auto_quickstart_ALL, gid_File_Tmp_Userinstall_Quickstart_Inf);
 End