diff --git a/dom0/init.d/qubes_setupdvm b/dom0/init.d/qubes_setupdvm
index 5ff768f2..26390536 100755
--- a/dom0/init.d/qubes_setupdvm
+++ b/dom0/init.d/qubes_setupdvm
@@ -30,7 +30,7 @@ start()
     else
         mkdir -m 770 /dev/shm/qubes
         chown root.qubes /dev/shm/qubes
-        cp $DEFAULT /dev/shm/qubes/current_savefile
+        cp -a $(readlink $DEFAULT) /dev/shm/qubes/current_savefile
         chown root.qubes /dev/shm/qubes/current_savefile
         chmod 660 /dev/shm/qubes/current_savefile
         ln -s /dev/shm/qubes/current_savefile /var/run/qubes/current_savefile
diff --git a/dom0/restore/qfile-daemon-dvm b/dom0/restore/qfile-daemon-dvm
index 9cfa629e..6a41db24 100755
--- a/dom0/restore/qfile-daemon-dvm
+++ b/dom0/restore/qfile-daemon-dvm
@@ -102,7 +102,7 @@ class QfileDaemonDvm:
 
     def get_dvm(self):
         if not self.dvm_setup_ok():
-            self.tray_notify("Updating DisposableVM savefile, please wait")
+            self.tray_notify("Updating DisposableVM savefile, please wait", 120000)
             if os.system("qvm-create-default-dvm --default-template --default-script >/var/run/qubes/qvm-create-default-dvm.stdout </dev/null" ) != 0:
                 self.tray_notify_error("DVM savefile creation failed")
                 return None 
diff --git a/dom0/vaio_fixes/snd-hda-intel-sony-vaio.conf b/dom0/vaio_fixes/snd-hda-intel-sony-vaio.conf
new file mode 100644
index 00000000..9089bddc
--- /dev/null
+++ b/dom0/vaio_fixes/snd-hda-intel-sony-vaio.conf
@@ -0,0 +1 @@
+options snd-hda-intel model=sony-assamd
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index d3aefce6..31e73115 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -131,6 +131,8 @@ cp pm-utils/02qubes-pause-vms $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/
 cp vaio_fixes/00sony-vaio-audio $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/
 cp vaio_fixes/99sony-vaio-audio $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/
 cp vaio_fixes/01sony-vaio-display $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/
+mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d/
+cp vaio_fixes/snd-hda-intel-sony-vaio.conf $RPM_BUILD_ROOT/etc/modprobe.d/
 
 mkdir -p $RPM_BUILD_ROOT/var/log/qubes
 mkdir -p $RPM_BUILD_ROOT/var/run/qubes
@@ -160,9 +162,9 @@ chkconfig --add qubes_core || echo "WARNING: Cannot add service qubes_core!"
 chkconfig --add qubes_netvm || echo "WARNING: Cannot add service qubes_netvm!"
 chkconfig --add qubes_setupdvm || echo "WARNING: Cannot add service qubes_setupdvm!"
 
-chkconfig qubes_core on || echo "WARNING: Cannot enable service qubes_core!"
-chkconfig qubes_netvm on || echo "WARNING: Cannot enable service qubes_netvm!"
-chkconfig qubes_setupdvm on || echo "WARNING: Cannot enable service qubes_setupdvm!"
+chkconfig --level 5 qubes_core on || echo "WARNING: Cannot enable service qubes_core!"
+chkconfig --level 5 qubes_netvm on || echo "WARNING: Cannot enable service qubes_netvm!"
+chkconfig --level 5 qubes_setupdvm on || echo "WARNING: Cannot enable service qubes_setupdvm!"
 
 HAD_SYSCONFIG_NETWORK=yes
 if ! [ -e /etc/sysconfig/network ]; then
@@ -317,3 +319,4 @@ suspend/resume.
 /usr/lib64/pm-utils/sleep.d/00sony-vaio-audio
 /usr/lib64/pm-utils/sleep.d/99sony-vaio-audio
 /usr/lib64/pm-utils/sleep.d/01sony-vaio-display
+/etc/modprobe.d/snd-hda-intel-sony-vaio.conf
diff --git a/version_dom0 b/version_dom0
index a7ccabdb..d532fd93 100644
--- a/version_dom0
+++ b/version_dom0
@@ -1 +1 @@
-1.5.20
+1.5.22
diff --git a/version_vm b/version_vm
index f6ed4357..07a45d78 100644
--- a/version_vm
+++ b/version_vm
@@ -1 +1 @@
-1.5.15
+1.5.21