diff --git a/packages/audio/alsa-plugins/package.mk b/packages/audio/alsa-plugins/package.mk
new file mode 100644
index 0000000000..6889e17692
--- /dev/null
+++ b/packages/audio/alsa-plugins/package.mk
@@ -0,0 +1,42 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="alsa-plugins"
+PKG_VERSION="1.0.29"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.alsa-project.org/"
+PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain alsa-lib"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC=""
+PKG_LONGDESC=""
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+# package specific configure options
+PKG_CONFIGURE_OPTS_TARGET="--disable-jack \
+                           --enable-pulseaudio \
+                           --disable-samplerate \
+                           --disable-maemo-plugin \
+                           --disable-maemo-resource-manager \
+                           --disable-avcodec \
+                           --with-plugindir=/usr/lib/alsa"
diff --git a/packages/audio/pulseaudio/config/system.pa b/packages/audio/pulseaudio/config/system.pa
index e621a655e6..8eb36df2de 100644
--- a/packages/audio/pulseaudio/config/system.pa
+++ b/packages/audio/pulseaudio/config/system.pa
@@ -55,7 +55,6 @@ load-module module-suspend-on-idle
 ### Enable positioned event sounds
 load-module module-position-event-sounds
 
-
 ### Automatically load modules for dbus
 .ifexists module-dbus-protocol.so
  load-module module-dbus-protocol
@@ -74,9 +73,5 @@ load-module module-position-event-sounds
   load-module module-zeroconf-publish
 .endif
 
-.ifexists module-zeroconf-discover.so
-  load-module module-zeroconf-discover
-.endif
-
 load-module module-native-protocol-tcp auth-anonymous=1
 load-module module-switch-on-connect
diff --git a/packages/audio/pulseaudio/package.mk b/packages/audio/pulseaudio/package.mk
index fc185278bb..7f5dc1a749 100644
--- a/packages/audio/pulseaudio/package.mk
+++ b/packages/audio/pulseaudio/package.mk
@@ -79,6 +79,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
                            --disable-bluez5-ofono-headset \
                            --disable-bluez5-native-headset \
                            --enable-udev \
+                           --with-udev-rules-dir=/usr/lib/udev/rules.d
                            --disable-hal-compat \
                            --enable-ipv6 \
                            --enable-openssl \
diff --git a/packages/audio/pulseaudio/profile.d/99-pulseaudio.conf b/packages/audio/pulseaudio/profile.d/99-pulseaudio.conf
new file mode 100644
index 0000000000..70427c6cf2
--- /dev/null
+++ b/packages/audio/pulseaudio/profile.d/99-pulseaudio.conf
@@ -0,0 +1,19 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/pulseaudio"
diff --git a/packages/audio/pulseaudio/system.d/pulseaudio.service b/packages/audio/pulseaudio/system.d/pulseaudio.service
index 70c9b1211d..96ce5351fc 100644
--- a/packages/audio/pulseaudio/system.d/pulseaudio.service
+++ b/packages/audio/pulseaudio/system.d/pulseaudio.service
@@ -3,8 +3,12 @@ Description=PulseAudio Sound System
 After=syslog.target local-fs.target
 
 [Service]
+Restart=on-failure
 ExecStart=/usr/bin/pulseaudio --system
-Restart=always
+TimeoutStopSec=1s
+RestartSec=2
+StartLimitInterval=60
+StartLimitBurst=10
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index bcd259791d..5554fded9b 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -73,10 +73,7 @@ fi
 
 if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
 # for PulseAudio support
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio"
-  KODI_PULSEAUDIO="--enable-pulse"
-else
-  KODI_PULSEAUDIO="--disable-pulse"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio alsa-plugins"
 fi
 
 if [ "$ESPEAK_SUPPORT" = yes ]; then
@@ -254,7 +251,7 @@ PKG_CONFIGURE_OPTS_TARGET="gl_cv_func_gettimeofday_clobber=no \
                            $KODI_XORG \
                            --disable-ccache \
                            $KODI_ALSA \
-                           $KODI_PULSEAUDIO \
+                           --disable-pulse \
                            --enable-rtmp \
                            $KODI_SAMBA \
                            $KODI_NFS \