diff --git a/Repository.mk b/Repository.mk
index 0724e4399398..3cc7a38f0742 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Helper_register_executables,OOO,\
-    crashrep_com \
 	guiloader \
 	guistdio \
 	odbcconfig \
@@ -67,23 +66,27 @@ $(eval $(call gb_Helper_register_executables,OOO,\
 	sdraw \
 	simpress \
 	soffice \
-	soffice_bin \
 	smath \
 	sweb \
 	swriter \
 	unoinfo \
 	unopkg \
-    unopkg_bin \
-    unopkg_com \
 	unopkgio \
 ))
 
 else
 
+ifeq ($(OS_FOR_BUILD),WNT)
+$(eval $(call gb_Helper_register_executables,OOO,\
+	soffice_bin \
+    unopkg_bin \
+))
+else
 $(eval $(call gb_Helper_register_executables,OOO,\
     soffice.bin \
     unopkg.bin \
 ))
+endif
 
 ifeq ($(OS),MACOSX)
 
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 8815432d1457..456171d774b6 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS),WNT)
+ifeq ($(OS_FOR_BUILD),WNT)
 sofficebin := soffice_bin
 else
 sofficebin := soffice.bin
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index c635c2b22995..464824fa2f75 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS),WNT)
+ifeq ($(OS_FOR_BUILD),WNT)
 unopkgbin := unopkg_bin
 else
 unopkgbin := unopkg.bin