diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index daeaf3d9ba..fafbf466f8 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-17  Ramon Novoa  <rnovoa@artica.es>
+
+	* include/functions_netflow.php: Clean \r and \n from advanced
+	  filters.
+
 2012-01-17  Ramon Novoa  <rnovoa@artica.es>
 
 	* include/functions_graph.php, include/functions_netflow.php,
diff --git a/pandora_console/include/functions_netflow.php b/pandora_console/include/functions_netflow.php
index aaef8e9e01..fd8a6453a4 100644
--- a/pandora_console/include/functions_netflow.php
+++ b/pandora_console/include/functions_netflow.php
@@ -449,7 +449,7 @@ function netflow_get_command ($filter) {
 	// Advanced filter
 	$filter_args = '';
 	if ($filter['advanced_filter'] != '') {
-		$filter_args = preg_replace('/"/','', io_safe_output ($filter['advanced_filter']));
+		$filter_args = preg_replace('/["\r\n]/','', io_safe_output ($filter['advanced_filter']));
 		$command .= ' "(' . $filter_args . ')"';
 		return $command;
 	}