diff --git a/.cvsignore b/.cvsignore
index 8d2134e..12dea7f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,5 @@
 alsa-utils-1.0.7.tar.bz2
 alsa-utils-1.0.8.tar.bz2
 alsa-utils-1.0.9rc2.tar.bz2
+alsa-utils-1.0.9.tar.bz2
+alsacard.c
diff --git a/alsa-utils.spec b/alsa-utils.spec
index 13bc0ce..f563fb6 100644
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -1,13 +1,16 @@
+%define         version_main 1.0.9
+%define         version_app  rf
+
 Summary: 	Advanced Linux Sound Architecture (ALSA) utilities
 Name: 		alsa-utils
-Version: 	1.0.9rc2
-Release:	2
+Version: 	%{version_main}%{?version_app}
+Release:	1
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
-Source: 	ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2
+Source: 	ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version_main}%{?prever}.tar.bz2
 Source2:	salsa.c
-Patch0:	        alsa-utils-1.0.9rc2-make.patch
+Source3: 	alsacard.c
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	alsa-lib-devel >= %{version}
 BuildRequires:	ncurses-devel
@@ -19,14 +22,14 @@ This package contains command line utilities for the Advanced Linux Sound
 Architecture (ALSA).
 
 %prep
-%setup -q -n %{name}-%{version}%{?prever}
-%patch0 -p1 -b .man
+%setup -q -n %{name}-%{version_main}%{?prever}
 
 %build
 autoreconf -f -i
 %configure CFLAGS="$RPM_OPT_FLAGS" --sbindir=/sbin 
 %{__make} %{?_smp_mflags}
 %{__cc} $RPM_OPT_FLAGS -o salsa %{SOURCE2} -lasound
+%{__cc} $RPM_OPT_FLAGS -o alsacard %{SOURCE3} -lasound
 
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -40,6 +43,7 @@ ln -s ../../sbin/alsactl $RPM_BUILD_ROOT/%{_sbindir}/alsactl
 
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/dev.d/sound
 install -m 755 salsa $RPM_BUILD_ROOT/etc/dev.d/sound/alsa.dev
+install -m 755 alsacard  %{buildroot}%{_bindir}
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -54,9 +58,16 @@ install -m 755 salsa $RPM_BUILD_ROOT/etc/dev.d/sound/alsa.dev
 /sbin/*
 %{_mandir}/man?/*
 %{_mandir}/fr/man?/*
+/usr/share/sounds/alsa/*
+/usr/share/alsa/speaker-test/*
+%{_bindir}/alsacard
 
 
 %changelog
+* Mon May 30 2005 Martin Stransky <stransky@redhat.com> 1.0.9-1
+- New upstream version.
+- moved alsacard utility from alsa-lib to alsa-tools
+
 * Mon May 16 2005 Bill Nottingham <notting@redhat.com> 1.0.9rc2-2
 - make sure 'Wave' playback channel isn't muted (#157850)
 
diff --git a/sources b/sources
index 1be5a57..2095335 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-1827c3b40be142f93a78f280c24436cf  alsa-utils-1.0.9rc2.tar.bz2
+c7037c54ed06d32577947f632f2c677b  alsa-utils-1.0.9.tar.bz2
+84a139aff67d14024a3f3e4e9c586367  alsacard.c