diff --git a/apps/protocols/http/mode/expectedcontent.pm b/apps/protocols/http/mode/expectedcontent.pm
index af92b7275..cc1d0d02e 100644
--- a/apps/protocols/http/mode/expectedcontent.pm
+++ b/apps/protocols/http/mode/expectedcontent.pm
@@ -69,30 +69,6 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::init(%options);
 
-    if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) {
-        $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'.");
-        $self->{output}->option_exit();
-    }
-    if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) {
-        $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'.");
-        $self->{output}->option_exit();
-    }
-    if (($self->{perfdata}->threshold_validate(label => 'warning-bytes', value => $self->{option_results}->{warning_bytes})) == 0) {
-        $self->{output}->add_option_msg(short_msg => "Wrong warning-bytes threshold '" . $self->{option_results}->{warning_bytes} . "'.");
-        $self->{output}->option_exit();
-    }
-    if (($self->{perfdata}->threshold_validate(label => 'critical-bytes', value => $self->{option_results}->{critical_bytes})) == 0) {
-        $self->{output}->add_option_msg(short_msg => "Wrong critical-bytes threshold '" . $self->{option_results}->{critical_bytes} . "'.");
-        $self->{output}->option_exit();
-    }
-    if (($self->{perfdata}->threshold_validate(label => 'warning-access', value => $self->{option_results}->{warning_access})) == 0) {
-        $self->{output}->add_option_msg(short_msg => "Wrong warning-access threshold '" . $self->{option_results}->{warning_access} . "'.");
-        $self->{output}->option_exit();
-    }
-    if (($self->{perfdata}->threshold_validate(label => 'critical-access', value => $self->{option_results}->{critical_access})) == 0) {
-        $self->{output}->add_option_msg(short_msg => "Wrong critical-access threshold '" . $self->{option_results}->{critical_access} . "'.");
-        $self->{output}->option_exit();
-    }
     if (!defined($self->{option_results}->{hostname})) {
         $self->{output}->add_option_msg(short_msg => "You need to specify hostname.");
         $self->{output}->option_exit();
@@ -123,15 +99,13 @@ sub run {
 
     if ($webcontent =~ /$self->{option_results}->{expected_string}/mi) {
         $self->{output}->output_add(severity => 'OK',
-                                short_msg => sprintf("'%s' is present in content.", $self->{option_results}->{expected_string}));
-        $self->{output}->display();
-        $self->{output}->exit();
+                                    short_msg => sprintf("'%s' is present in content.", $self->{option_results}->{expected_string}));
     } else {
-        $self->{output}->output_add(severity => 'Critical',
-                                short_msg => sprintf("'%s' is not present in content.", $self->{option_results}->{expected_string}));
-        $self->{output}->display();
-        $self->{output}->exit();
+        $self->{output}->output_add(severity => 'CRITICAL',
+                                    short_msg => sprintf("'%s' is not present in content.", $self->{option_results}->{expected_string}));
     }
+    $self->{output}->display();
+    $self->{output}->exit();
 }
 
 1;
diff --git a/apps/protocols/http/mode/responsetime.pm b/apps/protocols/http/mode/responsetime.pm
index b4455f40c..1e99b50ab 100644
--- a/apps/protocols/http/mode/responsetime.pm
+++ b/apps/protocols/http/mode/responsetime.pm
@@ -111,7 +111,7 @@ sub run {
     $self->{output}->output_add(long_msg => $webcontent);
     
     my $exit = $self->{perfdata}->threshold_check(value => $timeelapsed,
-                                                  threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
+                                                  threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
     $self->{output}->output_add(severity => $exit,
                                 short_msg => sprintf("Response time %.3fs", $timeelapsed));
     $self->{output}->perfdata_add(label => "time",
diff --git a/apps/protocols/http/mode/soapcontent.pm b/apps/protocols/http/mode/soapcontent.pm
new file mode 100644
index 000000000..1eb42d864
--- /dev/null
+++ b/apps/protocols/http/mode/soapcontent.pm
@@ -0,0 +1,389 @@
+###############################################################################
+# Copyright 2005-2013 MERETHIS
+# Centreon is developped by : Julien Mathis and Romain Le Merlus under
+# GPL Licence 2.0.
+# 
+# This program is free software; you can redistribute it and/or modify it under 
+# the terms of the GNU General Public License as published by the Free Software 
+# Foundation ; either version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with 
+# this program; if not, see <http://www.gnu.org/licenses>.
+# 
+# Linking this program statically or dynamically with other modules is making a 
+# combined work based on this program. Thus, the terms and conditions of the GNU 
+# General Public License cover the whole combination.
+# 
+# As a special exception, the copyright holders of this program give MERETHIS 
+# permission to link this program with independent modules to produce an timeelapsedutable, 
+# regardless of the license terms of these independent modules, and to copy and 
+# distribute the resulting timeelapsedutable under terms of MERETHIS choice, provided that 
+# MERETHIS also meet, for each linked independent module, the terms  and conditions 
+# of the license of that module. An independent module is a module which is not 
+# derived from this program. If you modify this program, you may extend this 
+# exception to your version of the program, but you are not obliged to do so. If you
+# do not wish to do so, delete this exception statement from your version.
+# 
+# For more information : contact@centreon.com
+# Author : Simon BOMM <sbomm@merethis.com>
+#
+# Based on De Bodt Lieven plugin
+####################################################################################
+
+package apps::protocols::http::mode::soapcontent;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use centreon::plugins::httplib;
+use XML::XPath;
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+            {
+            "service-soap:s"        => { name => 'service_soap' },
+            "data:s"                => { name => 'data' },
+            "lookup:s@"             => { name => 'lookup' },
+            "hostname:s"            => { name => 'hostname' },
+            "port:s"                => { name => 'port', },
+            "proto:s"               => { name => 'proto', default => "http" },
+            "urlpath:s"             => { name => 'url_path', default => "/" },
+            "credentials"           => { name => 'credentials' },
+            "ntlm"                  => { name => 'ntlm' },
+            "username:s"            => { name => 'username' },
+            "password:s"            => { name => 'password' },
+            "proxyurl:s"            => { name => 'proxyurl' },
+            "expected-string:s"     => { name => 'expected_string' },
+            "header:s@"             => { name => 'header' },
+            "timeout:s"             => { name => 'timeout', default => 10 },
+            
+            "warning:s"               => { name => 'warning' },
+            "critical:s"              => { name => 'critical' },
+            "threshold-value:s"       => { name => 'threshold_value', default => 'count' },
+            "format-ok:s"             => { name => 'format_ok', default => '%{count} element(s) finded' },
+            "format-warning:s"        => { name => 'format_warning', default => '%{count} element(s) finded' },
+            "format-critical:s"       => { name => 'format_critical', default => '%{count} element(s) finded' },
+            "values-separator:s"      => { name => 'values_separator', default => ', ' },
+            });
+    $self->{count} = 0;
+    $self->{count_ok} = 0;
+    $self->{count_warning} = 0;
+    $self->{count_critical} = 0;
+    $self->{values_ok} = [];
+    $self->{values_warning} = [];
+    $self->{values_critical} = [];
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+
+    if (!defined($self->{option_results}->{threshold_value}) || $self->{option_results}->{threshold_value} !~ /^(count|values)$/) {
+        $self->{option_results}->{threshold_value} = 'count';
+    }
+    if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) {
+       $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'.");
+       $self->{output}->option_exit();
+    }
+    if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) {
+       $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'.");
+       $self->{output}->option_exit();
+    }
+    if (!defined($self->{option_results}->{service_soap})) {
+        $self->{output}->add_option_msg(short_msg => "You need to specify service-soap.");
+        $self->{output}->option_exit();
+    }
+    if (!defined($self->{option_results}->{data})) {
+        $self->{output}->add_option_msg(short_msg => "You need to specify data.");
+        $self->{output}->option_exit();
+    }
+    if (!defined($self->{option_results}->{hostname})) {
+        $self->{output}->add_option_msg(short_msg => "You need to specify hostname.");
+        $self->{output}->option_exit();
+    }
+    if ((defined($self->{option_results}->{credentials})) && (!defined($self->{option_results}->{username}) || !defined($self->{option_results}->{password}))) {
+        $self->{output}->add_option_msg(short_msg => "You need to set --username= and --password= options when --credentials is used");
+        $self->{output}->option_exit();
+    }
+    if ((!defined($self->{option_results}->{credentials})) && (defined($self->{option_results}->{ntlm}))) {
+        $self->{output}->add_option_msg(short_msg => "--ntlm option must be used with --credentials option");
+        $self->{output}->option_exit();
+    }
+    $self->{headers} = {};
+    if (defined($self->{option_results}->{header})) {
+        foreach (@{$self->{option_results}->{header}}) {
+            if (/^(.*?):(.*)/) {
+                $self->{headers}->{$1} = $2;
+            }
+        }
+    }
+}
+
+sub load_request {
+    my ($self, %options) = @_;
+    
+    local $/ = undef;
+    if (!open(FILE, "<", $self->{option_results}->{data})) {
+        $self->{output}->output_add(severity => 'UNKNOWN',
+                                    short_msg => sprintf("Could not read file '%s': %s", $self->{option_results}->{data}, $!));
+        $self->{output}->display();
+        $self->{output}->exit();
+    }
+    $self->{soap_request} = <FILE>;
+    close FILE;
+}
+
+sub display_output {
+    my ($self, %options) = @_;
+    
+    foreach my $severity (('ok', 'warning', 'critical')) {
+        next if (scalar(@{$self->{'values_' . $severity}}) == 0);
+        my $format = $self->{option_results}->{'format_' . $severity};
+        while ($format =~ /%{(.*?)}/g) {
+            my $replace = '';
+            if (ref($self->{$1}) eq 'ARRAY') {
+                $replace = join($self->{option_results}->{values_separator}, @{$self->{$1}});
+            } else {
+                $replace = defined($self->{$1}) ? $self->{$1} : '';
+            }
+            $format =~ s/%{$1}/$replace/g;
+        }
+        $self->{output}->output_add(severity => $severity,
+                                    short_msg => $format);
+    }
+}
+
+sub lookup {
+    my ($self, %options) = @_;
+    my ($xpath, $nodeset);
+    
+    eval {
+        $xpath = XML::XPath->new(xml => $self->{soap_response});
+    };
+    if ($@) {
+        $self->{output}->add_option_msg(short_msg => "Cannot load SOAP response: $@");
+        $self->{output}->option_exit();
+    }
+    
+    foreach my $xpath_find (@{$self->{option_results}->{lookup}}) {
+        eval {
+            $nodeset = $xpath->find($xpath_find);
+        };
+        if ($@) {
+            $self->{output}->add_option_msg(short_msg => "Cannot lookup: $@");
+            $self->{output}->option_exit();
+        }
+        
+        $self->{output}->output_add(long_msg => "Lookup XPath $xpath_find:");
+        foreach my $node ($nodeset->get_nodelist()) {
+            $self->{count}++;
+            my $node_type = ref($node);
+            $self->{output}->output_add(long_msg => "   Node type: $node_type");
+            if ($node_type eq 'XML::XPath::Node::Text') {
+                $self->{output}->output_add(long_msg => '   Node value: ' . $node->string_value);
+                push @{$self->{values}}, $node->string_value;
+            }
+            if ($node_type eq 'XML::XPath::Node::Attribute') {
+                $self->{output}->output_add(long_msg => '   Node value: ' . $node->toString);
+                push @{$self->{values}}, $node->getNodeValue;
+            }
+        }
+    }
+    
+    if ($self->{option_results}->{threshold_value} eq 'count') {
+        my $exit = lc($self->{perfdata}->threshold_check(value => $self->{count}, 
+                                                         threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]));
+        push @{$self->{'values_' . $exit}}, $self->{count};
+        $self->{'count_' . $exit}++;
+    }
+    
+    $self->{output}->perfdata_add(label => 'count',
+                                  value => $self->{count},
+                                  warning => $self->{option_results}->{threshold_value} eq 'count' ? $self->{perfdata}->get_perfdata_for_output(label => 'warning') : undef,
+                                  critical => $self->{option_results}->{threshold_value} eq 'count' ? $self->{perfdata}->get_perfdata_for_output(label => 'critical') : undef,
+                                  min => 0);
+    
+    my $count = 0;
+    foreach my $value (@{$self->{values}}) {
+        $count++;
+        if ($value =~ /^[0-9.]+$/) {
+            if ($self->{option_results}->{threshold_value} eq 'values') {
+                my $exit = lc($self->{perfdata}->threshold_check(value => $value, 
+                                            threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]));
+                push @{$self->{'values_' . $exit}}, $value;
+                $self->{'count_' . $exit}++
+            }
+            $self->{output}->perfdata_add(label => 'element_' . $count,
+                                          value => $value,
+                                          warning => $self->{option_results}->{threshold_value} eq 'values' ? $self->{perfdata}->get_perfdata_for_output(label => 'warning') : undef,
+                                          critical => $self->{option_results}->{threshold_value} eq 'values' ? $self->{perfdata}->get_perfdata_for_output(label => 'critical') : undef);
+        }
+    }
+    
+    $self->display_output();
+}
+
+sub run {
+    my ($self, %options) = @_;
+
+    if (!defined($self->{option_results}->{port})) {
+        $self->{option_results}->{port} = centreon::plugins::httplib::get_port($self); 
+    }
+    $self->load_request();
+
+    #my $file = "/root/files/soap_response.xml";
+    #{
+    #    local $/ = undef;
+    #    open(FILE, "<", $file);
+    #    $self->{soap_response} = <FILE>;
+    #    close FILE;
+    #}
+    $self->{soap_response} = centreon::plugins::httplib::connect($self, headers => $self->{headers}, method => 'POST', query_form_post => $self->{soap_request});
+    $self->{output}->output_add(long_msg => $self->{soap_response});
+    if (!defined($self->{option_results}->{lookup}) || scalar(@{$self->{option_results}->{lookup}}) == 0) {
+        $self->{output}->output_add(severity => 'OK',
+                                    short_msg => "SOAP request success");
+    } else {
+        $self->lookup();
+    }
+    
+    $self->{output}->display();
+    $self->{output}->exit();
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check SOAP content. Send the soap request with option '--data'. Example:
+centreon_plugins.pl --plugin=apps::protocols::http::plugin --mode=soap-content --service-soap='http://www.mysite.com/mysoapaction' 
+--header='Content-Type: text/xml;charset=UTF-8' --data='/home/user/soap_request.xml' --hostname='myws.site.com' --urlpath='/get/payment'
+--lookup='//numeric/text()'
+
+SOAP OPTIONS:
+
+=over 8
+
+=item B<--service-soap>
+
+Service Soap Action (Required)
+
+=item B<--data>
+
+Set file with SOAP request (Required)
+
+=item B<--lookup>
+
+What to lookup in XML response (XPath string) (can be multiple)
+
+=back
+
+FORMAT OPTIONS:
+
+=over 8
+
+=item B<--format-ok>
+
+Output format (Default: '%{count} element(s) finded')
+Can used: 
+'%{values}' = display all values (also text string)
+'%{values_ok}' = values from attributes and text node only (seperated by option values-separator)
+'%{values_warning}' and '%{values_critical}'
+
+=item B<--format-warning>
+
+Output warning format (Default: %{count} element(s) finded')
+
+=item B<--format-critical>
+
+Output critical format (Default: %{count} element(s) finded')
+
+=item B<--values-separator>
+
+Separator used for values in format option (Default: ', ')
+
+=back
+
+THRESHOLD OPTIONS:
+
+=over 8
+
+=item B<--warning>
+
+Threshold warning (Default: on total matching elements)
+
+=item B<--critical>
+
+Threshold critical (Default: on total matching elements)
+
+=item B<--threshold-value>
+
+Which value to use (Default: 'count')
+Can be: 'values' (only check numeric values)
+
+=back
+
+HTTP OPTIONS:
+
+=over 8
+
+=item B<--hostname>
+
+IP Addr/FQDN of the Webserver host
+
+=item B<--port>
+
+Port used by Webserver
+
+=item B<--proxyurl>
+
+Proxy URL if any
+
+=item B<--proto>
+
+Specify https if needed
+
+=item B<--urlpath>
+
+Set path to get Webpage (Default: '/')
+
+=item B<--credentials>
+
+Specify this option if you access webpage over basic authentification
+
+=item B<--ntlm>
+
+Specify this option if you access webpage over ntlm authentification (Use with --credentials option)
+
+=item B<--username>
+
+Specify username for basic authentification (Mandatory if --credentials is specidied)
+
+=item B<--password>
+
+Specify password for basic authentification (Mandatory if --credentials is specidied)
+
+=item B<--timeout>
+
+Threshold for HTTP timeout (Default: 10)
+
+=item B<--header>
+
+Set HTTP headers (Multiple option)
+
+=back
+
+=cut
diff --git a/apps/protocols/http/plugin.pm b/apps/protocols/http/plugin.pm
index cf3e93e21..a8761635a 100644
--- a/apps/protocols/http/plugin.pm
+++ b/apps/protocols/http/plugin.pm
@@ -47,8 +47,9 @@ sub new {
 
 	$self->{version} = '0.1';
 	%{$self->{modes}} = (
-            'response-time'     => 'apps::protocols::http::mode::responsetime',
             'expected-content'  => 'apps::protocols::http::mode::expectedcontent',
+            'response-time'     => 'apps::protocols::http::mode::responsetime',
+            'soap-content'      => 'apps::protocols::http::mode::soapcontent',
 			);
 
 	return $self;
diff --git a/centreon/plugins/output.pm b/centreon/plugins/output.pm
index 325f91e27..f3b3e4bd1 100644
--- a/centreon/plugins/output.pm
+++ b/centreon/plugins/output.pm
@@ -54,6 +54,7 @@ sub new {
                                   "explode-perfdata-max:s@" => { name => 'explode_perfdata_max' },
                                   "range-perfdata:s"        => { name => 'range_perfdata' },
                                   "filter-perfdata:s"       => { name => 'filter_perfdata' },
+                                  "change-perfdata:s@"      => { name => 'change_perfdata' },
                                   "verbose"                 => { name => 'verbose' },
                                   "opt-exit:s"              => { name => 'opt_exit', default => 'unknown' },
                                   "output-xml"              => { name => 'output_xml' },
@@ -75,6 +76,7 @@ sub new {
     $self->{global_long_output} = [];
     $self->{perfdatas} = [];
     $self->{explode_perfdatas} = {};
+    $self->{change_perfdata} = {};
     $self->{explode_perfdata_total} = 0;
     $self->{range_perfdata} = 0;
     $self->{global_status} = 0;
@@ -132,6 +134,16 @@ sub check_options {
             }
         }
     }
+    
+    if (defined($self->{option_results}->{change_perfdata})) {
+        foreach (@{$self->{option_results}->{change_perfdata}}) {
+            if (! /^(.+?),(.+)$/) {
+                $self->add_option_msg(short_msg => "Wrong change-perfdata option '" . $_ . "' (syntax: match,substitute)");
+                $self->option_exit();
+            }
+            $self->{change_perfdata}->{$1} = $2;
+        }
+    }
 }
 
 sub add_option_msg {
@@ -183,7 +195,7 @@ sub output_add {
 
 sub perfdata_add {
     my ($self, %options) = @_;
-    my $perfdata = {'label' => '', 'value' => '', unit => '', warning => '', critical => '', min => '', max => ''}; 
+    my $perfdata = {label => '', value => '', unit => '', warning => '', critical => '', min => '', max => ''}; 
     foreach (keys %options) {
         next if (!defined($options{$_}));
         $perfdata->{$_} = $options{$_};
@@ -192,9 +204,20 @@ sub perfdata_add {
     push @{$self->{perfdatas}}, $perfdata;
 }
 
-sub explode_perfdatas {
+sub change_perfdatas {
     my ($self, %options) = @_;
     
+    if ($self->{option_results}->{change_perfdata}) {
+        foreach (@{$self->{perfdatas}}) {
+            foreach my $filter (keys %{$self->{change_perfdata}}) {
+                if ($_->{label} =~ /$filter/) {
+                    eval "\$_->{label} =~ s{$filter}{$self->{change_perfdata}->{$filter}}";
+                    last;
+                }
+            }
+        }
+    }
+    
     return if ($self->{explode_perfdata_total} == 0);
     foreach (@{$self->{perfdatas}}) {
         next if ($_->{max} eq '');
@@ -262,7 +285,7 @@ sub output_json {
     }
 
     if ($options{force_ignore_perfdata} == 0) {
-        $self->explode_perfdatas();
+        $self->change_perfdatas();
         foreach my $perf (@{$self->{perfdatas}}) {
             next if (defined($self->{option_results}->{filter_perfdata}) &&
                      $perf->{label} !~ /$self->{option_results}->{filter_perfdata}/);
@@ -350,7 +373,7 @@ sub output_xml {
     }
 
     if ($options{force_ignore_perfdata} == 0) {
-        $self->explode_perfdatas();
+        $self->change_perfdatas();
         foreach my $perf (@{$self->{perfdatas}}) {
             next if (defined($self->{option_results}->{filter_perfdata}) &&
                      $perf->{label} !~ /$self->{option_results}->{filter_perfdata}/);
@@ -396,7 +419,7 @@ sub output_txt {
         print "\n";
     } else {
         print "|";
-        $self->explode_perfdatas();
+        $self->change_perfdatas();
         foreach my $perf (@{$self->{perfdatas}}) {
             next if (defined($self->{option_results}->{filter_perfdata}) &&
                      $perf->{label} !~ /$self->{option_results}->{filter_perfdata}/);
@@ -738,7 +761,12 @@ Filter perfdata that match the regexp.
 =item B<--explode-perfdata-max>
 
 Put max perfdata (if it exist) in a specific perfdata 
-(without values: same with '_max' suffix)
+(without values: same with '_max' suffix) (Multiple options)
+
+=item B<--change-perfdata>
+
+Change perfdata name (Multiple option)
+Syntax: regexp_matching,regexp_substitute
 
 =item B<--range-perfdata>