diff --git a/changelog/src/plugin-resources/changelog.jsl b/changelog/src/plugin-resources/changelog.jsl
index 16445afc..d9f88ea4 100644
--- a/changelog/src/plugin-resources/changelog.jsl
+++ b/changelog/src/plugin-resources/changelog.jsl
@@ -37,9 +37,23 @@
             
                     <j:set var="name"><x:expr select="$file/name"/></j:set>
                     <j:set var="revision"><x:expr select="$file/revision"/></j:set>
+                    <j:set var="repositoryUrl" value="${pom.repository.url}"/>
+                    <j:choose>
+                      <j:when test="${repositoryUrl.indexOf('?')>0}">
+                        <j:set var="repository" value="${repositoryUrl.substring(0, repositoryUrl.indexOf('?'))}"/>
+                        <j:set var="tmpMultiRepoParam" value="${repositoryUrl.substring(repository.length())}"/>
+                        <j:set var="oneRepoParam" value="?${tmpMultiRepoParam.substring(1)}"/>
+                        <j:set var="multiRepoParam" value="&amp;${tmpMultiRepoParam.substring(1)}"/>
+                      </j:when>
+                      <j:otherwise>
+                        <j:set var="repository" value="${repositoryUrl}"/>
+                        <j:set var="oneRepoParam" value=""/>
+                        <j:set var="multiRepoParam" value=""/>
+                      </j:otherwise>
+                    </j:choose>
             
-                    <a href="${pom.repository.url}${name}">${name}</a>
-                    <a href="${pom.repository.url}${name}?rev=${revision}&amp;content-type=text/vnd.viewcvs-markup">v${revision}</a>
+                    <a href="${repository}${name}${oneRepoParam}">${name}</a>
+                    <a href="${repository}${name}?rev=${revision}&amp;content-type=text/vnd.viewcvs-markup${multiRepoParam}">v${revision}</a>
                     <br/>
                   
                   </x:forEach>