diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index d541fa3f34..ca2abcd2b4 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-08  Sancho Lerena <slerena@gmail.com>
+
+	* pandora_server: An event is generated if a BAD XML is detected.
+
 2008-07-06  Sancho Lerena <slerena@gmail.com>
 
         * pandora_network: Added a patch from godzone-nz, to implement
diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index c10f6ddb00..f5193d4e45 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -241,6 +241,10 @@ sub pandora_data_consumer ($$) {
 					delete($active_task_hash{$file_name});
 					delete($incomplete_task_hash{$file_name});
 					rename($file, $file . "_BADXML");
+
+                    # Create event
+                    pandora_event ($pa_config, "Unable to process XML data file ($file)", 0, 0, 0, 0, 0, 'error', $dbh);
+
 				}
 			}