diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index 6e6e8046..327f4b3d 100644
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -1,3 +1,9 @@
+pve-manager (2.3-5) unstable; urgency=low
+
+  * Display 'Resume' button when VM is 'paused'
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 18 Jan 2013 06:23:06 +0100
+
 pve-manager (2.3-4) unstable; urgency=low
 
   * add balloon GUI (dynamic memory)
diff --git a/defines.mk b/defines.mk
index cc42c0f3..456d216d 100644
--- a/defines.mk
+++ b/defines.mk
@@ -2,7 +2,7 @@ RELEASE=2.3
 
 VERSION=2.3
 PACKAGE=pve-manager
-PACKAGERELEASE=4
+PACKAGERELEASE=5
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5
diff --git a/www/manager/qemu/Config.js b/www/manager/qemu/Config.js
index c5576879..4beb027f 100644
--- a/www/manager/qemu/Config.js
+++ b/www/manager/qemu/Config.js
@@ -34,7 +34,16 @@ Ext.define('PVE.qemu.Config', {
 	    });
 	};
 
-	var startBtn = Ext.create('Ext.Button', { 
+	var resumeBtn = Ext.create('Ext.Button', { 
+	    text: gettext('Resume'),
+	    disabled: !caps.vms['VM.PowerMgmt'],
+	    visible: false,
+	    handler: function() {
+		vm_command('resume');
+	    }			    
+	}); 
+
+ 	var startBtn = Ext.create('Ext.Button', { 
 	    text: gettext('Start'),
 	    disabled: !caps.vms['VM.PowerMgmt'],
 	    handler: function() {
@@ -114,7 +123,7 @@ Ext.define('PVE.qemu.Config', {
 	Ext.apply(me, {
 	    title: Ext.String.format(gettext("Virtual Machine {0} on node {1}"), descr, "'" + nodename + "'"),
 	    hstateid: 'kvmtab',
-	    tbar: [ startBtn, shutdownBtn, stopBtn, resetBtn, 
+	    tbar: [ resumeBtn, startBtn, shutdownBtn, stopBtn, resetBtn, 
 		    removeBtn, migrateBtn, consoleBtn ],
 	    defaults: { statusStore: me.statusStore },
 	    items: [
@@ -173,12 +182,24 @@ Ext.define('PVE.qemu.Config', {
 
         me.statusStore.on('load', function(s, records, success) {
 	    var status;
+	    var qmpstatus;
+
 	    if (!success) {
 		me.workspace.checkVmMigration(me.pveSelNode);
-		status = 'unknown';
+		status = qmpstatus = 'unknown';
 	    } else {
 		var rec = s.data.get('status');
 		status = rec ? rec.data.value : 'unknown';
+		rec = s.data.get('qmpstatus');
+		qmpstatus = rec ? rec.data.value : 'unknown';
+	    }
+
+	    if (qmpstatus === 'prelaunch' || qmpstatus === 'paused') {
+		startBtn.setVisible(false);
+		resumeBtn.setVisible(true)
+	    } else {
+		startBtn.setVisible(true);
+		resumeBtn.setVisible(false)
 	    }
 
 	    startBtn.setDisabled(!caps.vms['VM.PowerMgmt'] || status === 'running');