diff --git a/ChangeLog b/ChangeLog
index 93eca84..543af44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 15 01:31:28 2008  Minero Aoki  <aamine@loveruby.net>
+
+	* bin/cbc: allow overriding java runtime by setting JAVA
+	  environment variable.
+
 Mon Sep 15 01:24:57 2008  Minero Aoki  <aamine@loveruby.net>
 
 	* bin/cbc: follow last directory tree change.
diff --git a/bin/cbc b/bin/cbc
index ca0056d..952b888 100755
--- a/bin/cbc
+++ b/bin/cbc
@@ -1,7 +1,7 @@
 #!/bin/bash
 # cbc -- cflat compiler
 
-JAVA=java
+JAVA=${JAVA:-java}
 
 srcdir_root="$(dirname "$(dirname "$0")")"
 "$JAVA" -classpath "$srcdir_root/lib/cbc.jar" \