diff --git a/core/find-jdk-tools-jar.sh b/core/find-jdk-tools-jar.sh
index 4c40627eb..e772a1568 100755
--- a/core/find-jdk-tools-jar.sh
+++ b/core/find-jdk-tools-jar.sh
@@ -3,7 +3,7 @@ if [ "x$ANDROID_JAVA_HOME" != x ] && [ -e "$ANDROID_JAVA_HOME/lib/tools.jar" ] ;
 else
     JAVAC=$(which javac)
     if [ -z "$JAVAC" ] ; then
-	echo "Please-install-JDK-5.0,-update-12-or-higher,-which-you-can-download-from-java.sun.com"
+	echo "Please-install-JDK-6.0,-which-you-can-download-from-java.sun.com"
 	exit 1
     fi
     while [ -L $JAVAC ] ; do
diff --git a/core/main.mk b/core/main.mk
index 440e0ccf4..be74e3889 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -75,7 +75,7 @@ build_arch := $(shell uname -m)
 ifneq (64,$(findstring 64,$(build_arch)))
 $(warning ************************************************************)
 $(warning You are attempting to build on a 32-bit system.)
-$(warning Only 64-bit build environments are supported now.)
+$(warning Only 64-bit build environments are supported beyond froyo/2.2.)
 $(warning ************************************************************)
 $(error stop)
 endif