diff --git a/pandora_server/.gitattributes b/pandora_server/.gitattributes
new file mode 100644
index 0000000000..0355a45341
--- /dev/null
+++ b/pandora_server/.gitattributes
@@ -0,0 +1,2 @@
+*.exe filter=lfs diff=lfs merge=lfs -text
+pandorawmic filter=lfs diff=lfs merge=lfs -text
diff --git a/pandora_server/bin/PandoraFMS b/pandora_server/bin/PandoraFMS
deleted file mode 100644
index 404b77b915..0000000000
--- a/pandora_server/bin/PandoraFMS
+++ /dev/null
@@ -1 +0,0 @@
-../lib/PandoraFMS
\ No newline at end of file
diff --git a/pandora_server/bin/pandora_exec.exe b/pandora_server/bin/pandora_exec.exe
index ecf68cdd26..f76bddee36 100644
Binary files a/pandora_server/bin/pandora_exec.exe and b/pandora_server/bin/pandora_exec.exe differ
diff --git a/pandora_server/bin/tentacle_server.exe b/pandora_server/bin/tentacle_server.exe
index 95e1e5325e..423348a7b8 100644
Binary files a/pandora_server/bin/tentacle_server.exe and b/pandora_server/bin/tentacle_server.exe differ
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index 3afb1b390e..0e6db75b54 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -256,6 +256,10 @@ wmi_timeout 7
 
 wmi_threads 1
 
+# WMI client binary (wmic by default).
+
+#wmi_client pandorawmic
+
 # recon_threads. Each thread will scan a different scantask.
 
 recon_threads 1
diff --git a/pandora_server/conf/pandora_server.conf.windows b/pandora_server/conf/pandora_server.conf.windows
index 0a2717793c..7bfc3ccb70 100644
--- a/pandora_server/conf/pandora_server.conf.windows
+++ b/pandora_server/conf/pandora_server.conf.windows
@@ -213,6 +213,10 @@ wmi_timeout 10
 
 wmi_threads 2
 
+# WMI client binary (wmic by default).
+
+#wmi_client pandorawmic.exe
+
 # recon_threads. Each thread will scan a different scantask.
 
 recon_threads 2
diff --git a/pandora_server/lib/PandoraFMS/WMIServer.pm b/pandora_server/lib/PandoraFMS/WMIServer.pm
index 1de5ba37c4..06d6a47292 100644
--- a/pandora_server/lib/PandoraFMS/WMIServer.pm
+++ b/pandora_server/lib/PandoraFMS/WMIServer.pm
@@ -53,7 +53,7 @@ sub new ($$;$) {
 	return undef unless $config->{'wmiserver'} == 1;
 
 	# Check for a WMI client
-	if (system ($config->{'wmi_client'} . " >$DEVNULL 2>&1") >> 8 != 1) {
+	if (system ($config->{'wmi_client'} . " >$DEVNULL 2>&1") >> 8 == 127) {
 		logger ($config, ' [E] ' . $config->{'wmi_client'} . " not found. " . $config->{'rb_product_name'} . " WMI Server needs a DCOM/WMI client.", 1);
 		print_message ($config, ' [E] ' . $config->{'wmi_client'} . " not found. " . $config->{'rb_product_name'} . " WMI Server needs a DCOM/WMI client.", 1);
 		return undef;
diff --git a/pandora_server/pandora_server_upgrade b/pandora_server/pandora_server_upgrade
index 2d905f5596..cb131a3dbb 100755
--- a/pandora_server/pandora_server_upgrade
+++ b/pandora_server/pandora_server_upgrade
@@ -31,8 +31,6 @@ install () {
 	cp -R util /usr/share/pandora_server
 	
 	echo "Rebuilding links /usr/local/bin -> /usr/bin"
-	#rm /usr/local/bin/pandora_server 2> /dev/null
-	#rm /usr/local/bin/pandora_exec 2> /dev/null
 	ln -s /usr/local/bin/pandora_server /usr/bin/pandora_server 2> /dev/null
 	ln -s /usr/local/bin/pandora_exec /usr/bin/pandora_exec 2> /dev/null