diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 0f14e1dc..d4e4772a 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -662,6 +662,8 @@
     <echo message="Validation of the locale entries"/>
 
     <j:invokeStatic method="getAvailableLocales" className="java.util.Locale" var="availableLocales"/>
+<!-- FIXME: Use this when JELLY-274 gets fixed.
+            cf. https://issues.apache.org/jira/browse/JELLY-274
     <j:invokeStatic className="java.util.Arrays" method="asList" var="availableLocalesAsList">
       <j:arg value="${availableLocales}" type="[Ljava.lang.Object;"/>
     </j:invokeStatic>
@@ -671,6 +673,20 @@
         <echo message="WARNING: The locale '${locale}' is not a valid one."/>
       </j:if>
    </j:forEach>
+-->
+
+    <!-- Ugly hack to work around JELLY-274. -->
+    <j:forEach var="locale" items="${locales}">
+      <j:set var="localeIsAvailable" value="false"/>
+      <j:forEach var="availableLocale" items="${availableLocales}">
+        <j:if test="${locale == availableLocale}">
+          <j:set var="localeIsAvailable" value="true"/>
+        </j:if>
+      </j:forEach>
+      <j:if test="${!localeIsAvailable}">
+        <echo message="WARNING: The locale '${locale}' is not a valid one."/>
+      </j:if>
+   </j:forEach>
  </goal>
 
   <goal
diff --git a/xdoc/project.xml b/xdoc/project.xml
index 5131323c..2c04dda1 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -172,6 +172,15 @@
       </roles>
       <timezone>-7</timezone>
     </developer>
+    <developer>
+      <name>Shinobu Kawai</name>
+      <id>shinobu</id>
+      <email>shinobu@apache.org</email>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>-8</timezone>
+    </developer>
   </developers>
   <dependencies>
     <dependency>
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index aa0d596e..d51b938c 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -24,9 +24,11 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
     <author email="aheritier@apache.org">Arnaud Heritier</author>
     <author email="vincent.siveton@gmail.org">Vincent Siveton</author>
+    <author email="shinobu@apache.org">Shinobu Kawai</author>
   </properties>
   <body>
     <release version="1.10.1-SNAPSHOT" date="In SVN">
+      <action dev="shinobu" type="fix" issue="MPXDOC-200" due-to="Benoit Xhenseval">maven-xdoc-plugin-1.10.1-SNAPSHOT fails under JDK 6</action>
       <action dev="aheritier" type="add" issue="MPXDOC-203">New 'Built by Maven' logos - default changed to mavenlogo_builtby_w.png</action>
       <action dev="ltheussl" type="fix" issue="MPXDOC-202">Plugin fails with anonymous access and empty password in scm url.</action>
       <action dev="aheritier" type="update">Change margin between menu items in stylus.css.</action>
