diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
index 73bfb73ce..e6ef195ba 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
@@ -148,5 +148,10 @@ public InputStreamTransformer getStreamTransformer()
     {
         return fileSet.getStreamTransformer();
     }
+    
+    public String getFileSuffix()
+    {
+        return fileSet.getFileSuffix();
+    }
 
 }
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
index 1ceead190..b7f69660c 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
@@ -177,4 +177,9 @@ public InputStreamTransformer getStreamTransformer()
     {
         return fileSet.getStreamTransformer();
     }
+    
+    public String getFileSuffix()
+    {
+        return fileSet.getFileSuffix();
+    }
 }
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java
index 2664ae166..1a5bd6183 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java
@@ -51,6 +51,8 @@ public class AddDirectoryTask
     private int directoryMode = -1;
 
     private int fileMode = -1;
+    
+    private String fileSuffix;
 
     public AddDirectoryTask( final File directory, InputStreamTransformer transformers )
     {
@@ -139,6 +141,7 @@ else if ( "..".equals( outputDirectory ) )
                     fs.setDirectory( directory );
                     fs.setIncludes( includesArray );
                     fs.setExcludes( excludesArray );
+                    fs.setFileSuffix( fileSuffix );
                     if ( transformer != null )
                     {
                         fs.setStreamTransformer( transformer );
@@ -206,5 +209,9 @@ public void setUseDefaultExcludes( final boolean useDefaultExcludes )
     {
         this.useDefaultExcludes = useDefaultExcludes;
     }
-
+      
+    public void setFileSuffix( String fileSuffix ) 
+    {
+        this.fileSuffix = fileSuffix;
+    }
 }
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
index 1b855fa52..b4e8bd8bf 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
@@ -165,6 +165,7 @@ void addFileSet( final FileSet fileSet, final Archiver archiver, final Assembler
             task.setExcludes( fileSet.getExcludes() );
             task.setIncludes( fileSet.getIncludes() );
             task.setOutputDirectory( destDirectory );
+            task.setFileSuffix( fileSet.getFileSuffix() );
 
             task.execute( archiver );
         }
diff --git a/src/main/mdo/assembly-component.mdo b/src/main/mdo/assembly-component.mdo
index e40933d3c..a4f38a26a 100644
--- a/src/main/mdo/assembly-component.mdo
+++ b/src/main/mdo/assembly-component.mdo
@@ -283,6 +283,16 @@
           <defaultValue>false</defaultValue>
           <type>boolean</type>
         </field>
+        <field>
+          <name>fileSuffix</name>
+          <version>3.2.0+</version>
+          <type>String</type>
+          <description>
+            <![CDATA[
+            Sets a suffix for copying  files in this fileSet. Example : test.xml => testSuffix.xml
+            ]]>
+          </description>
+        </field>
       </fields>
     </class>
     <class>
diff --git a/src/main/mdo/assembly.mdo b/src/main/mdo/assembly.mdo
index 52c9c7e6d..c1e0d127e 100644
--- a/src/main/mdo/assembly.mdo
+++ b/src/main/mdo/assembly.mdo
@@ -403,6 +403,16 @@
           <defaultValue>false</defaultValue>
           <type>boolean</type>
         </field>
+        <field>
+          <name>fileSuffix</name>
+          <version>3.2.0+</version>
+          <type>String</type>
+          <description>
+            <![CDATA[
+            Sets a suffix for copying  files in this fileSet. Example : test.xml => testSuffix.xml
+            ]]>
+          </description>
+        </field>
       </fields>
     </class>
     <class>