diff --git a/cactus/plugin.jelly b/cactus/plugin.jelly
index 29b9eb7a..9fa1b11f 100644
--- a/cactus/plugin.jelly
+++ b/cactus/plugin.jelly
@@ -72,6 +72,7 @@
     
     <j:choose>
       <j:when test="${cactusSourcePresent == 'true'}">
+
       	<ant:javac destdir="${cactus.target.classes.dir}"
             excludes="**/package.html"
             debug="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.debug')}"
@@ -111,6 +112,15 @@
             <ant:setProperty name="verbose" value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.verbose')}"/>
           </j:if>
         </ant:javac>
+
+        <!-- Copy non java source files -->
+        <ant:copy todir="${cactus.target.classes.dir}">
+          <ant:fileset dir="${cactus.src.dir}">
+            <ant:exclude name="**/*.java"/>
+            <ant:exclude name="**/*.html"/>
+          </ant:fileset>
+        </ant:copy>
+
       </j:when>
       <j:otherwise>
         <ant:echo>No Cactus source files to compile.</ant:echo>
diff --git a/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/test.xml b/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/test.xml
new file mode 100644
index 00000000..a15853b1
--- /dev/null
+++ b/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/test.xml
@@ -0,0 +1,4 @@
+<!-- Do not delete -->
+
+<!-- Some sample resource file to verify that non java source files
+     are correctly copied by the cactus:compile goal -->
diff --git a/cactus/xdocs/changes.xml b/cactus/xdocs/changes.xml
index 37fb8c37..8d2be5cd 100644
--- a/cactus/xdocs/changes.xml
+++ b/cactus/xdocs/changes.xml
@@ -8,6 +8,12 @@
   <body>
 
     <release version="3.0" date="in CVS">
+      <action dev="vmassol" type="fix">
+        The <code>cactus:compile</code> goal now correctly copy the non
+        java files to the target class directory. Thanks to Florin Vancea for
+        reporting this bug. This fixes bug
+        <a href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-478">MAVEN-478</a>.
+      </action>
       <action dev="vmassol" type="update">
         Major change: updated to use the Cactus/Ant integration built on 
         23rd of May 2003 (it is completely different from the Cactus/Ant
