diff --git a/jdepend/plugin.jelly b/jdepend/plugin.jelly
index d556e126..d65a25ad 100644
--- a/jdepend/plugin.jelly
+++ b/jdepend/plugin.jelly
@@ -47,7 +47,7 @@
   <goal 
     name="maven-jdepend-plugin:report"
     description="Generate a dependency report with JDepend">
-    
+
     <j:if test="${sourcesPresent == 'true'}">
 
     <j:if test="${maven.compile.debug != 'on'}">
@@ -64,11 +64,17 @@
       <ant:copy file="${maven.jdepend.properties}" tofile="${maven.build.dest}/jdepend.properties" failonerror="false"/>
     </u:available>
 
+
+    <j:set var="argline" value="-file '${maven.build.dir}/jdepend-raw-report.xml' '${maven.jdepend.dirs}'"/>
+    <j:if test="${maven.jdepend.components != '' and maven.jdepend.components != null}">
+      <j:set var="argline" value="-components '${maven.jdepend.components}' -file '${maven.build.dir}/jdepend-raw-report.xml' '${maven.jdepend.dirs}'"/>
+    </j:if>
+
     <ant:java 
       classname="jdepend.xmlui.JDepend"
       fork="true"
       failonerror="true">
-      <ant:arg line="-components '${maven.jdepend.components}' -file '${maven.build.dir}/jdepend-raw-report.xml' '${maven.jdepend.dirs}'"/>
+      <ant:arg line="${argline}"/>
       <ant:classpath>
         <ant:path refid="maven-classpath"/>
         <ant:path refid="maven.dependency.classpath"/>
diff --git a/jdepend/project.xml b/jdepend/project.xml
index 3a0c7ec6..ba96108c 100644
--- a/jdepend/project.xml
+++ b/jdepend/project.xml
@@ -22,7 +22,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jdepend-plugin</id>
   <name>Maven JDepend Plugin</name>
-  <currentVersion>1.6</currentVersion>
+  <currentVersion>1.6.1-SNAPSHOT</currentVersion>
   <shortDescription>JDepend traverses Java class file directories and generates design quality metrics for each Java package.</shortDescription>
   <description>JDepend traverses Java class file directories and generates design quality metrics for each Java package. JDepend allows you to automatically measure the quality of a design in terms of its extensibility, reusability, and maintainability to manage package dependencies effectively.</description>
   <url>http://maven.apache.org/maven-1.x/reference/plugins/jdepend/</url>
diff --git a/jdepend/xdocs/changes.xml b/jdepend/xdocs/changes.xml
index c497d8ad..0a880625 100644
--- a/jdepend/xdocs/changes.xml
+++ b/jdepend/xdocs/changes.xml
@@ -23,6 +23,9 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.6.1-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPJDEPEND-7">Cannot generate report without component property set.</action>
+    </release>
     <release version="1.6" date="2006-02-05">
       <action dev="ltheussl" type="add" issue="MPJDEPEND-2">New property
         <code>maven.jdepend.properties</code>to specify a custom jdepend.properties file.
