diff --git a/xalan-j2.spec b/xalan-j2.spec
index 92c3cee..6b8f81e 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -32,7 +32,7 @@
 
 Name:           xalan-j2
 Version:        2.7.1
-Release:        14%{?dist}
+Release:        15%{?dist}
 Epoch:          0
 Summary:        Java XSLT processor
 # samples/servlet/ApplyXSLTException.java is ASL 1.1
@@ -123,6 +123,14 @@ Demonstrations and samples for %{name}.
 for j in $(find . -name "*.jar"); do
     mv $j $j.no
 done
+
+# this tar.gz contains bundled software, some of which has unclear
+# licensing terms (W3C Software/Document license) . We could probably
+# replicate this with our jars but it's too much work so just generate
+# non-interlinked documentation
+rm src/*tar.gz
+sed -i '/<!-- Expand jaxp sources/,/<delete file="${xml-commons-srcs.tar}"/{d}' build.xml
+
 # FIXME who knows where the sources are? xalan-j1 ?
 mv tools/xalan2jdoc.jar.no tools/xalan2jdoc.jar
 mv tools/xalan2jtaglet.jar.no tools/xalan2jtaglet.jar
@@ -225,22 +233,26 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 %{_mavenpomdir}/JPP-%{name}-serializer.pom
 
 %files xsltc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
 %{_javadir}/xsltc.jar
 %{_mavenpomdir}/JPP-xsltc.pom
 
 %files manual
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
 %doc build/docs/*
 
 %files javadoc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
 %doc %{_javadocdir}/%{name}
 
 %files demo
 %{_datadir}/%{name}
 
 %changelog
+* Thu Aug 23 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.7.1-15
+- Add NOTICE.txt file to subpackages
+- Remove bundled sources of other packages used to build javadocs
+
 * Thu Aug 16 2012 Andy Grimm <agrimm@gmail.com> - 0:2.7.1-14
 - Remove osgi(system.bundle) requirement
 
@@ -329,7 +341,7 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 - Extend patch to cover all applicable MANIFEST files in src directory.
 
 * Wed Jul 26 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:2.7.0-4jpp_3fc
-- Apply patch to replace serializer.jar in MANIFEST file with 
+- Apply patch to replace serializer.jar in MANIFEST file with
   xalan-j2-serializer.jar.
 
 * Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:2.7.0-4jpp_2fc
@@ -410,7 +422,7 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 
 * Thu Aug 26 2004 Ralph Apel <r.ape at r-apel.de> 0:2.6.0-2jpp
 - Build with ant-1.6.2
-- Try with -Djava.awt.headless=true 
+- Try with -Djava.awt.headless=true
 
 * Mon Jul 26 2004 Fernando Nasser <fnasser@redhat.com> 0:2.6.0-1jpp_1rh
 - Merge with latest community version
@@ -419,7 +431,7 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 - add RHUG upgrade cleanup
 
 * Tue Mar 23 2004 Kaj J. Niemi <kajtzu@fi.basen.net> 0:2.6.0-1jpp
-- Updated to 2.6.0 
+- Updated to 2.6.0
 - Patches supplied by <aleksander.adamowski@altkom.pl>
 
 * Thu Mar  4 2004 Frank Ch. Eigler <fche@redhat.com> - 0:2.5.2-1jpp_1rh
@@ -478,7 +490,7 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
     generation, since it's tuned for stylebook-1.0-b3_xalan-2.jar
   - build and provide xsltc in a separate rpm
 
-* Mon Jul 01 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.3.1-2jpp 
+* Mon Jul 01 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.3.1-2jpp
 - provides jaxp_transform_impl
 - requires jaxp_parser_impl
 - stylebook already requires xml-commons-apis
@@ -489,18 +501,18 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 - fix built classpath (bsf, bcel are existing jpackage rpms),
 - add buildrequires for javacup and JLex
 
-* Wed May 08 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.3.1-1jpp 
+* Wed May 08 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.3.1-1jpp
 - 2.3.1
 - vendor, distribution, group tags
 
-* Mon Mar 18 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.3.0-2jpp 
+* Mon Mar 18 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.3.0-2jpp
 - generic servlet support
 
-* Wed Feb 20 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.3.0-1jpp 
+* Wed Feb 20 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.3.0-1jpp
 - 2.3.0
 - no more compat jar
 
-* Sun Jan 27 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.2.0-2jpp 
+* Sun Jan 27 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.2.0-2jpp
 - adaptation to new stylebook1.0b3 package
 - used source tarball
 - section macro