diff --git a/includes/functions.php b/includes/functions.php
index b10a6a6ad..4cffec98e 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -99,7 +99,7 @@ function getHostOS($device)
   $dir_handle = @opendir($config['install_dir'] . "/includes/osdiscovery") or die("Unable to open $path");
   while ($file = readdir($dir_handle))
   {
-    if ( preg_match("/^discover-([a-z0-9\-]*).php$/", $file) )
+    if ( preg_match("/.php$/", $file) )
     {
       include($config['install_dir'] . "/includes/osdiscovery/" . $file);
     }
diff --git a/includes/osdiscovery/discover-3com.php b/includes/osdiscovery/3com.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-3com.php
rename to includes/osdiscovery/3com.inc.php
diff --git a/includes/osdiscovery/discover-airport.php b/includes/osdiscovery/airport.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-airport.php
rename to includes/osdiscovery/airport.inc.php
diff --git a/includes/osdiscovery/discover-akcp.php b/includes/osdiscovery/akcp.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-akcp.php
rename to includes/osdiscovery/akcp.inc.php
diff --git a/includes/osdiscovery/discover-allied.php b/includes/osdiscovery/allied.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-allied.php
rename to includes/osdiscovery/allied.inc.php
diff --git a/includes/osdiscovery/discover-apc.php b/includes/osdiscovery/apc.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-apc.php
rename to includes/osdiscovery/apc.inc.php
diff --git a/includes/osdiscovery/discover-areca.php b/includes/osdiscovery/areca.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-areca.php
rename to includes/osdiscovery/areca.inc.php
diff --git a/includes/osdiscovery/discover-asa.php b/includes/osdiscovery/asa.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-asa.php
rename to includes/osdiscovery/asa.inc.php
diff --git a/includes/osdiscovery/discover-axiscam.php b/includes/osdiscovery/axiscam.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-axiscam.php
rename to includes/osdiscovery/axiscam.inc.php
diff --git a/includes/osdiscovery/discover-axisdocserver.php b/includes/osdiscovery/axisdocserver.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-axisdocserver.php
rename to includes/osdiscovery/axisdocserver.inc.php
diff --git a/includes/osdiscovery/discover-bcm963.php b/includes/osdiscovery/bcm963.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-bcm963.php
rename to includes/osdiscovery/bcm963.inc.php
diff --git a/includes/osdiscovery/discover-brother.php b/includes/osdiscovery/brother.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-brother.php
rename to includes/osdiscovery/brother.inc.php
diff --git a/includes/osdiscovery/discover-cat1900.php b/includes/osdiscovery/cat1900.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-cat1900.php
rename to includes/osdiscovery/cat1900.inc.php
diff --git a/includes/osdiscovery/discover-catos.php b/includes/osdiscovery/catos.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-catos.php
rename to includes/osdiscovery/catos.inc.php
diff --git a/includes/osdiscovery/discover-dell-laser.php b/includes/osdiscovery/dell-laser.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-dell-laser.php
rename to includes/osdiscovery/dell-laser.inc.php
diff --git a/includes/osdiscovery/discover-dlink.php b/includes/osdiscovery/dlink.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-dlink.php
rename to includes/osdiscovery/dlink.inc.php
diff --git a/includes/osdiscovery/discover-dlinkap.php b/includes/osdiscovery/dlinkap.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-dlinkap.php
rename to includes/osdiscovery/dlinkap.inc.php
diff --git a/includes/osdiscovery/discover-drac.php b/includes/osdiscovery/drac.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-drac.php
rename to includes/osdiscovery/drac.inc.php
diff --git a/includes/osdiscovery/discover-extremeware.php b/includes/osdiscovery/extremeware.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-extremeware.php
rename to includes/osdiscovery/extremeware.inc.php
diff --git a/includes/osdiscovery/discover-fortigate.php b/includes/osdiscovery/fortigate.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-fortigate.php
rename to includes/osdiscovery/fortigate.inc.php
diff --git a/includes/osdiscovery/discover-freebsd.php b/includes/osdiscovery/freebsd.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-freebsd.php
rename to includes/osdiscovery/freebsd.inc.php
diff --git a/includes/osdiscovery/discover-gamatronicups.php b/includes/osdiscovery/gamatronicups.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-gamatronicups.php
rename to includes/osdiscovery/gamatronicups.inc.php
diff --git a/includes/osdiscovery/discover-ies.php b/includes/osdiscovery/ies.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-ies.php
rename to includes/osdiscovery/ies.inc.php
diff --git a/includes/osdiscovery/discover-ios.php b/includes/osdiscovery/ios.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-ios.php
rename to includes/osdiscovery/ios.inc.php
diff --git a/includes/osdiscovery/discover-ironware.php b/includes/osdiscovery/ironware.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-ironware.php
rename to includes/osdiscovery/ironware.inc.php
diff --git a/includes/osdiscovery/discover-jetdirect.php b/includes/osdiscovery/jetdirect.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-jetdirect.php
rename to includes/osdiscovery/jetdirect.inc.php
diff --git a/includes/osdiscovery/discover-junos.php b/includes/osdiscovery/junos.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-junos.php
rename to includes/osdiscovery/junos.inc.php
diff --git a/includes/osdiscovery/discover-junose.php b/includes/osdiscovery/junose.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-junose.php
rename to includes/osdiscovery/junose.inc.php
diff --git a/includes/osdiscovery/discover-konica.php b/includes/osdiscovery/konica.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-konica.php
rename to includes/osdiscovery/konica.inc.php
diff --git a/includes/osdiscovery/discover-kyocera.php b/includes/osdiscovery/kyocera.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-kyocera.php
rename to includes/osdiscovery/kyocera.inc.php
diff --git a/includes/osdiscovery/discover-linksys.php b/includes/osdiscovery/linksys.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-linksys.php
rename to includes/osdiscovery/linksys.inc.php
diff --git a/includes/osdiscovery/discover-linux.php b/includes/osdiscovery/linux.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-linux.php
rename to includes/osdiscovery/linux.inc.php
diff --git a/includes/osdiscovery/discover-m0n0wall.php b/includes/osdiscovery/m0n0wall.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-m0n0wall.php
rename to includes/osdiscovery/m0n0wall.inc.php
diff --git a/includes/osdiscovery/discover-mgepdu.php b/includes/osdiscovery/mgepdu.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-mgepdu.php
rename to includes/osdiscovery/mgepdu.inc.php
diff --git a/includes/osdiscovery/discover-mgeups.php b/includes/osdiscovery/mgeups.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-mgeups.php
rename to includes/osdiscovery/mgeups.inc.php
diff --git a/includes/osdiscovery/discover-netbsd.php b/includes/osdiscovery/netbsd.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-netbsd.php
rename to includes/osdiscovery/netbsd.inc.php
diff --git a/includes/osdiscovery/discover-netmanplus.php b/includes/osdiscovery/netmanplus.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-netmanplus.php
rename to includes/osdiscovery/netmanplus.inc.php
diff --git a/includes/osdiscovery/discover-netopia.php b/includes/osdiscovery/netopia.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-netopia.php
rename to includes/osdiscovery/netopia.inc.php
diff --git a/includes/osdiscovery/discover-netware.php b/includes/osdiscovery/netware.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-netware.php
rename to includes/osdiscovery/netware.inc.php
diff --git a/includes/osdiscovery/discover-nxos.php b/includes/osdiscovery/nxos.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-nxos.php
rename to includes/osdiscovery/nxos.inc.php
diff --git a/includes/osdiscovery/discover-openbsd.php b/includes/osdiscovery/openbsd.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-openbsd.php
rename to includes/osdiscovery/openbsd.inc.php
diff --git a/includes/osdiscovery/discover-papouch-tme.php b/includes/osdiscovery/papouch-tme.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-papouch-tme.php
rename to includes/osdiscovery/papouch-tme.inc.php
diff --git a/includes/osdiscovery/discover-powerconnect.php b/includes/osdiscovery/powerconnect.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-powerconnect.php
rename to includes/osdiscovery/powerconnect.inc.php
diff --git a/includes/osdiscovery/discover-powervault.php b/includes/osdiscovery/powervault.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-powervault.php
rename to includes/osdiscovery/powervault.inc.php
diff --git a/includes/osdiscovery/discover-prestige.php b/includes/osdiscovery/prestige.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-prestige.php
rename to includes/osdiscovery/prestige.inc.php
diff --git a/includes/osdiscovery/discover-procurve.php b/includes/osdiscovery/procurve.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-procurve.php
rename to includes/osdiscovery/procurve.inc.php
diff --git a/includes/osdiscovery/discover-radlan.php b/includes/osdiscovery/radlan.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-radlan.php
rename to includes/osdiscovery/radlan.inc.php
diff --git a/includes/osdiscovery/discover-redback.php b/includes/osdiscovery/redback.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-redback.php
rename to includes/osdiscovery/redback.inc.php
diff --git a/includes/osdiscovery/discover-ricoh.php b/includes/osdiscovery/ricoh.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-ricoh.php
rename to includes/osdiscovery/ricoh.inc.php
diff --git a/includes/osdiscovery/discover-routeros.php b/includes/osdiscovery/routeros.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-routeros.php
rename to includes/osdiscovery/routeros.inc.php
diff --git a/includes/osdiscovery/discover-screenos.php b/includes/osdiscovery/screenos.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-screenos.php
rename to includes/osdiscovery/screenos.inc.php
diff --git a/includes/osdiscovery/discover-solaris.php b/includes/osdiscovery/solaris.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-solaris.php
rename to includes/osdiscovery/solaris.inc.php
diff --git a/includes/osdiscovery/discover-sonicwall.php b/includes/osdiscovery/sonicwall.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-sonicwall.php
rename to includes/osdiscovery/sonicwall.inc.php
diff --git a/includes/osdiscovery/discover-speedtouch.php b/includes/osdiscovery/speedtouch.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-speedtouch.php
rename to includes/osdiscovery/speedtouch.inc.php
diff --git a/includes/osdiscovery/discover-windows.php b/includes/osdiscovery/windows.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-windows.php
rename to includes/osdiscovery/windows.inc.php
diff --git a/includes/osdiscovery/discover-xerox.php b/includes/osdiscovery/xerox.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-xerox.php
rename to includes/osdiscovery/xerox.inc.php
diff --git a/includes/osdiscovery/discover-zywall.php b/includes/osdiscovery/zywall.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-zywall.php
rename to includes/osdiscovery/zywall.inc.php
diff --git a/includes/osdiscovery/discover-zyxeles.php b/includes/osdiscovery/zyxeles.inc.php
similarity index 100%
rename from includes/osdiscovery/discover-zyxeles.php
rename to includes/osdiscovery/zyxeles.inc.php