diff --git a/centreon/plugins/wsman.pm b/centreon/plugins/wsman.pm
index f6b6c963e..cc61e9b3a 100644
--- a/centreon/plugins/wsman.pm
+++ b/centreon/plugins/wsman.pm
@@ -101,7 +101,7 @@ sub connect {
         $self->{output}->option_exit(exit_litteral => 'unknown');
     }
     
-    openwsman::set_debug(1) if (defined($self->{wsman_params}->{wsman_debug});
+    openwsman::set_debug(1) if (defined($self->{wsman_params}->{wsman_debug}));
     $self->{client} = new openwsman::Client::($self->{wsman_params}->{host}, $self->{wsman_params}->{wsman_port}, 
                                               $self->{wsman_params}->{wsman_path}, $self->{wsman_params}->{wsman_scheme},
                                               $self->{wsman_params}->{wsman_username}, $self->{wsman_params}->{wsman_password});
@@ -125,7 +125,7 @@ sub request {
     # $options{nothing_quit} = integer
     # $options{dont_quit} = integer
     # $options{uri} = string
-    # $options{wql_fitler} = string
+    # $options{wql_filter} = string
     # $options{result_type} = string ('array' or 'hash' with a key)
     # $options{hash_key} = string
     
@@ -136,7 +136,7 @@ sub request {
     
     ######
     # Check options
-    if (!defined($options{uri}) || !defined($options{wql_fitler})) {
+    if (!defined($options{uri}) || !defined($options{wql_filter})) {
         $self->{output}->add_option_msg(short_msg => 'Need to specify wql_filter and uri options');
         $self->{output}->option_exit(exit_litteral => $self->{wsman_errors_exit});
     }
@@ -167,7 +167,7 @@ sub request {
         $self->{output}->add_option_msg(short_msg => 'Could not create filter.');
         $self->{output}->option_exit(exit_litteral => $self->{wsman_errors_exit});
     }
-    $filter->wql($options{wql_fitler});
+    $filter->wql($options{wql_filter});
     
     my $result = $self->{client}->enumerate($client_options, $filter, $options{uri});
     unless($result && $result->is_fault eq 0) {
@@ -183,7 +183,7 @@ sub request {
 
     ######
     # Fetch values
-    my ($array_return, $hash_return)
+    my ($array_return, $hash_return);
     
     $array_return = [] if ($result_type eq 'array');
     $hash_return = {} if ($result_type eq 'hash');
@@ -318,10 +318,10 @@ wsman class
 
 =head1 WSMAN OPTIONS
 
-=over 8
-
 Need at least openwsman-perl version >= 2.3.0
 
+=over 8
+
 =item B<--hostname>
 
 Hostname to query (required).
@@ -380,4 +380,4 @@ Exit code for wsman Errors (default: unknown)
 
 B<wsman>.
 
-=cut
+=cut
\ No newline at end of file
diff --git a/os/windows/snmp/mode/memory.pm b/os/windows/snmp/mode/memory.pm
index 40334d2a1..03acfc070 100644
--- a/os/windows/snmp/mode/memory.pm
+++ b/os/windows/snmp/mode/memory.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package os::windows::mode::memory;
+package os::windows::snmp::mode::memory;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/os/windows/snmp/mode/service.pm b/os/windows/snmp/mode/service.pm
index 06f2bf91d..ebcba5249 100644
--- a/os/windows/snmp/mode/service.pm
+++ b/os/windows/snmp/mode/service.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package os::windows::mode::service;
+package os::windows::snmp::mode::service;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/os/windows/snmp/mode/swap.pm b/os/windows/snmp/mode/swap.pm
index 49a3e6ea1..779ed1253 100644
--- a/os/windows/snmp/mode/swap.pm
+++ b/os/windows/snmp/mode/swap.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package os::windows::mode::swap;
+package os::windows::snmp::mode::swap;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/os/windows/snmp/plugin.pm b/os/windows/snmp/plugin.pm
index 50b71cf20..bc8764bc5 100644
--- a/os/windows/snmp/plugin.pm
+++ b/os/windows/snmp/plugin.pm
@@ -33,7 +33,7 @@
 #
 ####################################################################################
 
-package os::windows::plugin;
+package os::windows::snmp::plugin;
 
 use strict;
 use warnings;
@@ -50,12 +50,12 @@ sub new {
                          'cpu' => 'snmp_standard::mode::cpu',
                          'list-interfaces' => 'snmp_standard::mode::listinterfaces',
                          'list-storages' => 'snmp_standard::mode::liststorages',
-                         'memory' => 'os::windows::mode::memory',
+                         'memory' => 'os::windows::snmp::mode::memory',
                          'packet-errors' => 'snmp_standard::mode::packeterrors',
                          'processcount' => 'snmp_standard::mode::processcount',
-                         'service' => 'os::windows::mode::service',
+                         'service' => 'os::windows::snmp::mode::service',
                          'storage' => 'snmp_standard::mode::storage',
-                         'swap' => 'os::windows::mode::swap',
+                         'swap' => 'os::windows::snmp::mode::swap',
                          'traffic' => 'snmp_standard::mode::traffic',
                          'uptime' => 'snmp_standard::mode::uptime',
                          );
diff --git a/os/windows/wsman/mode/listservices.pm b/os/windows/wsman/mode/listservices.pm
new file mode 100644
index 000000000..047e12383
--- /dev/null
+++ b/os/windows/wsman/mode/listservices.pm
@@ -0,0 +1,146 @@
+################################################################################
+# Copyright 2005-2014 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 os::windows::wsman::mode::listservices;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+
+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 =>
+                                {
+                                  "name:s"          => { name => 'name' },
+                                  "regexp"          => { name => 'use_regexp' },
+                                });
+
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+}
+
+sub manage_selection {
+    my ($self, %options) = @_;
+
+    $self->{result} = $self->{wsman}->request(uri => 'http://schemas.microsoft.com/wbem/wsman/1/wmi/root/cimv2/*',
+                                              wql_filter => 'Select Name, DisplayName, StartMode, State From Win32_Service',
+                                              result_type => 'hash',
+                                              hash_key => 'Name');
+    foreach my $name (sort(keys %{$self->{result}})) {
+        # Get all without a name
+        next if (!defined($self->{option_results}->{name}));
+        
+        next if (!defined($self->{option_results}->{use_regexp}) && $name eq $self->{option_results}->{name});
+        next if (defined($self->{option_results}->{use_regexp}) && $name =~ /$self->{option_results}->{name}/);
+        
+        delete $self->{result}->{$name};
+    }
+}
+
+sub run {
+    my ($self, %options) = @_;
+    # $options{wsman} = wsman object
+    $self->{wsman} = $options{wsman};
+
+    $self->manage_selection();
+    my $services_display = '';
+    my $services_display_append = '';
+    foreach my $name (sort(keys %{$self->{result}})) {
+
+        $services_display .= $services_display_append . 'name = ' . $name  . 
+                                '[DisplayName = ' . $self->{output}->to_utf8($self->{result}->{$name}->{DisplayName}) . ',' . 
+                                 'StartMode = ' . $self->{result}->{$name}->{StartMode} . ',' .
+                                 'State = ' . $self->{result}->{$name}->{State} .
+                                ']';
+        $services_display_append = ', ';
+    }
+    
+    $self->{output}->output_add(severity => 'OK',
+                                short_msg => 'List services: ' . $services_display);
+    $self->{output}->display(nolabel => 1);
+    $self->{output}->exit();
+}
+
+sub disco_format {
+    my ($self, %options) = @_;
+    
+    $self->{output}->add_disco_format(elements => ['name', 'display_name', 'start_mode', 'state']);
+}
+
+sub disco_show {
+    my ($self, %options) = @_;
+    # $options{wsman} = wsman object
+    $self->{wsman} = $options{wsman};
+
+    $self->manage_selection();
+    foreach my $name (sort(keys %{$self->{result}})) {     
+        $self->{output}->add_disco_entry(name => $name,
+                                         display_name => $self->{output}->to_utf8($self->{result}->{$name}->{DisplayName}),
+                                         start_mode => $self->{result}->{$name}->{StartMode},
+                                         state => $self->{result}->{$name}->{State}
+                                         );
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+List Windows Services.
+
+=over 8
+
+=item B<--name>
+
+Set the service name.
+
+=item B<--regexp>
+
+Allows to use regexp to filter service name (with option --name).
+
+=back
+
+=cut
\ No newline at end of file
diff --git a/os/windows/wsman/plugin.pm b/os/windows/wsman/plugin.pm
new file mode 100644
index 000000000..2a9150fe8
--- /dev/null
+++ b/os/windows/wsman/plugin.pm
@@ -0,0 +1,64 @@
+################################################################################
+# Copyright 2005-2014 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 os::windows::wsman::plugin;
+
+use strict;
+use warnings;
+use base qw(centreon::plugins::script_wsman);
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+    # $options->{options} = options object
+
+    $self->{version} = '0.1';
+    %{$self->{modes}} = (
+                         'list-services' => 'os::windows::wsman::mode::listservices',
+                         );
+
+    return $self;
+}
+
+1;
+
+__END__
+
+=head1 PLUGIN DESCRIPTION
+
+Check Windows operating systems through "WinRM" (ws-management protocol).
+
+=cut