diff --git a/.cvsignore b/.cvsignore
index e69de29..932d041 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+Xerces-J-src.2.6.1.tar.gz
diff --git a/sources b/sources
index e69de29..e8adccd 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+060f303e7a58de5e76a4fb08f09c5f6d  Xerces-J-src.2.6.1.tar.gz
diff --git a/xerces-j2-build.patch b/xerces-j2-build.patch
new file mode 100644
index 0000000..90b79f5
--- /dev/null
+++ b/xerces-j2-build.patch
@@ -0,0 +1,116 @@
+--- build.xml~	2003-07-31 20:14:16.000000000 +0300
++++ build.xml	2003-10-21 21:45:47.000000000 +0300
+@@ -19,7 +19,7 @@
+ <project default="usage" basedir=".">
+ 
+   <!-- enable compilation under IBM JDK 1.4 -->
+-  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
++  <!-- <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/> -->
+ 
+   <!-- Allow properties following these statements to be overridden -->
+   <!-- Note that all of these don't have to exist.  They've just been defined
+@@ -187,6 +187,7 @@
+     </copy>
+ 
+     <!-- now deal with API's:  -->
++    <!--
+     <unzip src="${src.apis.zip}" dest="${build.src}">
+         <patternset
+             includes="org/xml/sax/** 
+@@ -198,6 +199,7 @@
+                 org/w3c/dom/traversal/**"
+         />
+     </unzip>
++    -->
+     
+     <!-- substitute tokens as needed -->
+     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
+@@ -214,7 +216,7 @@
+       </fileset>
+     </copy>
+ 
+-    <xjavac srcdir="${build.src}"
++    <javac srcdir="${build.src}"
+            destdir="${build.dest}"
+            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
+            debug="${debug}"
+@@ -275,7 +277,7 @@
+            excludes="dom/DOMAddLines.java 
+                      dom/DOM3.java" />
+     </copy>
+-    <xjavac srcdir="${build.samples}"
++    <javac srcdir="${build.samples}"
+            destdir="${build.dest}"
+            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
+            debug="${debug}"
+@@ -292,7 +294,7 @@
+         <fileset dir="${tests.dir}"
+          excludes="dom/rename/**, dom/registry/**" />
+     </copy>
+-    <xjavac srcdir="${build.tests}"
++    <javac srcdir="${build.tests}"
+            destdir="${build.dest}"
+            classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
+            debug="${debug}"
+@@ -813,7 +815,7 @@
+       </fileset>
+     </copy>
+ 
+-    <xjavac srcdir="${build.src}"
++    <javac srcdir="${build.src}"
+            destdir="${build.dest}"
+            debug="${debug}"
+            deprecation="${deprecation}"
+@@ -903,6 +905,7 @@
+              token="return ((String)type).getNamespace();" value="return null;"/>
+  
+     <!-- now deal with API's:  -->
++    <!--
+     <unzip src="${src.apis.zip}" dest="${build.src}">
+         <patternset
+             includes="org/xml/sax/** 
+@@ -914,7 +917,7 @@
+                 org/w3c/dom/traversal/**"
+         />
+     </unzip>
+-
++    -->
+ 
+     <!-- substitute tokens as needed -->
+     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
+@@ -950,7 +953,7 @@
+       </fileset>
+     </copy>
+ 
+-    <xjavac srcdir="${build.src}"
++    <javac srcdir="${build.src}"
+            destdir="${build.dest}"
+            debug="${debug}"
+            deprecation="${deprecation}"
+@@ -1166,7 +1169,7 @@
+       </fileset>
+     </copy>
+ 
+-    <xjavac srcdir="${build.src}"
++    <javac srcdir="${build.src}"
+            destdir="${build.dest}"
+            debug="${debug}"
+            deprecation="${deprecation}"
+@@ -1194,7 +1197,7 @@
+    <replace file="${build.samples}/dom/ASBuilder.java"  
+              token="org.apache.xerces.dom3.DOMConfiguration" value="org.w3c.dom.DOMConfiguration"/>
+  
+-   <xjavac srcdir="${build.samples}"
++   <javac srcdir="${build.samples}"
+            destdir="${build.dest}"
+            classpath="${build.dir}/classes:${build.dir}/dom3-${jar.parser}:${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.apis}"
+            debug="${debug}"
+@@ -1222,7 +1225,7 @@
+      <replace file="${build.tests}/thread/Test.java"  
+              token="org.apache.xerces.dom3" value="org.w3c.dom"/>
+ 
+-    <xjavac srcdir="${build.tests}"
++    <javac srcdir="${build.tests}"
+            destdir="${build.dest}"
+            classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes:./tools/junit.jar"
+            debug="${debug}"
diff --git a/xerces-j2-constants.sh b/xerces-j2-constants.sh
new file mode 100644
index 0000000..bbfe00b
--- /dev/null
+++ b/xerces-j2-constants.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# 
+# Xerces-J2 constants script
+# JPackage Project (http://www.jpackage.org/)
+# $Id: xerces-j2-constants.sh,v 1.1 2004/09/09 16:28:45 cvsdist Exp $
+
+# Source functions library
+. /usr/share/java-utils/java-functions
+
+# Configuration
+MAIN_CLASS=org.apache.xerces.impl.Constants
+
+# Set parameters
+set_jvm
+export CLASSPATH=$(build-classpath xerces-j2)
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS
+
+# Let's start
+run "$@"
diff --git a/xerces-j2-version.sh b/xerces-j2-version.sh
new file mode 100644
index 0000000..4efde3b
--- /dev/null
+++ b/xerces-j2-version.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# 
+# Xerces-J2 version script
+# JPackage Project (http://www.jpackage.org/)
+# $Id: xerces-j2-version.sh,v 1.1 2004/09/09 16:28:45 cvsdist Exp $
+
+# Source functions library
+. /usr/share/java-utils/java-functions
+
+# Configuration
+MAIN_CLASS=org.apache.xerces.impl.Version
+
+# Set parameters
+set_jvm
+export CLASSPATH=$(build-classpath xerces-j2)
+set_flags $BASE_FLAGS
+set_options $BASE_OPTIONS
+
+# Let's start
+run "$@"
diff --git a/xerces-j2.spec b/xerces-j2.spec
new file mode 100644
index 0000000..6001bac
--- /dev/null
+++ b/xerces-j2.spec
@@ -0,0 +1,345 @@
+%define name		xerces-j2
+%define version		2.6.1
+%define cvs_version	2_6_1
+%define release		1jpp
+%define section		free
+
+Name:		%{name}
+Version:	%{version}
+Release:	%{release}
+Epoch:		0
+Summary:	Java XML parser
+License:	Apache Software License
+URL:		http://xml.apache.org/xerces2-j/
+Group:		Text Processing/Markup/XML
+Vendor:		JPackage Project
+Distribution:	JPackage
+Source0:	http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.2.6.1.tar.gz
+Source1:        %{name}-version.sh
+Source2:        %{name}-constants.sh
+Patch0:         %{name}-build.patch
+Provides:	jaxp_parser_impl
+Requires:	xml-commons-apis
+Requires:	xml-commons-resolver
+Requires:	/usr/sbin/update-alternatives
+BuildRequires:	ant >= 0:1.5
+BuildRequires:	jpackage-utils >= 0:1.5
+BuildRequires:	jikes
+BuildRequires:	jaxp_parser_impl
+BuildRequires:	xml-commons-resolver
+BuildArch:	noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+%description
+Welcome to the future! Xerces2 is the next generation of high
+performance, fully compliant XML parsers in the Apache Xerces family.
+This new version of Xerces introduces the Xerces Native Interface (XNI),
+a complete framework for building parser components and configurations
+that is extremely modular and easy to program.
+
+The Apache Xerces2 parser is the reference implementation of XNI but
+other parser components, configurations, and parsers can be written
+using the Xerces Native Interface. For complete design and
+implementation documents, refer to the XNI Manual.
+
+Xerces 2 is a fully conforming XML Schema processor. For more
+information, refer to the XML Schema page.
+
+Xerces 2 also provides a partial implementation of Document Object Model
+Level 3 Core, Load and Save and Abstract Schemas [deprecated] Working
+Drafts. For more information, refer to the DOM Level 3 Implementation
+page.
+
+%package        javadoc-impl
+Summary:	Javadoc for %{name} implementation
+Group:		Development/Documentation
+
+%description    javadoc-impl
+Javadoc for %{name} implementation.
+
+%package        javadoc-apis
+Summary:	Javadoc for %{name} apis
+Group:		Development/Documentation
+
+%description    javadoc-apis
+Javadoc for %{name} apis.
+
+%package        javadoc-dom3
+Summary:	Javadoc for %{name} DOM3
+Group:		Development/Documentation
+
+%description    javadoc-dom3
+Javadoc for %{name} DOM3.
+
+%package        javadoc-xni
+Summary:	Javadoc for %{name} xni
+Group:		Development/Documentation
+
+%description    javadoc-xni
+Javadoc for %{name} xni.
+
+%package        javadoc-other
+Summary:	Javadoc for other %{name} components
+Group:		Development/Documentation
+
+%description    javadoc-other
+Javadoc for other %{name} components.
+
+%package        demo
+Summary:	Demo for %{name}
+Group:		Development/Testing
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description    demo
+Demonstrations and samples for %{name}.
+
+%package        scripts
+Summary:        Additional utility scripts for %{name}
+Group:          Text Processing/Markup/XML
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:	jpackage-utils >= 0:1.5
+
+%description    scripts
+Additional utility scripts for %{name}.
+
+
+%prep
+%setup -q -n xerces-%{cvs_version}
+%patch0 -p0
+
+
+%build
+unset CLASSPATH
+ant \
+	-Dbuild.compiler=jikes \
+	-Dtools.dir=%{_javadir} \
+	-Djar.apis=xml-commons-apis.jar \
+	-Djar.resolver=xml-commons-resolver.jar \
+	clean jars javadocs
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jars
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+cp -p build/xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+
+# javadoc
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-impl-%{version}
+cp -pr build/docs/javadocs/xerces2/* \
+  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-impl-%{version}
+ln -s %{name}-impl-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-impl
+
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-apis-%{version}
+cp -pr build/docs/javadocs/api/* \
+  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-apis-%{version}
+ln -s %{name}-apis-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-apis
+
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-xni-%{version}
+cp -pr build/docs/javadocs/xni/* \
+  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-xni-%{version}
+ln -s %{name}-xni-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-xni
+
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-dom3-%{version}
+cp -pr build/docs/javadocs/dom3-api/* \
+  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-dom3-%{version}
+ln -s %{name}-dom3-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-dom3
+
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-other-%{version}
+cp -pr build/docs/javadocs/other/* \
+  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-other-%{version}
+ln -s %{name}-other-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-other
+
+rm -rf build/docs/javadocs
+
+# scripts
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-version
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}-constants
+
+# demo
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -p build/xercesSamples.jar \
+  $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-samples.jar
+cp -pr data $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+# jaxp_parser_impl ghost symlink
+ln -s %{_sysconfdir}/alternatives \
+  $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post javadoc-apis
+rm -f %{_javadocdir}/%{name}-apis
+ln -s %{name}-apis-%{version} %{_javadocdir}/%{name}-apis
+
+%post javadoc-dom3
+rm -f %{_javadocdir}/%{name}-dom3
+ln -s %{name}-dom3-%{version} %{_javadocdir}/%{name}-dom3
+
+%post javadoc-impl
+rm -f %{_javadocdir}/%{name}-impl
+ln -s %{name}-impl-%{version} %{_javadocdir}/%{name}-impl
+
+%post javadoc-other
+rm -f %{_javadocdir}/%{name}-other
+ln -s %{name}-other-%{version} %{_javadocdir}/%{name}-other
+
+%post javadoc-xni
+rm -f %{_javadocdir}/%{name}-xni
+ln -s %{name}-xni-%{version} %{_javadocdir}/%{name}-xni
+
+%post
+update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
+  jaxp_parser_impl %{_javadir}/%{name}.jar 40
+
+%preun
+{
+  [ $1 = 0 ] || exit 0
+  update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar
+} >/dev/null 2>&1 || :
+
+
+%files
+%defattr(0644,root,root,0755)
+%doc LICENSE README ISSUES STATUS TODO
+%{_javadir}/%{name}*.jar
+%ghost %{_javadir}/jaxp_parser_impl.jar
+
+%files javadoc-impl
+%defattr(0644,root,root,0755)
+%doc %{_javadocdir}/%{name}-impl-%{version}
+%ghost %doc %{_javadocdir}/%{name}-impl
+
+%files javadoc-apis
+%defattr(0644,root,root,0755)
+%doc %{_javadocdir}/%{name}-apis-%{version}
+%ghost %doc %{_javadocdir}/%{name}-apis
+
+%files javadoc-dom3
+%defattr(0644,root,root,0755)
+%doc %{_javadocdir}/%{name}-dom3-%{version}
+%ghost %doc %{_javadocdir}/%{name}-dom3
+
+%files javadoc-other
+%defattr(0644,root,root,0755)
+%doc %{_javadocdir}/%{name}-other-%{version}
+%ghost %doc %{_javadocdir}/%{name}-other
+
+%files javadoc-xni
+%defattr(0644,root,root,0755)
+%doc %{_javadocdir}/%{name}-xni-%{version}
+%ghost %doc %{_javadocdir}/%{name}-xni
+
+%files demo
+%defattr(0644,root,root,0755)
+%{_datadir}/%{name}
+
+%files scripts
+%defattr(0755,root,root,0755)
+%{_bindir}/*
+
+
+%changelog
+* Sun Feb 08 2004 David Walluck <david@anti-microsoft.org> 0:2.6.1-1jpp
+- 2.6.1
+- update Source0 URL
+- now requires xml-commons-resolver
+
+* Fri Jan  9 2004 Kaj J. Niemi <kajtzu@fi.basen.net> - 0:2.6.0-1jpp
+- Update to 2.6.0
+- Patch #1 (xerces-j2-manifest.patch) is unnecessary (upstream)
+
+* Tue Oct 21 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.5.0-1jpp
+- Update to 2.5.0.
+- Clean up versionless javadoc dir symlinking, own (ghost) the symlinks.
+- Mark javadocs as %%doc.
+
+* Wed Jun  4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4.0-3jpp
+- Own (ghost) %%{_javadir}/jaxp_parser_impl.jar.
+- Remove alternatives in preun instead of postun.
+
+* Mon May 12 2003 David Walluck <david@anti-microsoft.org> 0:2.4.0-2jpp
+- bug #17325 fixed upstream
+
+* Mon May 12 2003 David Walluck <david@anti-microsoft.org> 0:2.4.0-1jpp
+- 2.4.0
+- BuildRequires: jikes
+- update for JPackage 1.5
+- re-diff'ed build patch for 2.4.0
+- bug #17325 handled by perl now
+- scripts: s|find-jar|build-classpath| and don't test for java-functions
+
+* Wed Mar 26 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> - 2.3.0-2jpp
+- For jpackage-utils 1.5
+- zapped manual, since it doesn't want to build
+- as a consequence, removed uneeded dependencies
+
+* Mon Feb 24 2003 Ville Skyttä <ville.skytta at iki.fi> - 2.3.0-1jpp
+- Update to 2.3.0.
+- Add a crude patch to work around invalid XML in doc sources, see
+  <http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17325>.
+- Built with IBM's 1.3.1 SR3.
+
+* Sat Dec 28 2002 Ville Skyttä <ville.skytta at iki.fi> - 2.2.1-2jpp
+- Add upstream patch which fixes problems with Tomcat's webapps.
+  <http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13282>
+  <http://marc.theaimsgroup.com/?l=xerces-cvs&m=103791990130308>
+- Separate scripts subpackage.
+
+* Fri Nov 15 2002 Ville Skyttä <ville.skytta at iki.fi> - 2.2.1-1jpp
+- Update to 2.2.1.
+- Change alternative to point to non-versioned jar.
+- Don't remove alternative on upgrade.
+- Fix Group tag for demo, javadoc and manual subpackages.
+- Add version and constants scripts.
+- Some spec file cleanup.
+
+* Sun Oct  6 2002 Ville Skyttä <ville.skytta at iki.fi> 2.2.0-2jpp
+- Fix bad permissions for main jar.
+
+* Sun Sep 29 2002 Ville Skyttä <ville.skytta at iki.fi> 2.1.0-1jpp
+- Update to 2.2.0.
+
+* Tue Sep 10 2002 Ville Skyttä <ville.skytta at iki.fi> 2.1.0-2jpp
+- Rebuild with -Dcompiler=modern, not a Jikes bug this time, but sloppy code
+  that is tolerated by javac.  See <http://www-124.ibm.com/developerworks/bugs/?func=detailbug&bug_id=3218&group_id=10> for details.
+
+* Tue Sep 10 2002 Ville Skyttä <ville.skytta at iki.fi> 2.1.0-1jpp
+- 2.1.0.
+- Updated description.
+- Changed javadoc and manual group to Documentation.
+- Spec file cleanups.
+
+* Fri Jul 12 2002 Henri Gomez <hgomez@users.sourceforge.net> 2.0.2-4jpp
+- add BuildRequires xerces-j1 and xalan-j2
+- removed BuildRequires xml-commons-api since ant require jaxp_parser_impl
+  which in turn require xml-commons-api ;)
+
+* Mon Jul 01 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.0.2-3jpp 
+- vendor, distribution, group tags
+- provides jaxp_parser_impl
+- dropped api jar
+- renamed lone jar to %{name}.jar
+- priority bumped to 40
+- fixed stylebook build (add xerces-j1 in classpath)
+
+* Wed Jun 26 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.0.2-2jpp
+- rebuild for missing symlinks
+- use sed instead of bash 2.x extension in link area to make spec compatible with distro using bash 1.1x
+
+* Mon Jun 24 2002 Henri Gomez <hgomez@users.sourceforge.net> 2.0.2-1jpp
+- 2.0.2
+
+* Sun Mar 10 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.0.1-1jpp 
+- 2.0.1
+- provides jaxp_parser2 virtual resource
+- drop wrapper
+
+* Sun Feb 03 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.0.0-1jpp 
+- first JPackage release