diff --git a/.gitignore b/.gitignore
index a196df8..1fe0317 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jdeparser-1.0.0.Final.tar.xz
+/2.0.0.Final.tar.gz
diff --git a/jdeparser.spec b/jdeparser.spec
index ed17f2b..5ff6318 100644
--- a/jdeparser.spec
+++ b/jdeparser.spec
@@ -2,20 +2,21 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name:             jdeparser
-Version:          1.0.0
-Release:          5%{?dist}
+Version:          2.0.0
+Release:          1%{?dist}
 Summary:          Source generator library for Java
-Group:            Development/Libraries
-# See README.md
-License:          (CDDL or GPLv2 with exceptions) and MIT
-URL:              https://github.com/jdeparser/jdeparser
-
-# git clone git://github.com/jdeparser/jdeparser.git
-# cd jdeparser && git archive --format=tar --prefix=jdeparser-1.0.0.Final/ 1.0.0.Final | xz > jdeparser-1.0.0.Final.tar.xz
-Source0:          jdeparser-%{namedversion}.tar.xz
+License:          ASL 2.0
+URL:              https://github.com/jdeparser/jdeparser2
+# old repos https://github.com/jdeparser/jdeparser
+Source0:          https://github.com/jdeparser/jdeparser2/archive/%{namedversion}.tar.gz
 BuildArch:        noarch
 
+BuildRequires:    graphviz
 BuildRequires:    maven-local
+BuildRequires:    mvn(jdepend:jdepend)
+BuildRequires:    mvn(junit:junit)
+BuildRequires:    mvn(org.jboss:jboss-parent:pom:)
+BuildRequires:    mvn(org.jboss.apiviz:apiviz)
 
 %description
 This project is a fork of Sun's (now Oracle's) com.sun.codemodel project. We
@@ -24,14 +25,13 @@ dead and not actively accepting outside contribution. All JBoss projects are
 urged to use this project instead for source code generation.
 
 %package javadoc
-Summary:        Javadocs for %{name}
-Group:          Documentation
+Summary:        Javadoc for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n jdeparser-%{namedversion}
+%setup -q -n jdeparser2-%{namedversion}
 
 %build
 %mvn_build
@@ -40,14 +40,17 @@ This package contains the API documentation for %{name}.
 %mvn_install
 
 %files -f .mfiles
-%dir %{_javadir}/%{name}
-%doc LICENSE-original.html
-%doc README.md
+%license LICENSE.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE-original.html
+%license LICENSE.txt
 
 %changelog
+* Fri May 27 2016 gil cattaneo <puntogil@libero.it> 2.0.0-1
+- update to 2.0.0.Final
+- introduce license macro
+- fix some rpmlint problem
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 479dd86..6119441 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c53a1726ea6ddd471f903d8573613ff  jdeparser-1.0.0.Final.tar.xz
+497c537e44f7eda88ae885b8fa23e035  2.0.0.Final.tar.gz