diff --git a/generate-tarball.sh b/generate-tarball.sh
index fa1868b..533a800 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -15,7 +15,6 @@ tar xf "../${name}-${version}.orig.tar.gz"
 # CLEAN TARBALL
 find -name '*.jar' -delete
 find -name '*.class' -delete
-rm */src/*.tar.gz
 
 tar czf "../${name}-${version}.tar.gz" *
 cd ..
diff --git a/sources b/sources
index ead6924..9e100e3 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (xalan-j2-2.7.2.tar.gz) = b4a400508a3c495c3e5a2e5df3ebae7be58d01d4bfce49fa17cdf91ae21a05a1a2d01c51ab09c98f94efd88324fc9b18c7251c72085f982a709009cf70a8b055
+SHA512 (xalan-j2-2.7.2.tar.gz) = d30cc8179eb98704f8bbab80b6462565b177bc9cee99be042f0cad0d34924446574ae849f735fcc0cbbbcd81963c1b1bc0f76d8f981109ae168b21cb057c0eef
 SHA512 (xalan-2.7.2.pom) = 4b95e3eb3a2ab262c9a27040a5214cfb8c49c36ece8e71a933074eb063205ef96deff351f017b034c9c97d43d77b020482aade7bc01e1245d8ee10a51269c5ce
 SHA512 (serializer-2.7.2.pom) = 1a20cd7008ab876f9605a67515d558b26b9be009c4f49cb27ddf5aa715b5d164c476c236b6d6edf39e81538dfb1516271c3859af8e73f8cdbeee24efb45e9a44
 SHA512 (xsltc-2.7.2.pom) = 89c5c2cd358c32a9b8073869abdcb1df21a95c21a1a099c1b91f25ac3de7fdf9893977cb227efa4dad1de29773aaaef155155d1ec8648aae3c2e512154c200ef
diff --git a/xalan-j2.spec b/xalan-j2.spec
index bd6d99b..503983c 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -1,33 +1,3 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
 %global cvs_version %(echo %{version} | tr . _)
 
 Name:           xalan-j2
@@ -92,13 +62,6 @@ License:        ASL 2.0
 %description    manual
 Documentation for %{name}.
 
-%package        javadoc
-Summary:        Javadoc for %{name}
-License:        ASL 2.0
-
-%description    javadoc
-Javadoc for %{name}.
-
 %prep
 %setup -q -n xalan-j_%{cvs_version}
 %patch0 -p0
@@ -106,7 +69,8 @@ Javadoc for %{name}.
 find . -name '*.jar' -delete
 find . -name '*.class' -delete
 
-sed -i '/<!-- Expand jaxp sources/,/<delete file="${xml-commons-srcs.tar}"/{d}' build.xml
+sed -i '/<bootclasspath/d' build.xml
+(cd ./src && tar xf xml-commons-external-*-src.tar.gz)
 
 # Remove classpaths from manifests
 sed -i '/class-path/I d' $(find -iname '*manifest*')
@@ -138,12 +102,10 @@ ant \
   -Dcompiler.source=1.6 \
   -Dcompiler.target=1.6 \
   -Djava.awt.headless=true \
-  -Dapi.j2se=%{_javadocdir}/java \
   -Dbuild.xalan-interpretive.jar=build/xalan-interpretive.jar \
   xalan-interpretive.jar\
   xsltc.unbundledjar \
-  docs \
-  javadocs
+  docs
 
 # inject OSGi manifests
 jar ufm build/serializer.jar %{SOURCE1}
@@ -154,10 +116,7 @@ jar ufm build/xalan-interpretive.jar %{SOURCE5}
 %mvn_artifact %{SOURCE4} build/xsltc.jar
 
 %install
-%mvn_install -J build/docs/apidocs
-
-# fix link between manual and javadoc
-(cd build/docs; ln -sf %{_javadocdir}/%{name} apidocs)
+%mvn_install
 
 %post
 # update-alternatives will remove the symlink - preserve it
@@ -178,10 +137,6 @@ mv %{_javadir}/jaxp_transform_impl.jar{.tmp,} || :
 %license LICENSE.txt NOTICE.txt
 %doc build/docs/*
 
-%files javadoc
-%license LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}
-
 %changelog
 * Wed Jul 31 2019 Marian Koncek <mkoncek@redhat.com> - 2.7.2-1
 - Update to upstream version 2.7.2