diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 5d806ab..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-libcanberra-0.18.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0cc410f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+libcanberra-0.22.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 6498fce..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: libcanberra
-# $Id$
-NAME := libcanberra
-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/import.log b/import.log
deleted file mode 100644
index 7bf54a3..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-libcanberra-0_3-1_fc10:HEAD:libcanberra-0.3-1.fc10.src.rpm:1213637385
diff --git a/libcanberra.spec b/libcanberra.spec
index 35b1c63..e80a3eb 100644
--- a/libcanberra.spec
+++ b/libcanberra.spec
@@ -1,6 +1,6 @@
 Name: libcanberra
-Version: 0.18
-Release: 2%{?dist}
+Version: 0.22
+Release: 1%{?dist}
 Summary: Portable Sound Event Library
 Group: System Environment/Libraries
 Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
@@ -127,6 +127,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libcanberra.vapi
 
 %changelog
+* Tue Oct 20 2009 Lennart Poettering <lpoetter@redhat.com> 0.22-1
+- New version 0.22
+
+* Fri Oct 16 2009 Lennart Poettering <lpoetter@redhat.com> 0.21-1
+- New version 0.21
+
+* Thu Oct 15 2009 Lennart Poettering <lpoetter@redhat.com> 0.20-1
+- New version 0.20
+
+* Wed Oct 14 2009 Lennart Poettering <lpoetter@redhat.com> 0.19-1
+- New version 0.19
+
 * Fri Sep 25 2009 Matthias Clasen <mclasen@redhat.com> - 0.18-2
 - Don't require vala in -devel (#523473)
 
diff --git a/sources b/sources
index b42f55f..3b84408 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-395e83f7eac48b3ce8372a714026c85d  libcanberra-0.18.tar.gz
+e24e2f956fedfbcc58edfa40471b18d8  libcanberra-0.22.tar.gz