diff --git a/pmd-eclipse-feature/build.xml b/pmd-eclipse-feature/build.xml
index 2f555f997f..03ba2b0d49 100644
--- a/pmd-eclipse-feature/build.xml
+++ b/pmd-eclipse-feature/build.xml
@@ -56,7 +56,7 @@
 			<param name="os" value="*"/>
 			<param name="feature.base" value="${feature.temp.folder}"/>
 		</antcall>
-		<jar jarfile="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.1.v3.jar" basedir="${feature.temp.folder}/features/net.sourceforge.pmd.eclipse_2.0.1.v3"/>
+		<jar jarfile="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.2.v3.jar" basedir="${feature.temp.folder}/features/net.sourceforge.pmd.eclipse_2.0.2.v3"/>
 		<delete dir="${feature.temp.folder}"/>
 	</target>
 
@@ -65,11 +65,11 @@
 			<param name="destination.temp.folder" value="${feature.base}/plugins"/>
 			<param name="target" value="gather.bin.parts"/>
 		</antcall>
-		<mkdir dir="${feature.base}/features/net.sourceforge.pmd.eclipse_2.0.1.v3"/>
-		<copy todir="${feature.base}/features/net.sourceforge.pmd.eclipse_2.0.1.v3">
+		<mkdir dir="${feature.base}/features/net.sourceforge.pmd.eclipse_2.0.2.v3"/>
+		<copy todir="${feature.base}/features/net.sourceforge.pmd.eclipse_2.0.2.v3">
 			<fileset dir="${basedir}" includes="feature.xml,feature.properties,pmd_logo_small.jpg"			/>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/net.sourceforge.pmd.eclipse_2.0.1.v3/feature.xml" featureIds="" pluginIds="net.sourceforge.pmd.eclipse,2.0.1.v3,net.sourceforge.pmd.core,1.3.3,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/net.sourceforge.pmd.eclipse_2.0.2.v3/feature.xml" featureIds="" pluginIds="net.sourceforge.pmd.eclipse,2.0.2.v3,net.sourceforge.pmd.core,1.3.3,"/>
 		<antcall target="ROOTFILES${os}_${ws}_${arch}"/>
 	</target>
 	<target name="ROOTFILES*_*_*">
@@ -86,7 +86,7 @@
 			<param name="feature.base" value="${feature.temp.folder}"/>
 			<param name="os" value="*"/>
 		</antcall>
-		<zip zipfile="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.1.v3.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip"/>
+		<zip zipfile="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.2.v3.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip"/>
 		<delete dir="${feature.temp.folder}"/>
 	</target>
 
@@ -94,11 +94,11 @@
 		<delete dir="${feature.temp.folder}"/>
 		<mkdir dir="${feature.temp.folder}"/>
 		<antcall target="all.children">
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/net.sourceforge.pmd.eclipse.source_2.0.1.v3/src"/>
+			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/net.sourceforge.pmd.eclipse.source_2.0.2.v3/src"/>
 			<param name="include.children" value="true"/>
 			<param name="target" value="gather.sources"/>
 		</antcall>
-		<zip zipfile="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.1.v3.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip"/>
+		<zip zipfile="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.2.v3.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip"/>
 		<delete dir="${feature.temp.folder}"/>
 	</target>
 
@@ -110,15 +110,15 @@
 			<param name="include.children" value="true"/>
 			<param name="target" value="gather.logs"/>
 		</antcall>
-		<zip zipfile="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.1.v3.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip"/>
+		<zip zipfile="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.2.v3.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip"/>
 		<delete dir="${feature.temp.folder}"/>
 	</target>
 
 	<target name="clean" depends="init" description="Clean the feature: net.sourceforge.pmd.eclipse of all the zips, jars and logs created.">
-		<delete file="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.1.v3.jar"/>
-		<delete file="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.1.v3.bin.dist.zip"/>
-		<delete file="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.1.v3.log.zip"/>
-		<delete file="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.1.v3.src.zip"/>
+		<delete file="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.2.v3.jar"/>
+		<delete file="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.2.v3.bin.dist.zip"/>
+		<delete file="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.2.v3.log.zip"/>
+		<delete file="${feature.destination}/net.sourceforge.pmd.eclipse_2.0.2.v3.src.zip"/>
 		<delete dir="${feature.temp.folder}"/>
 		<antcall target="all.children">
 			<param name="target" value="clean"/>
@@ -127,14 +127,14 @@
 
 	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
 		<eclipse.convertPath fileSystemPath="c:/home/phherlin/javadev/PMD_3/pmd-eclipse-feature" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${net.sourceforge.pmd.eclipse_2.0.1.v3}" depth="infinite"/>
+		<eclipse.refreshLocal resource="${net.sourceforge.pmd.eclipse_2.0.2.v3}" depth="infinite"/>
 		<antcall target="all.children">
 			<param name="target" value="refresh"/>
 		</antcall>
 	</target>
 	<target name="gather.sources">
 		<antcall target="children">
-			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/net.sourceforge.pmd.eclipse.source_2.0.1.v3/src"/>
+			<param name="destination.temp.folder" value="${feature.temp.folder}/plugins/net.sourceforge.pmd.eclipse.source_2.0.2.v3/src"/>
 			<param name="target" value="gather.sources"/>
 		</antcall>
 	</target>
diff --git a/pmd-eclipse-feature/feature.xml b/pmd-eclipse-feature/feature.xml
index 0846001b24..c53a930017 100644
--- a/pmd-eclipse-feature/feature.xml
+++ b/pmd-eclipse-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="net.sourceforge.pmd.eclipse"
       label="%feature.label"
-      version="2.0.1.v3"
+      version="2.0.2.v3"
       provider-name="%feature.provider_name"
       image="pmd_logo_small.jpg">
 
@@ -33,14 +33,14 @@
 
    <plugin
          id="net.sourceforge.pmd.eclipse"
-         download-size="981"
-         install-size="0"
-         version="2.0.1.v3"/>
+         download-size="552"
+         install-size="748"
+         version="2.0.2.v3"/>
 
    <plugin
          id="net.sourceforge.pmd.core"
          download-size="3685"
-         install-size="0"
+         install-size="4064"
          version="1.3.3"/>
 
 </feature>
diff --git a/pmd-eclipse/CHANGELOG.txt b/pmd-eclipse/CHANGELOG.txt
index 1bb4fa6011..d8e4f09fc9 100644
--- a/pmd-eclipse/CHANGELOG.txt
+++ b/pmd-eclipse/CHANGELOG.txt
@@ -2,6 +2,16 @@ Change log for the PMD Eclipse plugin
 -------------------------------------
 
 
+v2.0.2 - 19/12/2003
+
+Runtime
+-------
+. Fixing malformed UTF-8 characters in generated xml files
+  (thanks to Jacques Lebourgeois)
+
+
+
+----------------------------------------------------------------------------------------
 v2.0.1 - 09/12/2003
 
 Runtime
diff --git a/pmd-eclipse/build.xml b/pmd-eclipse/build.xml
index 9422ee2125..dfc3e3fa56 100644
--- a/pmd-eclipse/build.xml
+++ b/pmd-eclipse/build.xml
@@ -29,16 +29,16 @@
 		<antcall target="gather.bin.parts">
 			<param name="destination.temp.folder" value="${temp.folder}/"/>
 		</antcall>
-		<zip zipfile="${plugin.destination}/net.sourceforge.pmd.eclipse_2.0.1.v3.jar" basedir="${temp.folder}/net.sourceforge.pmd.eclipse_2.0.1.v3" filesonly="false" whenempty="skip"/>
+		<zip zipfile="${plugin.destination}/net.sourceforge.pmd.eclipse_2.0.2.v3.jar" basedir="${temp.folder}/net.sourceforge.pmd.eclipse_2.0.2.v3" filesonly="false" whenempty="skip"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.1.v3"/>
-		<copy todir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.1.v3">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.2.v3"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.2.v3">
 			<fileset dir="${build.result.folder}" includes="CHANGELOG.txt,LICENSE.txt,README.txt,RELNOTES.txt,TODO.txt,about.ini,doc.zip,icons/,lib/,log4j.dtd,log4j.xml,messages.properties,nl/,plugin.properties,plugin.xml,plugin_fr.properties,toc.xml,welcome.xml,pmd-eclipse.jar"			/>
 		</copy>
-		<copy todir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.1.v3">
+		<copy todir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.2.v3">
 			<fileset dir="${basedir}" includes="CHANGELOG.txt,LICENSE.txt,README.txt,RELNOTES.txt,TODO.txt,about.ini,doc.zip,icons/,lib/,log4j.dtd,log4j.xml,messages.properties,nl/,plugin.properties,plugin.xml,plugin_fr.properties,toc.xml,welcome.xml,pmd-eclipse.jar"			/>
 		</copy>
 	</target>
@@ -80,23 +80,23 @@
 	</target>
 
 	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.1.v3"/>
-		<copy file="${build.result.folder}/pmd-eclipsesrc.zip" todir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.1.v3"/>
-		<copy todir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.1.v3">
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.2.v3"/>
+		<copy file="${build.result.folder}/pmd-eclipsesrc.zip" todir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.2.v3"/>
+		<copy todir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.2.v3">
 			<fileset dir="${basedir}" includes="build.properties,build.xml,src/"			/>
 		</copy>
 	</target>
 
 	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.1.v3"/>
-		<copy file="${temp.folder}/pmd-eclipse.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.1.v3"/>
+		<mkdir dir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.2.v3"/>
+		<copy file="${temp.folder}/pmd-eclipse.jar.bin.log" todir="${destination.temp.folder}/net.sourceforge.pmd.eclipse_2.0.2.v3"/>
 	</target>
 
 	<target name="clean" depends="init" description="Clean the plug-in: net.sourceforge.pmd.eclipse of all the zips, jars and logs created.">
 		<delete file="${build.result.folder}/pmd-eclipse.jar"/>
 		<delete file="${build.result.folder}/pmd-eclipsesrc.zip"/>
-		<delete file="${plugin.destination}/net.sourceforge.pmd.eclipse_2.0.1.v3.jar"/>
-		<delete file="${plugin.destination}/net.sourceforge.pmd.eclipse_2.0.1.v3.zip"/>
+		<delete file="${plugin.destination}/net.sourceforge.pmd.eclipse_2.0.2.v3.jar"/>
+		<delete file="${plugin.destination}/net.sourceforge.pmd.eclipse_2.0.2.v3.zip"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
@@ -119,7 +119,7 @@
 		<delete>
 			<fileset dir="${temp.folder}" includes="**/*.bin.log"			/>
 		</delete>
-		<zip zipfile="${plugin.destination}/net.sourceforge.pmd.eclipse_2.0.1.v3.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip"/>
+		<zip zipfile="${plugin.destination}/net.sourceforge.pmd.eclipse_2.0.2.v3.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip"/>
 		<delete dir="${temp.folder}"/>
 	</target>
 
diff --git a/pmd-eclipse/plugin.xml b/pmd-eclipse/plugin.xml
index 7a85b7db54..2dd0119e75 100644
--- a/pmd-eclipse/plugin.xml
+++ b/pmd-eclipse/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.pmd.eclipse"
    name="%plugin.name"
-   version="2.0.1.v3"
+   version="2.0.2.v3"
    provider-name="%plugin.provider"
    class="net.sourceforge.pmd.eclipse.PMDPlugin">