diff --git a/.gitignore b/.gitignore
index 104fc84..0d7dd7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /xmlstreambuffer-1.5.1-src-svn.tar.gz
+/xmlstreambuffer-1.5.4.tar.xz
diff --git a/sources b/sources
index 8a270e2..c227ba7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9db0a074e797e324fe2de5bd5268998  xmlstreambuffer-1.5.1-src-svn.tar.gz
+6dc7bc1cbecac8c3cb5fe21e94fdcb8b  xmlstreambuffer-1.5.4.tar.xz
diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec
index 7729749..b0d821f 100644
--- a/xmlstreambuffer.spec
+++ b/xmlstreambuffer.spec
@@ -1,29 +1,24 @@
 Name:          xmlstreambuffer
-Version:       1.5.1
-Release:       5%{?dist}
+Version:       1.5.4
+Release:       1%{?dist}
 Summary:       XML Stream Buffer
 License:       CDDL or GPLv2 with exceptions
 Url:           http://java.net/projects/xmlstreambuffer/
-# svn export https://svn.java.net/svn/xmlstreambuffer~svn/tags/streambuffer-1.5.1/ xmlstreambuffer-1.5.1
-# find xmlstreambuffer-1.5.1/ -name '*.class' -delete
-# find xmlstreambuffer-1.5.1/ -name '*.jar' -delete
-# find xmlstreambuffer-1.5.1/ -name '*.zip' -delete
-# tar czf xmlstreambuffer-1.5.1-src-svn.tar.gz xmlstreambuffer-1.5.1
-Source0:       %{name}-%{version}-src-svn.tar.gz
+# svn export https://svn.java.net/svn/xmlstreambuffer~svn/tags/streambuffer-1.5.4/ xmlstreambuffer-1.5.4
+# find xmlstreambuffer-1.5.4/ -name '*.class' -delete
+# find xmlstreambuffer-1.5.4/ -name '*.jar' -delete
+# find xmlstreambuffer-1.5.4/ -name '*.zip' -delete
+# tar cJf xmlstreambuffer-1.5.4.tar.xz xmlstreambuffer-1.5.4
+Source0:       %{name}-%{version}.tar.xz
 # wget -O glassfish-LICENSE.txt https://svn.java.net/svn/glassfish~svn/tags/legal-1.1/src/main/resources/META-INF/LICENSE.txt
 # xmlstreambuffer package don't include the license file
 Source1:       glassfish-LICENSE.txt
 
-BuildRequires: java-devel
 BuildRequires: jvnet-parent
-
 BuildRequires: maven-local
 BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-surefire-provider-junit
-
-BuildRequires: bea-stax-api
 BuildRequires: stax-ex >= 1.7.1
-
 # test deps
 BuildRequires: junit
 BuildRequires: woodstox-core
@@ -60,8 +55,15 @@ This package contains javadoc for %{name}.
 %prep
 %setup -q
 
-%pom_remove_dep javax.activation:activation
-sed -i "s|<artifactId>wstx-asl</artifactId>|<artifactId>woodstox-core-asl</artifactId>|" pom.xml
+%pom_remove_plugin :maven-deploy-plugin
+%pom_remove_plugin :maven-source-plugin
+%pom_remove_plugin :findbugs-maven-plugin
+%pom_remove_plugin :glassfish-copyright-maven-plugin
+%pom_remove_plugin :cobertura-maven-plugin
+%pom_remove_plugin :buildnumber-maven-plugin
+%pom_remove_plugin :maven-enforcer-plugin
+
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox']/pom:artifactId" woodstox-core-asl
 
 cp -p %{SOURCE1} LICENSE.txt
 sed -i 's/\r//' LICENSE.txt
@@ -76,12 +78,16 @@ sed -i 's/\r//' LICENSE.txt
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE.txt
+%license LICENSE.txt
 
-%files -f .mfiles-javadoc
-%doc LICENSE.txt
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt
 
 %changelog
+* Wed Feb 04 2015 gil cattaneo <puntogil@libero.it> 1.5.4-1
+- update to 1.5.4
+- introduce license macro
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild