--- a/langtools/make/Makefile	Mon Apr 20 19:01:35 2009 +0100
+++ b/langtools/make/Makefile	Wed May 06 18:04:08 2009 +0100
@@ -107,7 +107,7 @@
 
 ifeq ($(DEBUG_CLASSFILES), true)
   ANT_OPTIONS += -Djavac.debug=true
-  ANT_OPTIONS += -Djavac.debuglevel=source,lines,vars
+  ANT_OPTIONS += -Ddebug.classfiles=true
 endif
 
 # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)