diff --git a/.cvsignore b/.cvsignore
index 3e6fec3..4815d6a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 libburn-0.2svn.tar.gz
+libburn-0.2.2.tar.gz
diff --git a/libburn.spec b/libburn.spec
index 00d9497..fcac77c 100644
--- a/libburn.spec
+++ b/libburn.spec
@@ -1,18 +1,15 @@
-%define         mainver 0.2
-# define this as version gets overridden by the subpackage with its own version
-
 Name:           libburn
-Version:        0.2
-Release:        4.20060908svn%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        Library for reading, mastering and writing optical discs
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://libburn.pykix.org/
-Source0:        %{name}-%{version}svn.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  automake libtool intltool gettext 
+BuildRequires:  automake libtool intltool gettext doxygen graphviz
 #Requires:       
 
 %description
@@ -61,8 +58,7 @@ developing applications that use libisofs.
 %package -n     cdrskin
 Summary:        Limited cdrecord compatibility wrapper to ease migration to libburn
 Group:          Applications/Multimedia
-Version:        0.1.4
-Requires:       %{name} = %{mainver}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description -n cdrskin
 A limited cdrecord compatibility wrapper which allows to use some libburn 
@@ -70,13 +66,14 @@ features from the command line.
 
 
 %prep
-%setup -n %{name}-%{mainver}svn -q
+%setup -q
 
 
 %build
-./bootstrap
+#./bootstrap
 %configure --disable-static
 make %{?_smp_mflags}
+doxygen doc/doxygen.conf
 
 
 %install
@@ -84,6 +81,8 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 cdrskin/cdrskin $RPM_BUILD_ROOT%{_bindir}/cdrskin
+install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
+install -m 0644 doc/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -102,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYRIGHT README
+%doc AUTHORS COPYING COPYRIGHT README doc/html
 %{_libdir}/%{name}*.so.*
 
 %files devel
@@ -131,6 +130,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 20 2006 Jesse Keating <jkeating@redhat.com> - 0.2-2-1
+- 0.2.2 release
+
+* Tue Sep 12 2006 Jesse Keating <jkeating@redhat.com> - 0.2-5.20060808svn
+- Create doxygen docs
+
 * Fri Sep  8 2006 Jesse Keating <jkeating@redhat.com> - 0.2-4.20060808svn
 - rebuild with new snapshot
 
diff --git a/sources b/sources
index a7e9c6e..cede2c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87ba6cf624ccc53b5b086a0e72b5d39c  libburn-0.2svn.tar.gz
+20d0903d6b3fc646d32888cc91b12376  libburn-0.2.2.tar.gz