diff --git a/apps/rrdcached/mode/stats.pm b/apps/rrdcached/mode/stats.pm
index 93a691851..e5d10b669 100644
--- a/apps/rrdcached/mode/stats.pm
+++ b/apps/rrdcached/mode/stats.pm
@@ -39,7 +39,7 @@ use base qw(centreon::plugins::mode);
 
 use strict;
 use warnings;
-use IO::Socket::UNIX;
+use IO::Socket;
 
 sub new {
     my ($class, %options) = @_;
@@ -49,10 +49,15 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-                                 "socket-path:s"    => { name => 'socket_path', default => '/var/rrdtool/rrdcached/rrdcached.sock' },
-                                 "warning:s"    => { name => 'warning', default => '3000' },
-                                 "critical:s"    => { name => 'critical', default => '5000' },
-                                 "timeout:s"    => { name => 'timeout', default => '10' },
+                                 "host:s"    => { name => 'host', default => '127.0.0.1' },
+                                 "port:s"    => { name => 'port', default => '42217' },
+                                 "unix-socket-path:s"    => { name => 'unix_socket_path', default => '/var/rrdtool/rrdcached/rrdcached.sock' },
+                                 "warning-update:s"    => { name => 'warning_update', default => '3000' },
+                                 "critical-update:s"    => { name => 'critical_update', default => '5000' },
+                                 "warning-queue:s"    => { name => 'warning_queue', default => '70' },
+                                 "critical-queue:s"    => { name => 'critical_queue', default => '100' },
+                                 "tcp"  => { name => 'tcp' },
+                                 "unix" => { name => 'unix' },
                                 });
     return $self;
 }
@@ -61,15 +66,30 @@ 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->{warning} . "'.");
+    if (($self->{perfdata}->threshold_validate(label => 'warning-update', value => $self->{option_results}->{warning_update})) == 0) {
+       $self->{output}->add_option_msg(short_msg => "Wrong warning-update threshold '" . $self->{warning} . "'.");
        $self->{output}->option_exit();
     }
-    if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) {
+    if (($self->{perfdata}->threshold_validate(label => 'critical-update', value => $self->{option_results}->{critical_update})) == 0) {
        $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{critical} . "'.");
        $self->{output}->option_exit();
     }
-
+    if (($self->{perfdata}->threshold_validate(label => 'warning-queue', value => $self->{option_results}->{warning_queue})) == 0) {
+       $self->{output}->add_option_msg(short_msg => "Wrong warning-queue threshold '" . $self->{warning} . "'.");
+       $self->{output}->option_exit();
+    }
+    if (($self->{perfdata}->threshold_validate(label => 'critical-queue', value => $self->{option_results}->{critical_queue})) == 0) {
+       $self->{output}->add_option_msg(short_msg => "Wrong critical-queue threshold '" . $self->{critical} . "'.");
+       $self->{output}->option_exit();
+    }
+    if ((defined($self->{option_results}->{tcp})) && (!defined($self->{option_results}->{host}) || !defined($self->{option_results}->{port}))) {
+        $self->{output}->add_option_msg(short_msg => "Please define host and port options when __tcp option is used");
+        $self->{output}->option_exit();
+    }
+    if ((defined($self->{option_results}->{unix})) && (!defined($self->{option_results}->{unix_socket_path}))) {
+        $self->{output}->add_option_msg(short_msg => "Please define host and port option when --unix option is used");
+        $self->{output}->option_exit();
+    }
 }
 
 sub run {
@@ -77,19 +97,32 @@ sub run {
     my $data;
     my @stat;
     my @tab;
-    my $queueLenght; 
-    my $SOCK_PATH = $self->{option_results}->{socket_path};
-    
-    if (-S $SOCK_PATH) {
+    my $queueLenght;
+    my $socket;
 
-        my $socket = IO::Socket::UNIX->new(
-            Type => SOCK_STREAM(),
-            Peer => $SOCK_PATH,
-        );
-    
-    
+    if (defined($self->{option_results}->{tcp})) {
+        $socket = IO::Socket::INET->new(
+        PeerHost => $self->{option_results}->{host},
+        PeerPort => $self->{option_results}->{port},
+        Proto => 'tcp',
+        ); 
+    } else {
+        my $SOCK_PATH = $self->{option_results}->{unix_socket_path};
+            $socket = IO::Socket::UNIX->new(
+                Type => SOCK_STREAM(),
+                Peer => $SOCK_PATH,
+            );
+    }
+
+    if (!defined($socket)) {
+        $self->{output}->output_add(severity => 'CRITICAL',
+                                    short_msg => "Can't connect to socket, is rrdcached running ? is your socket path/address:port correct ?");
+        $self->{output}->display();
+        $self->{output}->exit();
+    } else { 
+        
         $socket->send("STATS\n");
-    
+        
         while ($data = <$socket>) {
             if ($data =~ /(\d+) Statistics follow/) {
                 my $stats_number = $1;
@@ -100,7 +133,7 @@ sub run {
                     $self->{output}->exit();
                 }
             }    
-            next if $data !~ m/(^UpdatesR|Data)/;
+            next if $data !~ m/(^UpdatesR|Data|Queue)/;
             push @tab,$data;
             $socket->send("QUIT\n");
         } 
@@ -108,18 +141,28 @@ sub run {
         close($socket);
          
         foreach my $line (@tab) {
-           my ($key, $value) = split (/:\s*/, $line,2);
-           push @stat, $value;
-           $self->{output}->output_add(long_msg => sprintf("%s = %i", $key, $value));
+            my ($key, $value) = split (/:\s*/, $line,2);
+            push @stat, $value;
+            $self->{output}->output_add(long_msg => sprintf("%s = %i", $key, $value));
         }
-         
-        my $updatesNotWritten = $stat[0] - $stat[1];
-        
-        my $exit = $self->{perfdata}->threshold_check(value => $updatesNotWritten, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
-        
-        $self->{output}->output_add(severity => $exit,
-                                    short_msg => sprintf("RRDCached has %i updates waiting", $updatesNotWritten));
+        chomp($stat[0]);  
+        my $updatesNotWritten = $stat[1] - $stat[2];
+    
+    
+        my $exit1 = $self->{perfdata}->threshold_check(value => $updatesNotWritten, threshold => [ { label => 'critical-update', 'exit_litteral' => 'critical' }, { label => 'warning-update', exit_litteral => 'warning' } ]);
+        my $exit2 = $self->{perfdata}->threshold_check(value => $stat[0], threshold => [ { label => 'critical-queue', 'exit_litteral' => 'critical' }, { label => 'warning-queue', exit_litteral => 'warning' } ]);
 
+        my $exit = $self->{output}->get_most_critical(status => [ $exit1, $exit2 ]);
+
+        $self->{output}->output_add(severity => $exit,
+                                    short_msg => sprintf("RRDCached has %i updates waiting and %i node(s) in queue", $updatesNotWritten, $stat[0]));
+
+        $self->{output}->perfdata_add(label => 'QueueLenght', unit => 'nodes',
+                                      value => $stat[0],
+                                      warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
+                                      critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'),
+                                      min => 0);
+ 
         $self->{output}->perfdata_add(label => 'UpdatesWaiting', unit => 'updates',
                                       value => $updatesNotWritten,
                                       warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
@@ -128,14 +171,7 @@ sub run {
                       
         $self->{output}->display();
         $self->{output}->exit();
-    } else {
-        $self->{output}->output_add(severity => 'CRITICAL',
-                                    short_msg => "Can't connect to socket, is rrdcached running ? is your socket path correct ?");
-        $self->{output}->display();
-        $self->{output}->exit();
-
     }
-
 }
 
 1;
@@ -148,17 +184,41 @@ Check Updates cache of rrdcached daemon (compute delta between UpdatesReceived a
 
 =over 8
 
-=item B<--warning>
+=item B<--tcp>
 
-Warning number of cached RRD updates (One update can include several values)
+Specify this option if TCP socket is used
 
-=item B<--critical>
+=item B<--host>
 
-Critical number of cached RRD updates (One update can include several values)
+Host where the socket is (should be set if --tcp is used) (default: 127.0.0.1)
+
+=item B<--port>
+
+Port where the socket is listening (default: 42217)
+
+=item B<--unix>
+
+Specify this option if UNIX socket is used
 
 =item B<--socket-path>
 
-Path to the socket (default is /var/rrdtool/rrdcached/rrdcached.sock)
+Path to the socket (should be set if --unix is used) (default is /var/rrdtool/rrdcached/rrdcached.sock)
+
+=item B<--warning-update>
+
+Warning number of cached RRD updates (One update can include several values)
+
+=item B<--critical-update>
+
+Critical number of cached RRD updates (One update can include several values)
+
+=item B<--warning-queue>
+
+Warning number of nodes in rrdcached queue
+
+=item B<--critical-queue>
+
+Critical number of nodes in rrdcached queue
 
 =back