diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 91024dea22..e302c66259 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -7667,14 +7667,14 @@ function api_set_alert_actions($id, $id2, $other, $trash1) {
 
 /**
  * Create a new alert command
- * @param $id as command name
- *  other=<serialized_parameters> (optional). Are the following in this order:
+ * @param $id as command name  (optional)
+ *  other=<serialized_parameters> (mandatory). Are the following in this order:
  *	<name>
- *	<command>
- *	<id_group>
- *	<description>
- *	<internal>
- *	<field_description_1><field_value_1><field_description_2><field_value_2>...<field_description_n><field_value_n>
+ *	<command> (mandatory)
+ *	<id_group> (optional)
+ *	<description> (optional)
+ *	<internal> (optional)
+ *	<field_description_1><field_value_1><field_description_2><field_value_2>...<field_description_n><field_value_n> (optional)
 
  example:
 
@@ -7684,7 +7684,9 @@ function api_set_alert_commands($id, $thrash2, $other, $trash1) {
 	global $config;
 
 	$command = $other['data'][0];
-	$id_group = $other['data'][1];
+	$id_group = 0;
+	if ($other['data'][1] != '')
+		$id_group = $other['data'][1];
 	$description = $other['data'][2];
 	$internal = $other['data'][3];
 
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index bcb08a23ae..d2045ae89a 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -163,6 +163,7 @@ our @EXPORT = qw(
 	pandora_add_agent_address
 	pandora_audit
 	pandora_create_agent
+	pandora_create_alert_command
 	pandora_create_group
 	pandora_create_incident
 	pandora_create_module
@@ -2681,6 +2682,23 @@ sub pandora_delete_all_template_module_actions ($$) {
 	return db_do ($dbh, 'DELETE FROM talert_template_module_actions WHERE id_alert_template_module = ?', $template_module_id);
 }
 
+########################################################################
+=head2 C<< pandora_create_alert_command(I<$pa_config>, I<$parameters>, I<$dbh>) >>
+
+Create a alert command.
+
+=cut
+########################################################################
+sub pandora_create_alert_command ($$$) {
+	my ($pa_config, $parameters, $dbh) = @_;
+	
+	logger($pa_config, "Creating alert command '$parameters->{'name'}'.", 10);
+	
+	my $command_id = db_process_insert($dbh, 'id', 'talert_commands', $parameters);
+	
+	return $command_id;
+}
+
 ########################################################################
 =head2 C<< pandora_update_agent_address(I<$pa_config>, I<$agent_id>, I<$address>, I<$dbh>) >>
 
diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm
index dc0622c98b..20bece94e6 100644
--- a/pandora_server/lib/PandoraFMS/DB.pm
+++ b/pandora_server/lib/PandoraFMS/DB.pm
@@ -62,6 +62,7 @@ our @EXPORT = qw(
 		get_agent_module_id
 		get_alert_template_module_id
 		get_alert_template_name
+		get_command_id
 		get_db_rows
 		get_db_rows_limit
 		get_db_single_row
@@ -209,6 +210,16 @@ sub get_action_id ($$) {
 	return defined ($rc) ? $rc : -1;
 }
 
+########################################################################
+## Return command ID given the command name.
+########################################################################
+sub get_command_id ($$) {
+	my ($dbh, $command_name) = @_;
+
+	my $rc = get_db_value ($dbh, "SELECT id FROM talert_commands WHERE name = ?", safe_input($command_name));
+	return defined ($rc) ? $rc : -1;
+}
+
 ########################################################################
 ## Return agent ID given the agent name.
 ########################################################################
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 0fe2d44eaf..4586d5cc86 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -162,6 +162,8 @@ sub help_screen{
 	help_screen_line('--enable_alerts', '', 'Enable alerts in all groups (system wide)');
 	help_screen_line('--create_alert_template', "<template_name> <condition_type_serialized>\n\t   <time_from> <time_to> [<description> <group_name> <field1> <field2> \n\t  <field3> <priority>  <default_action> <days> <time_threshold> <min_alerts> \n\t  <max_alerts> <alert_recovery> <field2_recovery> <field3_recovery> \n\t  <condition_type_separator>]", 'Create alert template');
 	help_screen_line('--delete_alert_template', '<template_name>', 'Delete alert template');
+	help_screen_line('--create_alert_command', "<command_name> <comand> [<id_group> <description> \n\t <internal> <fields_descriptions> <fields_values>", 'Create alert command');
+	help_screen_line('--get_alert_commands', "[<command_name> <comand> <id_group> <description> \n\t <internal>]", 'Displays all alert commands');
 	help_screen_line('--update_alert_template', "<template_name> <field_to_change> \n\t  <new_value>", 'Update a field of an alert template');
 	help_screen_line('--validate_all_alerts', '', 'Validate all the alerts');
 	help_screen_line('--create_special_day', "<special_day> <same_day> <description> <group>", 'Create special day');
@@ -3020,6 +3022,100 @@ sub cli_delete_alert_template() {
 	exist_check($result,'alert template',$template_name);
 }
 
+##############################################################################
+# Add alert command.
+# Related option: --create_alert_command
+##############################################################################
+
+sub cli_create_alert_command() {
+	my ($command_name,$command,$group_name,$description,$internal,$fields_descriptions,$fields_values) = @ARGV[2..8];
+	
+	print_log "[INFO] Adding command '$command_name'\n\n";
+	
+	my $command_id = get_command_id($dbh,$command_name);
+	non_exist_check($command_id,'command',$command_name);
+	
+	my $id_group;
+	
+	if (! $group_name || $group_name eq "All") {
+		$id_group = 0;
+	}
+	else {
+		$id_group = get_group_id($dbh,$group_name);
+		exist_check($id_group,'group',$group_name);
+	}
+	
+	my %parameters;						
+	
+	$parameters{'name'} = $command_name;
+	$parameters{'command'} = $command;
+	$parameters{'id_group'} = $id_group;
+	$parameters{'description'} = $description;
+	$parameters{'internal'} = $internal;
+	$parameters{'fields_descriptions'} = $fields_descriptions;
+	$parameters{'fields_values'} = $fields_values;
+	
+	pandora_create_alert_command ($conf, \%parameters, $dbh);
+}
+
+##############################################################################
+# Show all the alert commands (without parameters) or the alert commands with a filter parameters
+# Related option: --get_alert_commands
+##############################################################################
+
+sub cli_get_alert_commands() {
+	my ($command_name, $command, $group_name, $description, $internal) = @ARGV[2..6];
+
+	my $id_group;
+	my $condition = ' 1=1 ';
+
+	if($command_name ne '') {
+		my $name = safe_input ($command_name);		
+		$condition .= " AND name LIKE '%$name%' ";
+	}
+	
+	if($command ne '') {
+		$condition .= " AND command LIKE '%$command%' ";
+	}
+
+	if($group_name ne '') {
+		$id_group = get_group_id($dbh, $group_name);
+		exist_check($id_group,'group',$group_name);
+		
+		$condition .= " AND id_grupo = $id_group ";
+	}
+	
+	if($description ne '') {
+		$condition .= " AND description LIKE '%$description%' ";
+	}
+
+	if($internal ne '') {
+		$condition .= " AND internal = $internal ";
+	}
+
+	my @alert_command = get_db_rows ($dbh, "SELECT * FROM talert_commands WHERE $condition");	
+
+	if(scalar(@alert_command) == 0) {
+		print_log "[INFO] No commands found\n\n";
+		exit;
+	}
+
+	my $head_print = 0;
+	foreach my $commands (@alert_command) {
+
+		if($head_print == 0) {
+			$head_print = 1;
+			print "id_command, command_name\n";
+		}
+		print $commands->{'id'}.",".safe_output($commands->{'name'})."\n";
+	}
+
+	if($head_print == 0) {
+		print_log "[INFO] No commands found\n\n";
+	}
+
+}
+
 ##############################################################################
 # Add profile.
 # Related option: --add_profile
@@ -5885,9 +5981,17 @@ sub pandora_manage_main ($$$) {
 			cli_create_alert_template();
 		}
 		elsif ($param eq '--delete_alert_template') {
-			param_check($ltotal, 1);
+			param_check($ltotal, 7);
 			cli_delete_alert_template();
 		}
+		elsif ($param eq '--create_alert_command') {
+			param_check($ltotal, 7, 2);
+			cli_create_alert_command();
+		}
+		elsif ($param eq '--get_alert_commands') {
+			param_check($ltotal, 5, 5);
+			cli_get_alert_commands();
+		}
 		elsif ($param eq '--update_alert_template') {
 			param_check($ltotal, 3);
 			cli_alert_template_update();