diff --git a/changelog/src/plugin-resources/changelog.jsl b/changelog/src/plugin-resources/changelog.jsl
index 523ad3f0..ff530ffa 100644
--- a/changelog/src/plugin-resources/changelog.jsl
+++ b/changelog/src/plugin-resources/changelog.jsl
@@ -71,7 +71,7 @@
                     <j:set var="revision"><x:expr select="$file/revision"/></j:set>
                     <j:set var="repositoryUrl" value="${pom.repository.url}"/>
                     <j:choose>
-                      <j:when test="${!empty(repositoryUrl)} and ${repositoryUrl.indexOf('?')>0}">
+                      <j:when test="${!empty(repositoryUrl) and 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)}"/>
diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml
index 3434ccf3..382bc326 100644
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.8-SNAPSHOT" date="in CVS">
+      <action dev="dion" type="fix" issue="MPCHANGELOG-46" due-to="Juha Komulainen">Handle ViewCVS URLs with ? in them.</action>
       <action dev="brett" type="update">Upgrade to Maven 1.1 libraries.</action>
     </release>
     <release version="1.7.1" date="2004-07-12">
