diff --git a/jira/plugin.jelly b/jira/plugin.jelly
index 546de92f..2bdc8525 100644
--- a/jira/plugin.jelly
+++ b/jira/plugin.jelly
@@ -77,7 +77,10 @@
         prettyPrint="true"
         />
     </j:catch>
-    
+
+    <!-- FIXME: Hack, taken from announcement/plugin.jelly -->
+    <ant:replace file="${maven.gen.docs}/jira.xml" token="&amp;amp;" value="&amp;"/>
+
     <j:choose>
       <j:when test="${!empty(parseresult)}">
         <ant:echo>Error: unable to parse jira results due to an error: ${parseresult.message}. Jira report will not be generated</ant:echo>
diff --git a/jira/src/plugin-resources/images/bug.gif b/jira/src/plugin-resources/images/bug.gif
new file mode 100644
index 00000000..f1cf957f
Binary files /dev/null and b/jira/src/plugin-resources/images/bug.gif differ
diff --git a/jira/src/plugin-resources/images/improvement.gif b/jira/src/plugin-resources/images/improvement.gif
new file mode 100644
index 00000000..6870cae1
Binary files /dev/null and b/jira/src/plugin-resources/images/improvement.gif differ
diff --git a/jira/src/plugin-resources/images/issue_subtask.gif b/jira/src/plugin-resources/images/issue_subtask.gif
new file mode 100644
index 00000000..13931ca5
Binary files /dev/null and b/jira/src/plugin-resources/images/issue_subtask.gif differ
diff --git a/jira/src/plugin-resources/images/newfeature.gif b/jira/src/plugin-resources/images/newfeature.gif
new file mode 100644
index 00000000..54104af7
Binary files /dev/null and b/jira/src/plugin-resources/images/newfeature.gif differ
diff --git a/jira/src/plugin-resources/images/newtest.gif b/jira/src/plugin-resources/images/newtest.gif
new file mode 100644
index 00000000..7ef34625
Binary files /dev/null and b/jira/src/plugin-resources/images/newtest.gif differ
diff --git a/jira/src/plugin-resources/images/priority_blocker.gif b/jira/src/plugin-resources/images/priority_blocker.gif
new file mode 100644
index 00000000..f0d12b8a
Binary files /dev/null and b/jira/src/plugin-resources/images/priority_blocker.gif differ
diff --git a/jira/src/plugin-resources/images/priority_critical.gif b/jira/src/plugin-resources/images/priority_critical.gif
new file mode 100644
index 00000000..2dca2fe3
Binary files /dev/null and b/jira/src/plugin-resources/images/priority_critical.gif differ
diff --git a/jira/src/plugin-resources/images/priority_major.gif b/jira/src/plugin-resources/images/priority_major.gif
new file mode 100644
index 00000000..01503b18
Binary files /dev/null and b/jira/src/plugin-resources/images/priority_major.gif differ
diff --git a/jira/src/plugin-resources/images/priority_minor.gif b/jira/src/plugin-resources/images/priority_minor.gif
new file mode 100644
index 00000000..faac90c6
Binary files /dev/null and b/jira/src/plugin-resources/images/priority_minor.gif differ
diff --git a/jira/src/plugin-resources/images/priority_trivial.gif b/jira/src/plugin-resources/images/priority_trivial.gif
new file mode 100644
index 00000000..f6b872eb
Binary files /dev/null and b/jira/src/plugin-resources/images/priority_trivial.gif differ
diff --git a/jira/src/plugin-resources/images/task.gif b/jira/src/plugin-resources/images/task.gif
new file mode 100644
index 00000000..07fc6590
Binary files /dev/null and b/jira/src/plugin-resources/images/task.gif differ
diff --git a/jira/src/plugin-resources/jira.jsl b/jira/src/plugin-resources/jira.jsl
index 327c7262..be82bed0 100644
--- a/jira/src/plugin-resources/jira.jsl
+++ b/jira/src/plugin-resources/jira.jsl
@@ -40,57 +40,111 @@
             <table>
               <thead>
                 <tr>
+                  <th style="width:40px">Type</th>
                   <th style="width:150px">Key</th>
                   <th>Summary</th>
-                  <th style="width:150px">Created</th>
+                  <th style="width:100px">Assignee</th>
+                  <th style="width:100px">Reporter</th>
                   <th style="width:50px">Priority</th>
                   <th style="width:50px">Status</th>
-                  <th style="width:100px">Resolution</th>
-                  <th style="width:100px">Assigned to</th>
-                  <th style="width:100px">Reported by</th>
+                  <th style="width:80px">Created</th>
+                  <th style="width:80px">Updated</th>
+                  <th style="width:40px">Votes</th>
                 </tr>
               </thead>
               <tbody>
                 <x:forEach var="entry" select="item">
+                  <j:set var="type"><x:expr select="$entry/type"/></j:set>
                   <j:set var="key"><x:expr select="$entry/key"/></j:set>
                   <j:set var="link"><x:expr select="$entry/link"/></j:set>
-                  <j:set var="createdate"><x:expr select="$entry/created"/></j:set>
+                  <j:set var="date"><x:expr select="$entry/created"/></j:set>
+                  <j:set var="createdate" value="${date.substring(5, 16)}"/>
+                  <j:set var="date"><x:expr select="$entry/updated"/></j:set>
+                  <j:set var="updated" value="${date.substring(5, 16)}"/>
                   <j:set var="priority"><x:expr select="$entry/priority"/></j:set>
                   <j:set var="status"><x:expr select="$entry/status"/></j:set>
                   <j:set var="summary"><x:expr select="$entry/summary"/></j:set>
                   <j:set var="assignee"><x:expr select="$entry/assignee"/></j:set>
                   <j:set var="reporter"><x:expr select="$entry/reporter"/></j:set>
-                  <j:set var="resolution"><x:expr select="$entry/resolution"/></j:set>
+                  <j:set var="votes"><x:expr select="$entry/votes"/></j:set>
                   <tr>
+                    <td>
+                      <j:choose>
+                        <j:when test="${type.equalsIgnoreCase('Bug')}">
+                          <img src="./images/jira/bug.gif" alt="${type}" title="${type}"/>
+                        </j:when>
+                        <j:when test="${type.equalsIgnoreCase('Improvement')}">
+                          <img src="./images/jira/improvement.gif" alt="${type}" title="${type}"/>
+                        </j:when>
+                        <j:when test="${type.equalsIgnoreCase('Wish')}">
+                          <img src="./images/jira/improvement.gif" alt="${type}" title="${type}"/>
+                        </j:when>
+                        <j:when test="${type.equalsIgnoreCase('New Feature')}">
+                          <img src="./images/jira/newfeature.gif" alt="${type}" title="${type}"/>
+                        </j:when>
+                        <j:when test="${type.equalsIgnoreCase('Task')}">
+                          <img src="./images/jira/task.gif" alt="${type}" title="${type}"/>
+                        </j:when>
+                        <j:when test="${type.equalsIgnoreCase('SubTask')}">
+                          <img src="./images/jira/issue_subtask.gif" alt="${type}" title="${type}"/>
+                        </j:when>
+                        <j:when test="${type.equalsIgnoreCase('Test')}">
+                          <img src="./images/jira/newtest.gif" alt="${type}" title="${type}"/>
+                        </j:when>
+                        <j:otherwise>
+                        </j:otherwise>
+                      </j:choose>
+                    </td>
                     <td><a href="${link}">${key}</a></td>
                     <td>${summary}</td>
-                    <td>${createdate}</td>
-                    <td>${priority}</td>
+                    <td>${assignee}</td>
+                    <td>${reporter}</td>
+                    <td>
+                      <j:choose>
+                        <j:when test="${priority.equalsIgnoreCase('Blocker')}">
+                          <img src="./images/jira/priority_blocker.gif" alt="${priority}" title="${priority}"/>
+                        </j:when>
+                        <j:when test="${priority.equalsIgnoreCase('Critical')}">
+                          <img src="./images/jira/priority_critical.gif" alt="${priority}" title="${priority}"/>
+                        </j:when>
+                        <j:when test="${priority.equalsIgnoreCase('Major')}">
+                          <img src="./images/jira/priority_major.gif" alt="${priority}" title="${priority}"/>
+                        </j:when>
+                        <j:when test="${priority.equalsIgnoreCase('Minor')}">
+                          <img src="./images/jira/priority_minor.gif" alt="${priority}" title="${priority}"/>
+                        </j:when>
+                        <j:when test="${priority.equalsIgnoreCase('Trivial')}">
+                          <img src="./images/jira/priority_trivial.gif" alt="${priority}" title="${priority}"/>
+                        </j:when>
+                        <j:otherwise>
+                        </j:otherwise>
+                      </j:choose>
+                    </td>
                     <td>
                       <j:choose>
                         <j:when test="${status.equalsIgnoreCase('Closed')}">
-                          <img src="./images/jira/status_closed.gif"/>
+                          <img src="./images/jira/status_closed.gif" alt="${status}" title="${status}"/>
                         </j:when>
                         <j:when test="${status.equalsIgnoreCase('In Progress')}">
-                          <img src="./images/jira/status_inprogress.gif"/>
+                          <img src="./images/jira/status_inprogress.gif" alt="${status}" title="${status}"/>
                         </j:when>
                         <j:when test="${status.equalsIgnoreCase('Open')}">
-                          <img src="./images/jira/status_open.gif"/>
+                          <img src="./images/jira/status_open.gif" alt="${status}" title="${status}"/>
                         </j:when>
                         <j:when test="${status.equalsIgnoreCase('Reopened')}">
-                          <img src="./images/jira/status_reopened.gif"/>
+                          <img src="./images/jira/status_reopened.gif" alt="${status}" title="${status}"/>
                         </j:when>
                         <j:when test="${status.equalsIgnoreCase('Resolved')}">
-                          <img src="./images/jira/status_resolved.gif"/>
+                          <img src="./images/jira/status_resolved.gif" alt="${status}" title="${status}"/>
                         </j:when>
                         <j:otherwise>
                         </j:otherwise>
                       </j:choose>
                       ${status}
                     </td>
-                    <td>${resolution}</td>
-                    <td>${assignee}</td>
-                    <td>${reporter}</td>
+                    <td>${createdate}</td>
+                    <td>${updated}</td>
+                    <td>${votes}</td>
                   </tr>
                 </x:forEach>
               </tbody>
diff --git a/jira/xdocs/changes.xml b/jira/xdocs/changes.xml
index 2b673570..9b9bff2b 100644
--- a/jira/xdocs/changes.xml
+++ b/jira/xdocs/changes.xml
@@ -23,6 +23,9 @@
     <author email="brett@apache.org">Brett Porter</author>
   </properties>
   <body>
+    <release version="1.3-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="update">Layout changes: mimic default JIRA appearance, also show votes.</action>
+    </release>
     <release version="1.2" date="2005-12-03">
       <action dev="fgiust" type="fix">Only log an error if the jira changes xml can't be parsed instead of throwing an Exception</action>
       <action dev="fgiust" type="fix" issue="MPJIRA-4">Make the Jira report work also using a fancy JIRA url like http://jira.codehaus.org/browse/MPJIRA (it doesn't require the url with a numeric project id anymore)</action>