diff --git a/xalan-j2-serializerJARname.patch b/xalan-j2-serializerJARname.patch
deleted file mode 100644
index 5f225a6..0000000
--- a/xalan-j2-serializerJARname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/manifest.xalan-interpretive	2011-08-10 12:38:23.892219017 -0400
-+++ src/manifest.xalan-interpretive	2011-08-10 12:38:32.032219017 -0400
-@@ -1,7 +1,7 @@
- Manifest-Version: 1.0
- Created-By: @java.version@ (@java.vendor@)
- Main-Class: org.apache.xalan.xslt.Process
--Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
-+Class-Path: xercesImpl.jar xml-apis.jar xalan-j2-serializer.jar
- 
- Name: org/apache/xalan/
- Comment: Main Xalan engine implementing TrAX/JAXP
diff --git a/xalan-j2.spec b/xalan-j2.spec
index 5915aad..9060564 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -32,7 +32,7 @@
 
 Name:           xalan-j2
 Version:        2.7.1
-Release:        24%{?dist}
+Release:        25%{?dist}
 Epoch:          0
 Summary:        Java XSLT processor
 # src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C
@@ -44,9 +44,6 @@ Source3:        http://repo1.maven.org/maven2/xalan/serializer/2.7.1/serializer-
 Source4:        xsltc-%{version}.pom
 Source5:        %{name}-MANIFEST.MF
 Patch0:         %{name}-noxsltcdeps.patch
-# Fix the serializer JAR filename in xalan-j2's MANIFEST.MF
-# https://bugzilla.redhat.com/show_bug.cgi?id=718738
-Patch1:         %{name}-serializerJARname.patch
 # Fix CVE-2014-0107: insufficient constraints in secure processing
 # feature (oCERT-2014-002).  Generated form upstream revisions 1581058
 # and 1581426.
@@ -113,12 +110,10 @@ Demonstrations and samples for %{name}.
 %prep
 %setup -q -n xalan-j_%{cvs_version}
 %patch0 -p0
-%patch1 -p0
 %patch2 -p1
-# Remove all binary libs, except ones needed to build docs and N/A elsewhere.
-for j in $(find . -name "*.jar"); do
-    mv $j $j.no
-done
+
+find . -name '*.jar' -delete
+find . -name '*.class' -delete
 
 # this tar.gz contains bundled software, some of which has unclear
 # licensing terms (W3C Software/Document license) . We could probably
@@ -127,15 +122,12 @@ done
 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
-
 # Remove classpaths from manifests
-sed -i '/class-path/I d' $(find -iname *manifest*)
+sed -i '/class-path/I d' $(find -iname '*manifest*')
 
 # Convert CR-LF to LF-only
-sed -i s/
// KEYS LICENSE.txt NOTICE.txt
+sed -i s/
// KEYS LICENSE.txt NOTICE.txt xdocs/style/resources/script.js \
+    xdocs/sources/xsltc/README* `find -name '*.sh'`
 
 %build
 if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi
@@ -244,6 +236,11 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 %{_datadir}/%{name}
 
 %changelog
+* Thu Feb 12 2015 Michael Simacek <msimacek@redhat.com> - 0:2.7.1-25
+- Remove bundled JARs
+- Remove unused patch
+- Fix end-of-line issues
+
 * Wed Feb 11 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.7.1-24
 - Update to current packaging guidelines