diff --git a/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/alsa-plugins-1.0.24.ebuild b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/alsa-plugins-1.0.24.ebuild
index 9e17ac3f01..2fb62daa69 100644
--- a/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/alsa-plugins-1.0.24.ebuild
+++ b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/alsa-plugins-1.0.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.24.ebuild,v 1.2 2011/04/10 20:21:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.24.ebuild,v 1.6 2011/10/04 04:52:47 maekke Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/plugins/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}[alsa_pcm_plugins_ioplug]
diff --git a/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/alsa-plugins-1.0.21-automagic.patch b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/alsa-plugins-1.0.21-automagic.patch
new file mode 100644
index 0000000000..f7d9e7dc43
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/alsa-plugins-1.0.21-automagic.patch
@@ -0,0 +1,12 @@
+diff -ur alsa-plugins-1.0.21.orig/Makefile.am alsa-plugins-1.0.21/Makefile.am
+--- alsa-plugins-1.0.21.orig/Makefile.am	2009-05-06 10:07:28.000000000 +0300
++++ alsa-plugins-1.0.21/Makefile.am	2009-08-01 18:23:26.000000000 +0300
+@@ -17,7 +17,7 @@
+ if HAVE_PPH
+ SUBDIRS += pph
+ endif
+-if HAVE_SPEEXDSP
++if USE_LIBSPEEX
+ SUBDIRS += speex
+ endif
+ 
diff --git a/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse-alsa.conf b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse-alsa.conf
new file mode 100644
index 0000000000..9964f29467
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse-alsa.conf
@@ -0,0 +1,27 @@
+# This file is referred to by /usr/share/alsa/pulse.conf to set pulseaudio as
+# the default output plugin for applications using alsa when PulseAudio is
+# running.
+
+pcm.!default {
+	type pulse
+}
+
+ctl.!default {
+	type pulse
+}
+
+pcm.pulse {
+        type pulse
+	hint {
+		show {
+			@func refer
+			name defaults.namehint.basic
+		}
+		description "Playback/recording through the PulseAudio sound server"
+	}
+}
+
+ctl.pulse {
+        type pulse
+}
+
diff --git a/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse.conf b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse.conf
new file mode 100644
index 0000000000..bc409fe6db
--- /dev/null
+++ b/sdk_container/src/third_party/portage-stable/media-plugins/alsa-plugins/files/pulse.conf
@@ -0,0 +1,18 @@
+# PulseAudio alsa plugin configuration file to set the pulseaudio plugin as
+# default output for applications using alsa when pulseaudio is running.
+hook_func.pulse_load_if_running {
+	lib "/usr/lib/alsa-lib/libasound_module_conf_pulse.so"
+	func "conf_pulse_hook_load_if_running"
+}
+
+@hooks [
+	{
+		func pulse_load_if_running
+		files [
+			"/usr/share/alsa/pulse-alsa.conf"
+			"/etc/asound.conf"
+			"~/.asoundrc"
+		]
+		errors false
+	}
+]