diff --git a/Makefile b/Makefile
index feda0dbc..d561b56a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=qemu-server
-PKGREL=39
+PKGREL=40
 
 DESTDIR=
 PREFIX=/usr
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 58e52bc8..ad8dff1a 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -748,7 +748,7 @@ sub verify_media_type {
 
     my $etype;
     if ($media eq 'disk') {
-	$etype = 'image';
+	$etype = 'images';
     } elsif ($media eq 'cdrom') {
 	$etype = 'iso';
     } else {
diff --git a/changelog.Debian b/changelog.Debian
index 1e5449ff..dc8d4c23 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.0-40) unstable; urgency=low
+
+  * minor fixes for newer pve-storage versions
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 23 May 2012 07:23:31 +0200
+
 qemu-server (2.0-39) unstable; urgency=low
 
   * new startup option to define startup order.