diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 5ec18fa2e1..95e93dd858 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-24 Miguel de Dios <miguel.dedios@artica.es>
+	
+	* operation/events/sound_events.php, godmode/setup/setup.php: fixed
+	the audio, now it uses the html5 tag.
+	
+	Fixes: #3472957
+	
+	MERGED FROM 4.0.2
+
 2012-04-24 Miguel de Dios <miguel.dedios@artica.es>
 	
 	* install.php: cleaned source code style.
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index ae1b35a316..1a39e869eb 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -260,14 +260,14 @@ function toggleButton(type) {
 	}
 	else {
 		$("#button_sound_" + type).attr('src', 'images/control_pause.png');
-		$('#layer_sound_' + type).html("<embed src='" + $("#sound_" + type).val() + "' autostart='true' hidden='true' loop='true'>");
+		$('#layer_sound_' + type).html("<audio src='" + $("#sound_" + type).val() + "' autoplay='true' hidden='true' loop='true'>");
 	}
 }
 
 function replaySound(type) {
 	if ($("#button_sound_" + type).attr('src') == 'images/control_pause.png') {
 		$('#layer_sound_' + type).html("");
-		$('#layer_sound_' + type).html("<embed src='" + $("#sound_" + type).val() + "' autostart='true' hidden='true' loop='true'>");
+		$('#layer_sound_' + type).html("<audio src='" + $("#sound_" + type).val() + "' autoplay='true' hidden='true' loop='true'>");
 	}
 }
 
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index b50d368857..e399f02c45 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -122,12 +122,12 @@ function toggleButton() {
 function ok() {
 	fired = false;
 	$('body').css('background', 'white');
-	$('embed').remove();
+	$('audio').remove();
 }
 
 function stopSound() {
-	$('embed').remove();
-
+	$('audio').remove();
+	
 	$('body').css('background', 'white');
 	redBackground = false;
 	
@@ -179,7 +179,7 @@ function check_event() {
 						id_row = firedId;
 						fired = true;
 						$('embed').remove();
-						$('body').append("<embed src='../../" + data['sound'] + "' autostart='true' hidden='true' loop='true'>");
+						$('body').append("<audio src='../../" + data['sound'] + "' autoplay='true' hidden='true' loop='true'>");
 					}
 				},
 				"json"