diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 2ac48b94..7ee7cd40 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -156,6 +156,7 @@ JSSRC= 				                 	\
 	qemu/SSHKey.js					\
 	qemu/IPConfigEdit.js				\
 	qemu/SystemEdit.js				\
+	qemu/AudioEdit.js				\
 	lxc/Summary.js					\
 	lxc/Network.js					\
 	lxc/Resources.js				\
diff --git a/www/manager6/qemu/AudioEdit.js b/www/manager6/qemu/AudioEdit.js
new file mode 100644
index 00000000..1e530a84
--- /dev/null
+++ b/www/manager6/qemu/AudioEdit.js
@@ -0,0 +1,65 @@
+Ext.define('PVE.qemu.AudioInputPanel', {
+    extend: 'Proxmox.panel.InputPanel',
+    xtype: 'pveAudioInputPanel',
+
+    onlineHelp: 'qm_audio_device',
+
+    onGetValues: function(values) {
+	var ret = PVE.Parser.printPropertyString(values);
+	if (ret === '') {
+	    return {
+		'delete': 'audio0'
+	    };
+	}
+	return {
+	    audio0: ret
+	};
+    },
+
+    items: [{
+	name: 'device',
+	xtype: 'proxmoxKVComboBox',
+	value: 'ich9-intel-hda',
+	fieldLabel: gettext('Audio Device'),
+	comboItems: [
+	    ['ich9-intel-hda', 'ich9-intel-hda'],
+	    ['intel-hda', 'intel-hda'],
+	    ['AC97', 'AC97']
+	]
+    }, {
+	name: 'driver',
+	xtype: 'displayfield',
+	value: 'spice',
+	submitValue: true,
+	fieldLabel: gettext('Backend Driver'),
+    }]
+});
+
+Ext.define('PVE.qemu.AudioEdit', {
+    extend: 'Proxmox.window.Edit',
+
+    vmconfig: undefined,
+
+    subject: gettext('Audio Device'),
+
+    items: [{
+	xtype: 'pveAudioInputPanel'
+    }],
+
+    initComponent : function() {
+	var me = this;
+
+	me.callParent();
+
+	me.load({
+	    success: function(response) {
+		me.vmconfig = response.result.data;
+
+		var audio0 = me.vmconfig.audio0;
+		if (audio0) {
+		    me.setValues(PVE.Parser.parsePropertyString(audio0));
+		}
+	    }
+	});
+    }
+});