diff --git a/Makefile b/Makefile
index 52885166..0b1fd546 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=35
+PKGREL=36
 
 DESTDIR=
 PREFIX=/usr
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 80dc2b57..acaa84ce 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2132,6 +2132,11 @@ sub config_to_command {
 	    }
 	}
 
+	if ($ost eq 'win7' || $ost eq 'w2k8' || $ost eq 'wvista') {
+	    push @$cmd, '-no-kvm-pit-reinjection';
+	    push @$cmd, '-no-hpet';
+	}
+
 	# -tdf ?
 	# -no-acpi
 	# -no-kvm
diff --git a/changelog.Debian b/changelog.Debian
index a4e4f3c2..eda08430 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-36) unstable; urgency=low
+
+  * use '-no-kvm-pit-reinjection -no-hpet' for win7 and w2k8 guests.
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 05 Apr 2012 12:34:00 +0200
+
 qemu-server (2.0-35) unstable; urgency=low
 
   * fix bug #134: allow to pass file names to qmrestore and 'qm set'