diff --git a/.cvsignore b/.cvsignore
index 1c3e64d..d3b5aa5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 alsa-lib-1.0.9rc4.tar.bz2
+alsacard.c
diff --git a/alsa-lib.spec b/alsa-lib.spec
index fac8d9c..a9b3135 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -1,14 +1,13 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name: alsa-lib
 Version: 1.0.9rc4
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}.tar.bz2
 Source1: ainit-0.4.tar.gz
-#Patch0: alsa-lib-mixer.patch
-Patch3: alsa-lib-ainit.patch
-Patch6: alsa-lib-ainit-dsnoop.patch
+Source2: alsacard.c
+Patch0: alsa-lib-ainit-2.patch
 URL: http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: doxygen
@@ -36,8 +35,7 @@ against the ALSA libraries and interfaces.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prever} -a 1
-%patch3 -p1 -b .ainit
-%patch6 -p1
+%patch0 -p1 -b .ainit
 
 %build
 %configure \
@@ -47,10 +45,14 @@ against the ALSA libraries and interfaces.
 make %{?_smp_mflags}
 make doc
 
+# Compile ainit
 cd ainit
 ./compile
 cd ..
 
+# Compile alsacard
+%{__cc} $RPM_OPT_FLAGS -o alsacard %{SOURCE2} -lasound
+
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
@@ -66,6 +68,9 @@ 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
@@ -98,6 +103,7 @@ ln -snf ../../etc/alsa %{_datadir}/alsa
 %{_sysconfdir}/alsa
 %config %{_sysconfdir}/alsa/alsa.conf
 %{_bindir}/ainit
+%{_bindir}/alsacard
 %{_mandir}/man?/*
 
 %files devel
@@ -112,6 +118,9 @@ ln -snf ../../etc/alsa %{_datadir}/alsa
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Fri May 27 2005 Martin Stransky <stransky@redhat.com> 1.0.9rc4-2
+- alsacard utility for s-c-s
+
 * Tue May 24 2005 Bill Nottingham <notting@redhat.com> 1.0.9rc4-1
 - update to 1.0.9rc4 (#157180, #158547)
 
diff --git a/sources b/sources
index 3f0b749..d6f6ee0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 509cdf0740cd41297c7b568182974a46  ainit-0.4.tar.gz
 fb2330ad8b9a86b4d17345e8b34974e0  alsa-lib-1.0.9rc4.tar.bz2
+84a139aff67d14024a3f3e4e9c586367  alsacard.c