diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index dcbb37e3..6d1083c4 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -234,7 +234,7 @@ my $confdesc = {
 	optional => 1,
 	type => 'string',
 	description => "scsi controller model",
-	enum => [qw(lsi virtio-scsi-pci megasas)],
+	enum => [qw(lsi virtio-scsi-pci megasas pvscsi)],
 	default => 'lsi',
     },
     description => {
diff --git a/changelog.Debian b/changelog.Debian
index 23273a86..d8e915cd 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -3,6 +3,9 @@ qemu-server (3.1-11) unstable; urgency=low
   * depend on pve-qemu-kvm >= 1.7-1
   
   * fix 'qm unlink' command syntax
+  
+  * add 'pvscsi' to the list of scsi controllers (emulate the VMware
+    PVSCSI device)
 
  -- Proxmox Support Team <support@proxmox.com>  Tue, 03 Dec 2013 10:48:33 +0100