diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index 7917f84bd..f648bc0ab 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -438,7 +438,8 @@ public class Javac extends MatchingTask {
 
         String compiler = project.getProperty("build.compiler");
         if (compiler == null) {
-            if (Project.getJavaVersion().startsWith("1.3")) {
+            if (Project.getJavaVersion() != Project.JAVA_1_1 &&
+                Project.getJavaVersion() != Project.JAVA_1_2) {
                 compiler = "modern";
             } else {
                 compiler = "classic";
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
index 0c0d6aae2..3813295a0 100755
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
@@ -276,7 +276,8 @@ public class Javah extends Task {
 
         String compiler = project.getProperty("build.compiler");
         if (compiler == null) {
-            if (Project.getJavaVersion().startsWith("1.3")) {
+            if (Project.getJavaVersion() != Project.JAVA_1_1 &&
+                Project.getJavaVersion() != Project.JAVA_1_2) {
                 compiler = "modern";
             } else {
                 compiler = "classic";