diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 3dcc6d82..43b02ee4 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -4157,6 +4157,10 @@ sub restore_vma_archive {
 		my ($dev_id, $size, $devname) = ($1, $2, $3);
 		$devinfo->{$devname} = { size => $size, dev_id => $dev_id };
 	    } elsif ($line =~ m/^CTIME: /) {
+		# we correctly received the vma config, so we can disable 
+		# the timeout now for disk allocation (set to 10 minutes, so
+		# that we always timeout if something goes wrong)
+		alarm(600);
 		&$print_devmap();
 		print $fifofh "done\n";
 		my $tmp = $oldtimeout || 0;
diff --git a/changelog.Debian b/changelog.Debian
index abe67fd1..c0c3c87a 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -4,6 +4,8 @@ qemu-server (3.1-16) unstable; urgency=low
   
   * fix bug #510: move_disk - don't delete disk if used in a previous snasphot
 
+  * qmrestore: removed short timeout
+  
  -- Proxmox Support Team <support@proxmox.com>  Thu, 17 Apr 2014 09:29:26 +0200
 
 qemu-server (3.1-15) unstable; urgency=low