diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 8db5941..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xmlbeans
-# $Id$
-NAME := xmlbeans
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/sources b/sources
index e69de29..b58ff78 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+64412ab1f19d90112335062bfa90f7c8 xmlbeans-2.4.0-src.tgz
diff --git a/xmlbeans-2.4.0-nodownload.patch b/xmlbeans-2.4.0-nodownload.patch
new file mode 100644
index 0000000..f89aa6f
--- /dev/null
+++ b/xmlbeans-2.4.0-nodownload.patch
@@ -0,0 +1,40 @@
+Do not foolishly attempt to download jars from the internets.
+
+diff -up xmlbeans-2.4.0/build.xml.nodownload xmlbeans-2.4.0/build.xml
+--- xmlbeans-2.4.0/build.xml.nodownload 2008-06-10 15:42:37.000000000 +0200
++++ xmlbeans-2.4.0/build.xml 2009-11-03 15:53:11.000000000 +0100
+@@ -112,7 +112,7 @@
+ http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-7-3j.zip
+ http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-8j.zip
+ -->
+-
+
+@@ -120,7 +120,7 @@
+
+
+
+-
++
+
+
+
+@@ -147,14 +147,14 @@
+
+
+
+-
+
+
+
diff --git a/xmlbeans.spec b/xmlbeans.spec
new file mode 100644
index 0000000..16dca6d
--- /dev/null
+++ b/xmlbeans.spec
@@ -0,0 +1,228 @@
+# 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.
+#
+
+%bcond_without bootstrap
+
+Name: xmlbeans
+Version: 2.4.0
+Release: 5%{?dist}%{?bootstrap:.boot}
+Summary: XML-Java binding tool
+Group: Development/Libraries
+URL: http://xmlbeans.apache.org/
+Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz
+Patch0: xmlbeans-2.4.0-nodownload.patch
+License: ASL 2.0
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%if %without bootstrap
+BuildRequires: xmlbeans
+%endif
+BuildRequires: jpackage-utils >= 0:1.5
+BuildRequires: ant >= 0:1.6, ant-junit, ant-contrib, junit
+BuildRequires: ant >= 0:1.6, ant-junit, junit
+BuildRequires: xml-commons-resolver >= 0:1.1
+BuildRequires: bea-stax-api
+BuildRequires: saxon >= 8
+BuildRequires: java-devel-openjdk
+Requires: jpackage-utils >= 0:1.6
+
+BuildArch: noarch
+
+%description
+XMLBeans is a tool that allows you to access the full power
+of XML in a Java friendly way. It is an XML-Java binding tool.
+The idea is that you can take advantage the richness and
+features of XML and XML Schema and have these features mapped
+as naturally as possible to the equivalent Java language and
+typing constructs. XMLBeans uses XML Schema to compile Java
+interfaces and classes that you can then use to access and
+modify XML instance data. Using XMLBeans is similar to using
+any other Java interface/class, you will see things like
+getFoo or setFoo just as you would expect when working with
+Java. While a major use of XMLBeans is to access your XML
+instance data with strongly typed Java classes there are also
+API's that allow you access to the full XML infoset (XMLBeans
+keeps full XML Infoset fidelity) as well as to allow you to
+reflect into the XML schema itself through an XML Schema
+Object model.
+
+
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+
+%description javadoc
+%{summary}.
+
+
+%package manual
+Summary: Documents for %{name}
+Group: Documentation
+
+%description manual
+%{summary}.
+
+
+%package scripts
+Summary: Scripts for %{name}
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+
+%description scripts
+%{summary}.
+
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .nodownload
+
+
+%build
+# Piccolo and jam are rebuilt from source and bundled with xbean
+# ant clean.jars leaves some dangling jars around, do not use it
+find . \( -name '*.jar' -o -name '*.zip' \) \
+ -not -name 'piccolo*.jar' -not -name 'jam*.jar' \
+ %{?with_bootstrap:-not -name 'oldxbean.jar' } \
+ -print -delete
+
+# Replace bundled libraries
+mkdir -p build/lib
+ln -sf $(build-classpath xml-commons-resolver) build/lib/resolver.jar
+ln -sf $(build-classpath xmlbeans/xbean) external/lib/oldxbean.jar
+ln -sf $(build-classpath bea-stax-api) external/lib/jsr173_1.0_api.jar
+ln -sf $(build-classpath saxon) external/lib/saxon9.jar
+ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar
+
+# Fix CRLF
+sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css
+
+# Build
+ant default docs
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jar
+install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -p -m 0644 build/lib/xmlpublic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic-%{version}.jar
+install -p -m 0644 build/lib/xbean_xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath-%{version}.jar
+install -p -m 0644 build/lib/xbean.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean-%{version}.jar
+ln -s xmlpublic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic.jar
+ln -s xbean_xpath-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar
+ln -s xbean-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar
+
+# bin
+install -d -m 0755 $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 bin/dumpxsb $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 bin/inst2xsd $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 bin/scomp $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 bin/sdownload $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 bin/sfactor $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 bin/svalidate $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 bin/validate $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 bin/xpretty $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 bin/xsd2inst $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 bin/xsdtree $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 bin/xstc $RPM_BUILD_ROOT%{_bindir}
+
+
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/docs/reference/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+rm -rf build/docs/reference
+
+# manual
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+# fix line endings
+cat $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html | tr -d \\r > tmp
+mv tmp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%{_javadir}/*
+%doc LICENSE.txt NOTICE.txt README.txt
+
+
+%files javadoc
+%defattr(0644,root,root,0755)
+%doc %{_javadocdir}/%{name}
+
+
+%files manual
+%defattr(0644,root,root,0755)
+%{_docdir}/%{name}-%{version}
+
+
+%files scripts
+%defattr(0644,root,root,0755)
+%attr(0755,root,root) %{_bindir}/*
+
+
+%changelog
+* Fri Nov 27 2009 Lubomir Rintel - 2.4.0-5
+- Fix up saxon dependency
+- Drop epoch
+- Drop gcj
+
+* Tue Nov 03 2009 Lubomir Rintel 0:2.4.0-4
+- Update to 2.4.0
+- Tidy up a bit for Fedora
+
+* Wed Sep 06 2006 Ralph Apel 0:2.1.0-3jpp
+- BuildRequire saxon8 instead of saxonb8
+- (B)Require bea-stax-api instead of bea-stax
+- Patch maven-plugin's project.xml for bea-stax-api instead of stax-bea-api
+- Patch XbeanXQuery to saxon 8.7
+- Add gcj_support option
+- Add post/postun Requires for javadoc
+
+* Wed Feb 01 2006 Ralph Apel 0:2.1.0-2jpp
+- Install plugin to /usr/share/maven/repository/JPP/plugins
+
+* Mon Jan 30 2006 Ralph Apel 0:2.1.0-1jpp
+- Upgrade to 2.1.0
+- Add -maven-plugin subpackage
+
+* Fri Jun 03 2005 Fernando Nasser 0:1.0.4-2jpp
+- Add missing build requires for jaxen
+
+* Fri Jun 03 2005 Fernando Nasser 0:1.0.4-1jpp
+- Upgrade to 1.0.4
+
+* Thu Sep 30 2004 Ralph Apel 0:1.0.3-1jpp
+- First JPackage build