diff --git a/network/arkoon/mode/uptime.pm b/network/arkoon/mode/uptime.pm
deleted file mode 100644
index d4c1a08f2..000000000
--- a/network/arkoon/mode/uptime.pm
+++ /dev/null
@@ -1,122 +0,0 @@
-################################################################################
-# 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 executable, 
-# regardless of the license terms of these independent modules, and to copy and 
-# distribute the resulting executable 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
-# Authors : Quentin Garnier <qgarnier@merethis.com>
-#
-####################################################################################
-
-package network::arkoon::mode::uptime;
-
-use base qw(centreon::plugins::mode);
-
-use strict;
-use warnings;
-use POSIX;
-
-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 =>
-                                { 
-                                  "warning:s"          => { name => 'warning', },
-                                  "critical:s"         => { name => 'critical', },
-                                  "seconds"            => { name => 'seconds', },
-                                });
-
-    return $self;
-}
-
-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} . "'.");
-       $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->{critical} . "'.");
-       $self->{output}->option_exit();
-    }
-}
-
-sub run {
-    my ($self, %options) = @_;
-    # $options{snmp} = snmp object
-    $self->{snmp} = $options{snmp};
-    
-    my $oid_hrSystemUptime = '.1.3.6.1.2.1.1.3.0';
-    my $result = $self->{snmp}->get_leef(oids => [ $oid_hrSystemUptime ]);
-    
-    my $exit_code = $self->{perfdata}->threshold_check(value => floor($result->{$oid_hrSystemUptime} / 100), 
-                              threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);    
-    $self->{output}->perfdata_add(label => 'uptime',
-                                  value => floor($result->{$oid_hrSystemUptime} / 100),
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'),
-                                  min => 0);
-
-    $self->{output}->output_add(severity => $exit_code,
-                                short_msg => sprintf("System uptime is: %s", 
-                                    defined($self->{option_results}->{seconds}) ? floor($result->{$oid_hrSystemUptime} / 100) . " seconds" : floor($result->{$oid_hrSystemUptime} / 86400 / 100) . " days" ));
-
-    $self->{output}->display();
-    $self->{output}->exit();
-}
-
-1;
-
-__END__
-
-=head1 MODE
-
-Check system uptime.
-
-=over 8
-
-=item B<--warning>
-
-Threshold warning in seconds.
-
-=item B<--critical>
-
-Threshold critical in seconds.
-
-=item B<--seconds>
-
-Display uptime in seconds.
-
-=back
-
-=cut
diff --git a/network/arkoon/plugin.pm b/network/arkoon/plugin.pm
index 3eb0cd6d9..daa4d0e4f 100644
--- a/network/arkoon/plugin.pm
+++ b/network/arkoon/plugin.pm
@@ -47,14 +47,15 @@ sub new {
 
     $self->{version} = '1.0';
     %{$self->{modes}} = (
-                         'load' => 'snmp_standard::mode::loadaverage',
-                         'memory' => 'snmp_standard::mode::memory',
-                         'swap' => 'snmp_standard::mode::swap',
-                         'inodes' => 'snmp_standard::mode::inodes',
-                         'processcount' => 'snmp_standard::mode::processcount',
-                         'list-interfaces' => 'snmp_standard::mode::listinterfaces',
-                         'packet-errors' => 'snmp_standard::mode::packeterrors',
-                         'traffic' => 'snmp_standard::mode::traffic',
+                         'load'             => 'snmp_standard::mode::loadaverage',
+                         'memory'           => 'snmp_standard::mode::memory',
+                         'swap'             => 'snmp_standard::mode::swap',
+                         'inodes'           => 'snmp_standard::mode::inodes',
+                         'processcount'     => 'snmp_standard::mode::processcount',
+                         'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
+                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
+                         'traffic'          => 'snmp_standard::mode::traffic',
+                         'uptime'           => 'snmp_standard::mode::uptime',
                          );
 
     return $self;
diff --git a/snmp_standard/mode/uptime.pm b/snmp_standard/mode/uptime.pm
index 40af050aa..25c6c95d2 100644
--- a/snmp_standard/mode/uptime.pm
+++ b/snmp_standard/mode/uptime.pm
@@ -52,6 +52,7 @@ sub new {
                                   "warning:s"          => { name => 'warning', },
                                   "critical:s"         => { name => 'critical', },
                                   "seconds"            => { name => 'seconds', },
+                                  "force-oid:s"        => { name => 'force_oid', },
                                 });
 
     return $self;
@@ -76,20 +77,35 @@ sub run {
     # $options{snmp} = snmp object
     $self->{snmp} = $options{snmp};
     
+    # To be used first for OS
     my $oid_hrSystemUptime = '.1.3.6.1.2.1.25.1.1.0';
-    my $result = $self->{snmp}->get_leef(oids => [ $oid_hrSystemUptime ]);
+    # For network equipment or others
+    my $oid_sysUpTime = '.1.3.6.1.2.1.1.3.0';
+    my ($result, $value);
     
-    my $exit_code = $self->{perfdata}->threshold_check(value => floor($result->{$oid_hrSystemUptime} / 100), 
+    if (defined($self->{option_results}->{force_oid})) {
+        $result = $self->{snmp}->get_leef(oids => [ $self->{option_results}->{force_oid} ], nothing_quit => 1);
+        $value = $result->{$self->{option_results}->{force_oid}};
+    } else {
+        $result = $self->{snmp}->get_leef(oids => [ $oid_hrSystemUptime, $oid_sysUpTime ], nothing_quit => 1);
+        if (defined($result->{$oid_hrSystemUptime})) {
+            $value = $result->{$oid_hrSystemUptime};
+        } else {
+            $value = $result->{$oid_sysUpTime};
+        }
+    }
+    
+    my $exit_code = $self->{perfdata}->threshold_check(value => floor($value / 100), 
                               threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);    
     $self->{output}->perfdata_add(label => 'uptime',
-                                  value => floor($result->{$oid_hrSystemUptime} / 100),
+                                  value => floor($value / 100),
                                   warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
                                   critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'),
                                   min => 0);
 
     $self->{output}->output_add(severity => $exit_code,
                                 short_msg => sprintf("System uptime is: %s", 
-                                    defined($self->{option_results}->{seconds}) ? floor($result->{$oid_hrSystemUptime} / 100) . " seconds" : floor($result->{$oid_hrSystemUptime} / 86400 / 100) . " days" ));
+                                    defined($self->{option_results}->{seconds}) ? floor($value / 100) . " seconds" : floor($result->{$value / 86400 / 100) . " days" ));
 
     $self->{output}->display();
     $self->{output}->exit();
@@ -117,6 +133,10 @@ Threshold critical in seconds.
 
 Display uptime in seconds.
 
+=item B<--force-oid>
+
+Can choose your oid (numeric format only).
+
 =back
 
 =cut