diff --git a/junit-report/src/plugin-resources/junit.jsl b/junit-report/src/plugin-resources/junit.jsl
index ec20d38b..3cc04d1c 100644
--- a/junit-report/src/plugin-resources/junit.jsl
+++ b/junit-report/src/plugin-resources/junit.jsl
@@ -27,6 +27,7 @@
   xmlns:util="jelly:util"
   xmlns:junit="junit"
   xmlns:doc="doc"
+  xmlns:ant="jelly:ant"
   trim="false">
 
   <j:useBean var="stringTool" class="org.apache.maven.util.StringTool"/>
@@ -249,6 +250,54 @@ ${current.attributeValue('message')}
           <j:forEach var="testsuite" items="${testsuites}">
             <a name="${testsuite.attribute('name').value}"></a>
             <subsection name="${testsuite.attribute('name').value}">
+              <j:set var="package" value="${testsuite.attribute('package').value}" />
+              <j:set var="name" value="${testsuite.attribute('name').value}" />
+              <j:set var="systemOut" value="${testsuite.element('system-out').getText()}" />
+              <j:set var="systemErr" value="${testsuite.element('system-err').getText()}" />
+
+              <j:set var="baseFolder">${maven.build.dir}/generated-xdocs/junit-report/${package.replaceAll('\.','/')}</j:set>
+              <ant:mkdir dir="${baseFolder}"/>
+                            
+              <p>
+                <j:if test="${systemOut.length() &gt; 0 }">
+                  <j:set var="systemOutFilePath">${baseFolder}/${name}-out.xml</j:set>
+                  [<a href="junit-report/${package.replaceAll('\.','/')}/${name}-out.html">system out</a>]
+                  <j:file name="${systemOutFilePath}" outputMode="xml">
+                    <document>
+                      <properties>
+                        <title>System Out for ${name}</title>
+                      </properties>
+                      <body>
+                        <section name="System Out for ${name}">
+	                      <code>
+	                        <pre>${systemOut}</pre>
+	                      </code>
+                        </section>
+                      </body>
+                    </document>
+                  </j:file>
+                </j:if>
+                
+                <j:if test="${systemErr.length() &gt; 0 }">
+                  <j:set var="systemErrFilePath">${baseFolder}/${name}-err.xml</j:set>
+                  [<a href="junit-report/${package.replaceAll('\.','/')}/${name}-err.html">system err</a>]
+                  <j:file name="${systemErrFilePath}" outputMode="xml">
+                    <document>
+                      <properties>
+                        <title>System Err for ${name}</title>
+                      </properties>
+                      <body>
+                        <section name="System Err for ${name}">
+	                      <code>
+	                        <pre>${systemErr}</pre>
+	                      </code>
+                        </section>
+                      </body>
+                    </document>
+                  </j:file>
+                </j:if>
+              </p>
+
               <table summary="Testsuite: ${testsuite.attribute('name').value}">
 
                 <x:set var="errors" select="$testsuite/error"/>
diff --git a/junit-report/xdocs/changes.xml b/junit-report/xdocs/changes.xml
index 4cf6ca3a..f9c10d6b 100644
--- a/junit-report/xdocs/changes.xml
+++ b/junit-report/xdocs/changes.xml
@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.5.1-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="add" issue="MPJUNITREPORT-6" due-to="Cyrille Le Clerc">Include System.out/System.err in the generated report.</action>
       <action dev="ltheussl" type="fix" issue="MPJUNITREPORT-8">Add description for default goal.</action>
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
         <ul>
