diff --git a/Makefile b/Makefile
index 8cbc7ae..a832d46 100644
--- a/Makefile
+++ b/Makefile
@@ -19,19 +19,26 @@ rpms: rpms-dom0
 rpms-vm:
 	@true
 
-rpms-dom0:
+rpms-dom0: rpms-vaio-fixes
 	rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-dom0-linux.spec
 	rpm --addsign \
 		$(RPMS_DIR)/x86_64/qubes-core-dom0-linux-$(VERSION)*.rpm
 
+rpms-vaio-fixes:
+	rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-dom0-vaio-fixes.spec
+	rpm --addsign $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*.rpm
+
 update-repo-current:
 	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-linux-$(VERSION)*$(DIST_DOM0)*.rpm ../yum/current-release/current/dom0/rpm/
+	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*$(DIST_DOM0)*.rpm ../yum/current-release/current/dom0/rpm/
 
 update-repo-current-testing:
 	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-linux-$(VERSION)*$(DIST_DOM0)*.rpm ../yum/current-release/current-testing/dom0/rpm/
+	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*$(DIST_DOM0)*.rpm ../yum/current-release/current-testing/dom0/rpm/
 
 update-repo-unstable:
 	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-linux-$(VERSION)*$(DIST_DOM0)*.rpm ../yum/current-release/unstable/dom0/rpm/
+	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-vaio-fixes-$(VERSION_VAIO_FIXES)*$(DIST_DOM0)*.rpm ../yum/current-release/unstable/dom0/rpm/
 
 update-repo-installer:
 	ln -f $(RPMS_DIR)/x86_64/qubes-core-dom0-linux-*$(VERSION)*$(DIST_DOM0)*.rpm ../installer/yum/qubes-dom0/rpm/
diff --git a/rpm_spec/core-dom0-vaio-fixes.spec b/rpm_spec/core-dom0-vaio-fixes.spec
new file mode 100644
index 0000000..5b30dfc
--- /dev/null
+++ b/rpm_spec/core-dom0-vaio-fixes.spec
@@ -0,0 +1,32 @@
+%{!?version: %define version %(cat version_vaio_fixes)}
+
+Name:		qubes-core-dom0-vaio-fixes
+Version:	%{version}
+Release:	1%{?dist}
+Summary:    Additional scripts for supporting suspend on Vaio Z laptops
+Requires:   alsa-utils
+
+Group:		Qubes
+Vendor:		Invisible Things Lab
+License:	GPL
+URL:		http://www.qubes-os.org
+
+%define _builddir %(pwd)
+
+%description
+Additional scripts for supporting suspend on Vaio Z laptops.
+
+Due to broken Linux GPU drivers we need to do some additional actions during
+suspend/resume.
+
+%install
+mkdir -p $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/
+mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d/
+cp vaio-fixes/snd-hda-intel-sony-vaio.conf $RPM_BUILD_ROOT/etc/modprobe.d/
+
+%files
+/usr/lib64/pm-utils/sleep.d/00sony-vaio-audio
+/usr/lib64/pm-utils/sleep.d/99sony-vaio-audio
+/etc/modprobe.d/snd-hda-intel-sony-vaio.conf
diff --git a/vaio-fixes/00sony-vaio-audio b/vaio-fixes/00sony-vaio-audio
new file mode 100755
index 0000000..3900940
--- /dev/null
+++ b/vaio-fixes/00sony-vaio-audio
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+. "${PM_FUNCTIONS}"
+
+case "$1" in
+        thaw|resume) amixer sset Master 100;;
+        *) exit 0 ;;
+esac
diff --git a/vaio-fixes/99sony-vaio-audio b/vaio-fixes/99sony-vaio-audio
new file mode 100755
index 0000000..345bfc5
--- /dev/null
+++ b/vaio-fixes/99sony-vaio-audio
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+. "${PM_FUNCTIONS}"
+
+date
+
+case "$1" in
+        suspend) amixer sset Master 0;;
+        thaw|resume) amixer sset Master 0;;
+        *) exit 0 ;;
+esac
diff --git a/vaio-fixes/snd-hda-intel-sony-vaio.conf b/vaio-fixes/snd-hda-intel-sony-vaio.conf
new file mode 100644
index 0000000..9089bdd
--- /dev/null
+++ b/vaio-fixes/snd-hda-intel-sony-vaio.conf
@@ -0,0 +1 @@
+options snd-hda-intel model=sony-assamd
diff --git a/version_vaio_fixes b/version_vaio_fixes
new file mode 100644
index 0000000..9c6d629
--- /dev/null
+++ b/version_vaio_fixes
@@ -0,0 +1 @@
+1.6.1