diff --git a/Makefile b/Makefile
index df341834..a66fdd6d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.3
 
 VERSION=2.3
 PACKAGE=qemu-server
-PKGREL=6
+PKGREL=7
 
 DESTDIR=
 PREFIX=/usr
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 374cceb1..89aa1798 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3218,7 +3218,7 @@ sub vm_suspend {
 
 	my $conf = load_config($vmid);
 
-	check_lock($conf) if !$skiplock;
+	check_lock($conf) if !($skiplock || ($conf->{lock} && $conf->{lock} eq 'backup'));
 
 	vm_mon_cmd($vmid, "stop");
     });
@@ -3231,7 +3231,7 @@ sub vm_resume {
 
 	my $conf = load_config($vmid);
 
-	check_lock($conf) if !$skiplock;
+	check_lock($conf) if !($skiplock || ($conf->{lock} && $conf->{lock} eq 'backup'));
 
 	vm_mon_cmd($vmid, "cont");
     });
diff --git a/changelog.Debian b/changelog.Debian
index 9a8d99cb..f54c23b0 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+qemu-server (2.3-7) unstable; urgency=low
+
+  * allow to suspend/resume VM during backup
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 17 Jan 2013 10:25:17 +0100
+
 qemu-server (2.3-6) unstable; urgency=low
 
   * fix bug #315: cancel backup before stopping the VM