diff --git a/jira/plugin.jelly b/jira/plugin.jelly
index 3b799dac..83a9ab77 100644
--- a/jira/plugin.jelly
+++ b/jira/plugin.jelly
@@ -82,7 +82,7 @@
 
       <j:set var="title" value="Jira Report"/>
       <j:set var="description" value="Report all issues defined in Jira."/>
-      <j:remove var="roadmapUrl"/>
+      <j:set var="jiraUrl" value="${pom.issueTrackingUrl}"/>
 
       <doc:jslFile
         input="${maven.build.dir}/jira/jira-results.xml"
@@ -116,7 +116,7 @@
 
         <j:set var="title" value="Jira Roadmap Report"/>
         <j:set var="description" value="Report all issues that are scheduled for the next release."/>
-        <j:set var="roadmapUrl" value="${pom.issueTrackingUrl}?report=com.atlassian.jira.plugin.system.project:roadmap-panel"/>
+        <j:set var="jiraUrl" value="${pom.issueTrackingUrl}?report=com.atlassian.jira.plugin.system.project:roadmap-panel"/>
 
         <doc:jslFile
           input="${maven.build.dir}/jira/jira-roadmap.xml"
@@ -125,7 +125,7 @@
           outputMode="xml"
           prettyPrint="true"
           />
-        <j:remove var="roadmapUrl"/>
+        <j:remove var="jiraUrl"/>
       </j:catch>
 
       <!-- FIXME: Hack, taken from announcement/plugin.jelly -->
diff --git a/jira/src/plugin-resources/jira.jsl b/jira/src/plugin-resources/jira.jsl
index fdcb6dc3..641dd02d 100644
--- a/jira/src/plugin-resources/jira.jsl
+++ b/jira/src/plugin-resources/jira.jsl
@@ -38,10 +38,7 @@
         <section name="${title}">
           <p>
             ${description}
-            <j:if test="${roadmapUrl != null}">
-              For the latest list, please check the Jira
-             <a href="${roadmapUrl}">roadmap</a>.
-            </j:if>
+            For the latest list, please check <a href="${jiraUrl}">Jira</a>.
           </p>
           <x:forEach var="entry" select="channel">
             <table>