diff --git a/alsa-lib-1.0.21-dmix-conf.patch b/alsa-lib-1.0.21-dmix-conf.patch
new file mode 100644
index 0000000..316cd3f
--- /dev/null
+++ b/alsa-lib-1.0.21-dmix-conf.patch
@@ -0,0 +1,65 @@
+From 1f126fd7c6ef37b04ad745609bbebf0dbbf2e1fd Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 9 Sep 2009 11:38:11 +0200
+Subject: [PATCH] Change dmix.conf to accept user configuration from defaults.dmix.<driver_id>.xxx
+
+An attempt to fix problem described in reverted patch "Fix driver conf
+parsing in snd_config_hook_load_for_all_cards()".
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/conf/pcm/dmix.conf |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/conf/pcm/dmix.conf b/src/conf/pcm/dmix.conf
+index 4108ddb..e62cb29 100644
+--- a/src/conf/pcm/dmix.conf
++++ b/src/conf/pcm/dmix.conf
+@@ -63,12 +63,12 @@ pcm.!dmix {
+ 			name {
+ 				@func concat
+ 				strings [
+-					"cards."
++					"defaults.dmix."
+ 					{
+ 						@func card_driver
+ 						card $CARD
+ 					}
+-					".pcm.dmix.period_size"
++					".period_size"
+ 				]
+ 			}
+ 			default 1024
+@@ -78,12 +78,12 @@ pcm.!dmix {
+ 			name {
+ 				@func concat
+ 				strings [
+-					"cards."
++					"defaults.dmix."
+ 					{
+ 						@func card_driver
+ 						card $CARD
+ 					}
+-					".pcm.dmix.period_time"
++					".period_time"
+ 				]
+ 			}
+ 			default -1
+@@ -93,12 +93,12 @@ pcm.!dmix {
+ 			name {
+ 				@func concat
+ 				strings [
+-					"cards."
++					"defaults.dmix."
+ 					{
+ 						@func card_driver
+ 						card $CARD
+ 					}
+-					".pcm.dmix.periods"
++					".periods"
+ 				]
+ 			}
+ 			default 16
+-- 
+1.5.5.1
+
diff --git a/alsa-lib-1.0.21-revert-hook.patch b/alsa-lib-1.0.21-revert-hook.patch
new file mode 100644
index 0000000..aff50dc
--- /dev/null
+++ b/alsa-lib-1.0.21-revert-hook.patch
@@ -0,0 +1,36 @@
+From 133819d420d962b6888c280352a5532da93f1a3a Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 9 Sep 2009 11:24:11 +0200
+Subject: [PATCH] Revert "Fix driver conf parsing in snd_config_hook_load_for_all_cards()"
+
+This reverts commit 96da0c842d14b40ce8e37726b259229634b3aa21.
+
+This way of fix brokes card-specific configuration loading.
+See http://bugzilla.redhat.com bug#521988 for details.
+
+Appropriate way to handle this problem is to fix the dmix configuration file.
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ src/conf.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/conf.c b/src/conf.c
+index 3f0dfe1..570c90f 100644
+--- a/src/conf.c
++++ b/src/conf.c
+@@ -3477,8 +3477,9 @@ int snd_config_hook_load_for_all_cards(snd_config_t *root, snd_config_t *config,
+ 			err = snd_determine_driver(card, &fdriver);
+ 			if (err < 0)
+ 				return err;
+-			if (snd_config_search(root, fdriver, &n) >= 0 &&
+-			    snd_config_get_string(n, &driver) >= 0) {
++			if (snd_config_search(root, fdriver, &n) >= 0) {
++				if (snd_config_get_string(n, &driver) < 0)
++					goto __err;
+ 				assert(driver);
+ 				while (1) {
+ 					char *s = strchr(driver, '.');
+-- 
+1.5.5.1
+
diff --git a/alsa-lib.spec b/alsa-lib.spec
index d2e412c..ce605b5 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -6,7 +6,7 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.21
-Release: 2%{?prever_dot}%{?dist}
+Release: 3%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2