diff --git a/jira/plugin.jelly b/jira/plugin.jelly
index a0b01b79..79189aaa 100644
--- a/jira/plugin.jelly
+++ b/jira/plugin.jelly
@@ -59,6 +59,8 @@
     name="maven-jira-plugin:report"
     description="Generate report with all entries defined in Jira">
     <mkdir dir="${maven.build.dir}/jira"/>
+    <copy tofile="${maven.build.dir}/jira/jira-roadmap.xml" file="${plugin.resources}/templates/jira-template.xml"/>
+    <copy tofile="${maven.build.dir}/jira/jira-results.xml" file="${plugin.resources}/templates/jira-template.xml"/>
 
     <jira:jira
       project="${pom}"
diff --git a/jira/src/main/org/apache/maven/jira/JiraDownloader.java b/jira/src/main/org/apache/maven/jira/JiraDownloader.java
index 7b7064ca..07c63490 100644
--- a/jira/src/main/org/apache/maven/jira/JiraDownloader.java
+++ b/jira/src/main/org/apache/maven/jira/JiraDownloader.java
@@ -359,24 +359,27 @@ public final class JiraDownloader
                 Number fixforNumber =
                     nf.parse( projectPage, new ParsePosition( fixforIndex + 7 ) );
                 String fixfor = Integer.toString( fixforNumber.intValue() );
-                // TODO: check if fixfor = -1: no versions scheduled in roadmap
 
-                setFilter( "&&fixfor=" + fixfor
-                    + "&sorter/field=status&sorter/order=ASC" );
-                fullURL =
-                    jiraUrl + "/secure/IssueNavigator.jspa?view=rss&pid=" + id;
-                fullURL += createFilter();
-                fullURL += ( "&tempMax=" + nbEntriesMax
-                + "&reset=true&decorator=none" );
+                // if fixfor = "-1": no versions scheduled in roadmap
+                if ( !fixfor.equals( "-1" ) )
+                {
+                    setFilter( "&&fixfor=" + fixfor
+                        + "&sorter/field=status&sorter/order=ASC" );
+                    fullURL =
+                        jiraUrl + "/secure/IssueNavigator.jspa?view=rss&pid=" + id;
+                    fullURL += createFilter();
+                    fullURL += ( "&tempMax=" + nbEntriesMax
+                    + "&reset=true&decorator=none" );
 
-                String outFile = output.getAbsolutePath().replace('\\','/');
-                int endIndex = outFile.lastIndexOf( '/' );
+                    String outFile = output.getAbsolutePath().replace('\\','/');
+                    int endIndex = outFile.lastIndexOf( '/' );
 
-                outFile =
-                    outFile.substring( 0, endIndex ) + "/jira-roadmap.xml";
+                    outFile =
+                        outFile.substring( 0, endIndex ) + "/jira-roadmap.xml";
 
-                // execute the GET
-                download( cl, fullURL, new File( outFile ) );
+                    // execute the GET
+                    download( cl, fullURL, new File( outFile ) );
+                }
             }
         }
         catch ( Exception e )
diff --git a/jira/src/plugin-resources/templates/jira-template.xml b/jira/src/plugin-resources/templates/jira-template.xml
new file mode 100644
index 00000000..6dd29d0e
--- /dev/null
+++ b/jira/src/plugin-resources/templates/jira-template.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<rss version="0.92">
+
+<channel>
+    <title>jira.codehaus.org</title>
+    <link>http://jira.codehaus.org</link>
+    <description>This file is an XML representation of some issues</description>
+    <language>en</language>
+</channel>
+
+</rss>
+