diff --git a/.hgignore b/.hgignore
index 0092bd4ff5a6978fcf62c4ea625829bfcdea25c2..2d339f9988ca2a6754c74d52b4eeabae0f79b1d2 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,3 +1,4 @@
 ^build/
 ^dist/
 /nbproject/private/
+^webrev
diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk
index 3aa6e16d982a60d8691d2b72714c45eeb410878e..7e080a60e40c28dae7ac3edb86229fa5a17b2158 100644
--- a/make/deploy-rules.gmk
+++ b/make/deploy-rules.gmk
@@ -41,7 +41,7 @@ else
   IMAGES_TARGET = images
 endif
 
-DEPLOY_BUILD_TARGETS = sanity javaws-all plugin-all 
+DEPLOY_BUILD_TARGETS = sanity deploy 
 # Only build 7-Zip LZMA file compression if it is available
 # Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
 ifeq ($(ARCH_DATA_MODEL), 32)
@@ -79,7 +79,6 @@ ifneq ($(KERNEL), off)
       ifeq ($(UP_TMP), true)
         DEPLOY_BUILD_TARGETS += cmd-comp-all
       endif
-      DEPLOY_BUILD_TARGETS += kernel-all
     endif
   endif
 endif
diff --git a/make/install-rules.gmk b/make/install-rules.gmk
index b20f8ea072f47eb3396610e047a602f3a24e4a72..56b9baa05dde2c0f0dd42fa3fa30088807b9d889 100644
--- a/make/install-rules.gmk
+++ b/make/install-rules.gmk
@@ -93,6 +93,10 @@ ifeq ($(BUILD_INSTALL), true)
 	fi
 endif
 
+combo_build:
+	@$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
+	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
+
 install-clobber:
 ifeq ($(BUILD_INSTALL), true)
 	@$(call MakeStart, install, clobber)