diff --git a/.cvsignore b/.cvsignore
index d3b5aa5..e143174 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 alsa-lib-1.0.9rc4.tar.bz2
 alsacard.c
+alsa-lib-1.0.9.tar.bz2
diff --git a/alsa-lib.spec b/alsa-lib.spec
index a9b3135..3f9b0d0 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -1,15 +1,17 @@
+%define version_main 1.0.9
+%define version_app  rf
+
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name: alsa-lib
-Version: 1.0.9rc4
-Release: 2
+Version: %{version_main}%{?version_app}
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
-Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}.tar.bz2
+Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2
 Source1: ainit-0.4.tar.gz
-Source2: alsacard.c
 Patch0: alsa-lib-ainit-2.patch
 URL: http://www.alsa-project.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version_main}-root
 BuildRequires: doxygen
 Prereq: /sbin/ldconfig
 
@@ -34,7 +36,7 @@ This package includes the ALSA development libraries for developing
 against the ALSA libraries and interfaces.
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever} -a 1
+%setup -q -n %{name}-%{version_main}%{?prever} -a 1
 %patch0 -p1 -b .ainit
 
 %build
@@ -50,9 +52,6 @@ cd ainit
 ./compile
 cd ..
 
-# Compile alsacard
-%{__cc} $RPM_OPT_FLAGS -o alsacard %{SOURCE2} -lasound
-
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
@@ -68,9 +67,6 @@ mv %{buildroot}/etc/aclocal %{buildroot}%{_datadir}
 # install ainit binaries
 install -m 755 ainit/ainit %{buildroot}%{_bindir}
 
-# alsa_card binary
-install -m 755 alsacard   %{buildroot}%{_bindir}
-
 # install ainit config files
 install -m 644 ainit/config/ainit.conf %{buildroot}%{_sysconfdir}/alsa/ainit.conf
 install -m 644 ainit/config/dmix.template %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.template
@@ -103,7 +99,6 @@ ln -snf ../../etc/alsa %{_datadir}/alsa
 %{_sysconfdir}/alsa
 %config %{_sysconfdir}/alsa/alsa.conf
 %{_bindir}/ainit
-%{_bindir}/alsacard
 %{_mandir}/man?/*
 
 %files devel
@@ -118,6 +113,10 @@ ln -snf ../../etc/alsa %{_datadir}/alsa
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Mon May 30 2005 Martin Stransky <stransky@redhat.com> 1.0.9rf-1
+- New upstream version
+- moved alsacard utility to alsa-utils
+
 * Fri May 27 2005 Martin Stransky <stransky@redhat.com> 1.0.9rc4-2
 - alsacard utility for s-c-s
 
diff --git a/sources b/sources
index d6f6ee0..cc2f410 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 509cdf0740cd41297c7b568182974a46  ainit-0.4.tar.gz
-fb2330ad8b9a86b4d17345e8b34974e0  alsa-lib-1.0.9rc4.tar.bz2
-84a139aff67d14024a3f3e4e9c586367  alsacard.c
+114af3304619920ffe2b147b760700b9  alsa-lib-1.0.9.tar.bz2