diff --git a/WHATSNEW b/WHATSNEW
index ef29020d7..b98224167 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -248,6 +248,9 @@ Other changes:
 
 * <ssh> and <scp> support keyboard-interactive authentication now.
 
+* <javadoc> now supports -breakiterator for custom doclets if Ant is
+  running on JSE 5.0 or higher.  Bugzilla Report: 34580.
+
 Changes from Ant 1.6.4 to Ant 1.6.5
 ===================================
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index aa4b04a1e..3df2e9c67 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -1569,6 +1569,8 @@ public class Javadoc extends Task {
         boolean javadoc4 =
             !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2) &&
             !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_3);
+        boolean javadoc5 = javadoc4 &&
+            !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_4);
 
         Vector packagesToDoc = new Vector();
         Path sourceDirs = new Path(getProject());
@@ -1886,7 +1888,7 @@ public class Javadoc extends Task {
             if (linksource && doclet == null) {
                 toExecute.createArgument().setValue("-linksource");
             }
-            if (breakiterator && doclet == null) {
+            if (breakiterator && (doclet == null || javadoc5)) {
                 toExecute.createArgument().setValue("-breakiterator");
             }
             if (noqualifier != null && doclet == null) {