diff --git a/alsa-init.sh b/alsa-init.sh
index 4ea6a58..b9c5afe 100644
--- a/alsa-init.sh
+++ b/alsa-init.sh
@@ -2,7 +2,7 @@
 # alsa-init card#
 
 /usr/bin/set_default_volume -f $1 >/dev/null 2>&1
-test -s /etc/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null 2>&1
+test -s /var/lib/asound.state && /usr/sbin/alsactl -F restore $1 >/dev/null 2>&1
 # increase buffer-preallocation size (for PA)
 if [ -f /proc/asound/card$1/pcm0p/sub0/prealloc_max ]; then
     pmax=$(< /proc/asound/card$1/pcm0p/sub0/prealloc_max)
diff --git a/alsa.changes b/alsa.changes
index 5f58707..28546b1 100644
--- a/alsa.changes
+++ b/alsa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 25 11:41:18 CET 2011 - tiwai@suse.de
+
+- Fix asound.state path in other scripts, too
+- Replace the asound.state path for older distros
+
 -------------------------------------------------------------------
 Thu Mar 24 11:27:27 UTC 2011 - werner@suse.de
 
diff --git a/alsa.spec b/alsa.spec
index 1e8158c..009dab1 100644
--- a/alsa.spec
+++ b/alsa.spec
@@ -166,6 +166,10 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 install -c -m 0755 %{SOURCE16} $RPM_BUILD_ROOT%{_bindir}
 install -c -m 0755 %{SOURCE34} $RPM_BUILD_ROOT%{_sbindir}/alsa-init
+%if %suse_version < 1140
+sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_bindir}/set_default_volume
+sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT%{_sbindir}/alsa-init
+%endif
 # install test wave file
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/sounds/alsa
 install -c -m 0644 %{SOURCE17} $RPM_BUILD_ROOT%{_datadir}/sounds/alsa/test.wav
@@ -180,6 +184,9 @@ install -c -m 0644 %{SOURCE32} $RPM_BUILD_ROOT/usr/lib
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 install -c -m 0755 %{SOURCE11} $RPM_BUILD_ROOT/etc/init.d
 install -c -m 0755 %{SOURCE13} $RPM_BUILD_ROOT/etc/init.d
+%if %suse_version < 1140
+sed -i -e 's@/var/lib/asound.state@/etc/asound.state@g' $RPM_BUILD_ROOT/etc/init.d/alsasound
+%endif
 rm -f $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
 ln -s ../../etc/init.d/alsasound $RPM_BUILD_ROOT%{_sbindir}/rcalsasound
 rm -f $RPM_BUILD_ROOT%{_sbindir}/rcjoystick
diff --git a/set_default_volume b/set_default_volume
index 5579d95..d63db05 100644
--- a/set_default_volume
+++ b/set_default_volume
@@ -7,7 +7,7 @@
 # written by Takashi Iwai <tiwai@suse.de>
 #
 
-if [ -f /etc/asound.state -a x$1 != x-f ]; then
+if [ -f /var/lib/asound.state -a x$1 != x-f ]; then
   /usr/sbin/alsactl restore >/dev/null 2>&1
   exit 0
 fi