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 4189b67..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xml-writer
-# $Id$
-NAME := xml-writer
-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 $$/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..e4b0390 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+067186abed04ffd5b5788ae8edfe035d  xml-writer-0.2.zip
diff --git a/xml-writer.patch b/xml-writer.patch
new file mode 100644
index 0000000..edafef2
--- /dev/null
+++ b/xml-writer.patch
@@ -0,0 +1,11 @@
+--- build.xml.old	2009-06-28 15:56:41.909700226 +0200
++++ build.xml	2009-06-28 15:56:54.346542177 +0200
+@@ -18,7 +18,7 @@
+ </target>
+ 
+ <target name="compile" depends="prepare">
+- <javac srcdir="src" destdir="classes" filtering="on"/>
++ <javac srcdir="src" destdir="classes"/>
+ </target>
+ 
+ <target name="jar" depends="compile">
diff --git a/xml-writer.spec b/xml-writer.spec
new file mode 100644
index 0000000..975533d
--- /dev/null
+++ b/xml-writer.spec
@@ -0,0 +1,78 @@
+Name:           xml-writer
+Version:        0.2
+Release:        2%{?dist}
+Summary:        Java filter class designed to work with SAX2
+Group:          Development/Libraries
+License:        Public Domain
+URL:            http://www.megginson.com/
+Source0:        http://www.megginson.com/downloads/xml-writer-0.2.zip
+# The filtering attribute is not supported by javac (IcedTea 1.6, at least). Remove it.
+Patch0:         xml-writer.patch
+BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:     ant
+BuildRequires:     java-devel >= 1:1.6.0
+BuildRequires:     jpackage-utils
+Requires:          java >= 1:1.6.0
+Requires:          jpackage-utils
+
+%description
+With this filter one can use it to take a snapshot of
+any point in a SAX2 filter chain, as well as serializing the final
+result to XML (this may be important for auditing as well).
+
+
+%package javadoc
+Summary:           Javadocs for xml-writer
+Group:             Documentation
+Requires:          %{name} = %{version}-%{release}
+
+%description javadoc
+xml-writer development documentation.
+
+
+%prep
+%setup -q
+%patch0
+
+rm -f xml-writer.jar
+
+%build
+ant clean jar javadoc
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jar
+install -d $RPM_BUILD_ROOT%{_javadir}
+install -m644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+# javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -rp docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING README ChangeLog BUGS
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
+
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}-%{version}/
+%{_javadocdir}/%{name}
+
+
+%changelog
+* Mon Sep 21 2009 Sandro Mathys <red at fedoraproject.org> - 0.2-2
+- fixed issues that were discovered in the review process
+
+* Sun Jun 28 2009 Sandro Mathys <red at fedoraproject.org> - 0.2-1
+- initial build