diff --git a/Makefile.top b/Makefile.top
index 15d27ba6d5cc..a1090e27e28d 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -394,7 +394,8 @@ endif
 
 build: build-packimages
 ifeq ($(OS_FOR_BUILD),WNT)
-	cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl
+	cd instsetoo_native && unset MAKEFLAGS && \
+		$(SOLARENV)/bin/build.pl FORCE2ARCHIVE=TRUE
 else
 	cd instsetoo_native && unset MAKEFLAGS && \
         $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
@@ -425,11 +426,16 @@ install-strip:
 dev-install: build
 	@rm -rf $(DEVINSTALLDIR)
 	@mkdir $(DEVINSTALLDIR)
+ifeq ($(OS_FOR_BUILD),WNT)
+	unzip -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip"
+	mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
+else
 ifeq ($(DISABLE_LINKOO),TRUE)
 	@ooinstall $(DEVINSTALLDIR)/opt
 	@install-gdb-printers -L
 else
 	@ooinstall -l $(DEVINSTALLDIR)/opt
+endif
 endif
 	@rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install