diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index f1473a3a..547663be 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -33,6 +33,7 @@
   <!-- ================================================================== -->
   
   <goal name="javadoc:init" prereqs="xdoc:init">
+  
     <!-- internal variables -->
     <j:set var="internal.javadoc.jar"               value="${maven.build.dir}/${maven.final.name}_javadoc.jar"/>
     <j:set var="internal.javadoc.needed"            value="null"/>
@@ -43,6 +44,10 @@
       <ant:echo>
 ### Debug mode is on ###
 ==================================
+=== java plugin properties     ===
+==================================
+maven.compile.encoding          = [${maven.compile.encoding}]
+==================================
 === javadoc plugin properties  ===
 ==================================
 maven.javadoc.additionalparam   = [${maven.javadoc.additionalparam}]
@@ -245,7 +250,11 @@ internal.javadoc.working.dir    = [${internal.javadoc.working.dir}]
         <j:if test="${context.getVariable('maven.javadoc.source') != null}">
           <ant:setProperty name="source" value="${maven.javadoc.source}" />
         </j:if>
-    
+
+        <j:if test="${context.getVariable('maven.compile.encoding') != null}">
+          <ant:setProperty name="encoding" value="${maven.compile.encoding}" />
+        </j:if>
+
         <!-- Process/Parse links -->
         <!-- This code allows to specify a packagelistLoc even when in online mode -->
         <j:forEach var="link" items="${links}">
diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml
index 207b3065..324b60cd 100644
--- a/javadoc/xdocs/changes.xml
+++ b/javadoc/xdocs/changes.xml
@@ -24,6 +24,7 @@
   </properties>
   <body>
     <release version="1.5.1-SNAPSHOT" date="In CVS">
+      <action dev="aheritier" type="fix" issue="MPJAVADOC-31" due-to="Takayoshi Kimura">Use the property 'maven.compile.encoding' to set the encoding used when reading sources in javadoc task.</action>
       <action dev="aheritier" type="fix" issue="MPJAVADOC-29">Packages list broken on jdk 1.3 for multiple packages.</action>
       <action dev="aheritier" type="fix" issue="MPJAVADOC-28">@link tag not working with package names.</action>
       <action dev="aheritier" type="add">Add the property maven.javadoc.debug to print informations to debug the plugin.</action>
diff --git a/javadoc/xdocs/properties.xml b/javadoc/xdocs/properties.xml
index cf8f93df..dbac6bc8 100644
--- a/javadoc/xdocs/properties.xml
+++ b/javadoc/xdocs/properties.xml
@@ -306,5 +306,21 @@ maven.javadoc.offlineLinks=http://java.sun.com/j2se/1.4.2/docs/api/#/opt/java-ap
         </tr>
       </table>
     </section>
+    <section name="Other Settings">
+      <table>
+        <tr>
+          <th>Property</th>
+          <th>Optional?</th>
+          <th>Description</th>
+        </tr>
+        <tr>
+          <td>maven.compile.encoding</td>
+          <td>Yes</td>
+          <td>
+            Sets the encoding of the .java files being documented (and compiled). 
+          </td>
+        </tr>
+      </table>
+    </section>    
   </body>
 </document>
\ No newline at end of file
