diff --git a/README-builds.html b/README-builds.html
index 414403b2ee367a5d31906be265742522e8a5a49d..1f7aae288aad7bb6fedd1f1f771c75f9c88328b0 100644
--- a/README-builds.html
+++ b/README-builds.html
@@ -545,7 +545,11 @@
Windows:
- Make sure you start your build inside a bash/sh/ksh shell.
+ Make sure you start your build inside a bash/sh/ksh shell
+ and are using a make.exe utility built for that
+ environment (a cygwin make.exe is not the same
+ as a make.exe built for something like
+ MKS).
WARNING: Watch out for make version 3.81, it may
not work due to a lack of support for MS-DOS drive letter paths
@@ -826,7 +830,8 @@
All OpenJDK builds require access to the previously released
JDK 6, this is often called a bootstrap JDK.
The JDK 6 binaries can be downloaded from Sun's
- JDK 6 download site.
+ JDK 6 download site.
For build performance reasons
is very important that this bootstrap JDK be made available on the
local disk of the machine doing the build.
diff --git a/make/hotspot-rules.gmk b/make/hotspot-rules.gmk
index b99ffb79f9386a57a8fe845ee378cb2484a57b3a..481b91f1a52da22feaab55b2699e5ad52b5334a4 100644
--- a/make/hotspot-rules.gmk
+++ b/make/hotspot-rules.gmk
@@ -72,6 +72,10 @@ ifeq ($(DEBUG_NAME), fastdebug)
HOTSPOT_TARGET = all_fastdebug
endif
+ifeq ($(ZERO_BUILD), true)
+ HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
+endif
+
HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)