diff --git a/xalan-j2-MANIFEST.MF b/xalan-j2-MANIFEST.MF
index 7392c01..f545333 100644
--- a/xalan-j2-MANIFEST.MF
+++ b/xalan-j2-MANIFEST.MF
@@ -2,7 +2,6 @@ Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.8.2
 Created-By: 1.7.0_b147-icedtea (Oracle Corporation)
 Main-Class: org.apache.xalan.xslt.Process
-Class-Path: xercesImpl.jar xml-apis.jar xalan-j2-serializer.jar
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.apache.xalan
diff --git a/xalan-j2.spec b/xalan-j2.spec
index 3603ef0..321b20a 100644
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -32,17 +32,17 @@
 
 Name:           xalan-j2
 Version:        2.7.1
-Release:        16%{?dist}
+Release:        17%{?dist}
 Epoch:          0
 Summary:        Java XSLT processor
 # src/org/apache/xpath/domapi/XPathStylesheetDOM3Exception.java is W3C
 License:        ASL 2.0 and W3C
-Source0:        http://www.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz
+Source0:        http://archive.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz
 Source1:        %{name}-serializer-MANIFEST.MF
 Source2:        http://repo1.maven.org/maven2/xalan/xalan/2.7.1/xalan-2.7.1.pom
 Source3:        http://repo1.maven.org/maven2/xalan/serializer/2.7.1/serializer-2.7.1.pom
 Source4:        xsltc-%{version}.pom
-Source5:	%{name}-MANIFEST.MF
+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
@@ -59,7 +59,6 @@ BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  java-devel
 BuildRequires:  ant
 BuildRequires:  bcel
-BuildRequires:  jlex
 BuildRequires:  java_cup
 BuildRequires:  regexp
 BuildRequires:  sed
@@ -81,7 +80,6 @@ Summary:        XSLT compiler
 Group:          Development/Tools
 Requires:       java_cup
 Requires:       bcel
-Requires:       jlex
 Requires:       regexp
 Requires:       xerces-j2
 
@@ -134,6 +132,12 @@ sed -i '/<!-- Expand jaxp sources/,/<delete file="${xml-commons-srcs.tar}"/{d}'
 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*)
+
+# Convert CR-LF to LF-only
+sed -i s/
// KEYS LICENSE.txt NOTICE.txt
+
 %build
 if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi
 pushd lib
@@ -146,7 +150,6 @@ popd
 pushd tools
 ln -sf $(build-classpath java_cup) java_cup.jar
 ln -sf $(build-classpath ant) ant.jar
-ln -sf $(build-classpath jlex) JLex.jar
 ln -sf $(build-classpath xml-stylebook) stylebook-1.0-b3_xalan-2.jar
 popd
 export CLASSPATH=$(build-classpath servlet)
@@ -248,6 +251,13 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 %{_datadir}/%{name}
 
 %changelog
+* Fri Oct 12 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.7.1-17
+- Remove classpaths from manifests, resolves: rhbz#575635
+- Remove jlex from classpath
+- Fix source URL to archive.apache.org
+- Don't mix spaces and tabs in spec file
+- Fix end-of-line encoding of some documentation files
+
 * Fri Aug 24 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.7.1-16
 - No more ASL 1.1 code present in the package, fix license