diff --git a/pulseaudio.changes b/pulseaudio.changes
index fe7d9c0..2455594 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 15 12:48:41 CET 2018 - tiwai@suse.de
+
+- Fix setup-pulseaudio script to deal with the new alsa/conf.d
+  setup that was introduced since alsa-lib 1.1.7 (bsc#1116153)
+
 -------------------------------------------------------------------
 Fri Oct 19 11:07:58 UTC 2018 - Antonio Larrosa <alarrosa@suse.com>
 
diff --git a/setup-pulseaudio b/setup-pulseaudio
index 2ac994b..5af85e4 100644
--- a/setup-pulseaudio
+++ b/setup-pulseaudio
@@ -78,10 +78,19 @@ enable_kmix() {
 
 enable_alsa() {
     echo "Enabling PulseAudio for ALSA..."
-    if [ -f /etc/alsa-pulse.conf ]; then
+    if [ -f /etc/alsa/conf.d/99-pulseaudio-default.conf ]; then
+	return 0
+    fi
+    if [ -f /etc/alsa/conf.d/99-pulseaudio-default.conf.example ]; then
+	ln -s 99-pulseaudio-default.conf.example /etc/alsa/conf.d/99-pulseaudio-default.conf
+	delete_variable ALSA_CONFIG_PATH
+    elif [ -f /usr/share/alsa/conf.d/99-pulseaudio-default.conf.example ]; then
+	ln -s /usr/share/alsa/conf.d/99-pulseaudio-default.conf.example /etc/alsa/conf.d/99-pulseaudio-default.conf
+	delete_variable ALSA_CONFIG_PATH
+    elif [ -f /etc/alsa-pulse.conf ]; then
 	set_variable ALSA_CONFIG_PATH /etc/alsa-pulse.conf
     else
-	echo "Missing /etc/alsa-pluse.conf; please install alsa-plugins-pulse package"
+	echo "Please install alsa-plugins-pulse package"
 	delete_variable ALSA_CONFIG_PATH
     fi
 }
@@ -210,6 +219,7 @@ enable_autospawn() {
 disable_alsa() {
     echo "Disabling PulseAudio for ALSA..."
     delete_variable ALSA_CONFIG_PATH
+    rm -f /etc/alsa/conf.d/99-pulseaudio-default.conf
 }
 
 disable_phonon() {