diff --git a/pulseaudio-alsa-speaker-zero-vol-fix.patch b/pulseaudio-alsa-speaker-zero-vol-fix.patch
new file mode 100644
index 0000000..47ec0ee
--- /dev/null
+++ b/pulseaudio-alsa-speaker-zero-vol-fix.patch
@@ -0,0 +1,37 @@
+From a703451811f31abe6302f39675c1e1fdfc1925d6 Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson@canonical.com>
+Date: Wed, 19 Dec 2012 10:24:33 +0000
+Subject: alsa-mixer: Fix the analog-output-speaker-always path
+
+A left over "required-any" made this path useless for most people.
+While we're at it, also add "Front Headphone" like for the normal
+speaker path.
+
+Tested-by: Colin Guthrie <gmane@colin.guthr.ie>
+Signed-off-by: David Henningsson <david.henningsson@canonical.com>
+---
+diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+index 3ebdc4a..8a2b3df 100644
+--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
++++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+@@ -30,6 +30,10 @@ device.icon_name = audio-speakers
+ state.plugged = no
+ state.unplugged = unknown
+ 
++[Jack Front Headphone]
++state.plugged = no
++state.unplugged = unknown
++
+ [Element Hardware Master]
+ switch = mute
+ volume = merge
+@@ -132,7 +136,6 @@ switch = mute
+ volume = merge
+ override-map.1 = lfe
+ override-map.2 = lfe,lfe
+-required-any = any
+ 
+ [Element CLFE]
+ switch = mute
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/pulseaudio.changes b/pulseaudio.changes
index 32d551f..45ba3b2 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Apr 25 14:52:14 UTC 2013 - dmueller@suse.com
+
+- explicitely disable building NEON for armv5/6 
+
+-------------------------------------------------------------------
+Fri Mar  8 10:17:34 CET 2013 - tiwai@suse.de
+
+- Fix a bug setting speaker volume to zero wrongly (bnc#805865)
+
 -------------------------------------------------------------------
 Tue Mar  5 06:03:19 UTC 2013 - crrodriguez@opensuse.org
 
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 8ad96b9..5c1d485 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -34,6 +34,7 @@ Source99:       baselibs.conf
 Patch0:         disabled-start.diff
 Patch1:         suppress-socket-error-msg.diff
 Patch2:         pulseaudio-wrong-memset.patch
+Patch3:         pulseaudio-alsa-speaker-zero-vol-fix.patch
 %if 0%{?suse_version} >= 1210
 BuildRequires:  pkgconfig(systemd)
 %endif
@@ -264,6 +265,7 @@ translation-update-upstream
 %patch0
 %patch1 -p1
 %patch2
+%patch3 -p1
 
 %build
 autoreconf -fiv
@@ -271,6 +273,9 @@ autoreconf -fiv
         --disable-static \
         --disable-rpath \
         --enable-systemd \
+%ifarch armv5tel armv6hl
+        --disable-neon-opt \
+%endif
         --with-system-user=pulse \
         --with-system-group=pulse \
         --with-access-group=pulse-access \