diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index a10f57e7ddb0..76c55b33c1c6 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -48,6 +48,12 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Pagein_impress \
     Pagein_writer \
     CustomTarget_soffice \
+    Package_sbase_sh \
+    Package_scalc_sh \
+    Package_sdraw_sh \
+    Package_simpress_sh \
+    Package_smath_sh \
+    Package_swriter_sh \
     Package_soffice_sh \
 ))
 endif
diff --git a/desktop/Package_sbase_sh.mk b/desktop/Package_sbase_sh.mk
new file mode 100644
index 000000000000..ada63e2d5ffd
--- /dev/null
+++ b/desktop/Package_sbase_sh.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,desktop_sbase_sh,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call gb_Package_add_file,desktop_sbase_sh,$(LIBO_BIN_FOLDER)/sbase,sbase.sh))
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/Package_scalc_sh.mk b/desktop/Package_scalc_sh.mk
new file mode 100644
index 000000000000..5d29e1625899
--- /dev/null
+++ b/desktop/Package_scalc_sh.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,desktop_scalc_sh,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call gb_Package_add_file,desktop_scalc_sh,$(LIBO_BIN_FOLDER)/scalc,scalc.sh))
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index ed2ae3e84795..3c86abe88e90 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -12,12 +12,6 @@ $(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scrip
 ifeq (,$(filter MACOSX WNT,$(OS)))
 
 $(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sbase,sbase.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/scalc,scalc.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sdraw,sdraw.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/simpress,simpress.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/smath,smath.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/swriter,swriter.sh))
 
 endif
 
diff --git a/desktop/Package_sdraw_sh.mk b/desktop/Package_sdraw_sh.mk
new file mode 100644
index 000000000000..58ae0f5fd32c
--- /dev/null
+++ b/desktop/Package_sdraw_sh.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,desktop_sdraw_sh,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call gb_Package_add_file,desktop_sdraw_sh,$(LIBO_BIN_FOLDER)/sdraw,sdraw.sh))
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/Package_simpress_sh.mk b/desktop/Package_simpress_sh.mk
new file mode 100644
index 000000000000..bb315aa7743b
--- /dev/null
+++ b/desktop/Package_simpress_sh.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,desktop_simpress_sh,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call gb_Package_add_file,desktop_simpress_sh,$(LIBO_BIN_FOLDER)/simpress,simpress.sh))
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/Package_smath_sh.mk b/desktop/Package_smath_sh.mk
new file mode 100644
index 000000000000..67c113a206c0
--- /dev/null
+++ b/desktop/Package_smath_sh.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,desktop_smath_sh,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call gb_Package_add_file,desktop_smath_sh,$(LIBO_BIN_FOLDER)/smath,smath.sh))
+
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/Package_swriter_sh.mk b/desktop/Package_swriter_sh.mk
new file mode 100644
index 000000000000..88720a9326d1
--- /dev/null
+++ b/desktop/Package_swriter_sh.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,desktop_swriter_sh,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call gb_Package_add_file,desktop_swriter_sh,$(LIBO_BIN_FOLDER)/swriter,swriter.sh))
+
+# vim: set ts=4 sw=4 noet: