diff --git a/includes/osdiscovery/discover-solaris.php b/includes/osdiscovery/discover-solaris.php
new file mode 100755
index 000000000..17ded0274
--- /dev/null
+++ b/includes/osdiscovery/discover-solaris.php
@@ -0,0 +1,12 @@
+<?php
+
+if(!$os) {
+  if(preg_match("/^SunOS/", $sysDescr)) 
+  { 
+    $os = "solaris"; 
+    list(,,$version) = explode (" ", $sysDescr);
+    if($version > "5.10") { $os = "opensolaris"; }
+  }
+}
+
+?>
diff --git a/includes/polling/device-unix.inc.php b/includes/polling/device-unix.inc.php
index 96d7096c7..0ae9c9af5 100755
--- a/includes/polling/device-unix.inc.php
+++ b/includes/polling/device-unix.inc.php
@@ -12,7 +12,7 @@
         $features = str_replace("(", "", $features);
         $features = str_replace(")", "", $features);
         list(,,$hardware) = explode ("$features", $sysDescr);
-      } elseif ($device['os'] == "openbsd") {
+      } elseif ($device['os'] == "openbsd" || $device['os'] == "solaris" || $device['os'] == "opensolaris") {
         list(,,$version,$features,$hardware) = explode (" ", $sysDescr);
         $features = str_replace("(", "", $features);
         $features = str_replace(")", "", $features);
@@ -37,5 +37,7 @@
         if(strpos($hw, "No") !== FALSE) { unset($hw); } else { $hardware = "Dell " . $hw; }
       }
 
+echo("$version - $hardware - $features ");
+
 include("ucd-mib.inc.php");
 include("hr-mib.inc.php");
diff --git a/includes/static-config.php b/includes/static-config.php
index ce61999b1..ab97fc005 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -24,6 +24,7 @@ $os_groups['openbsd']   = "unix";
 $os_groups['netbsd']    = "unix";
 $os_groups['dragonfly'] = "unix";
 $os_groups['solaris']   = "unix";
+$os_groups['opensolaris'] = "unix";
 
 $os_groups['iosxe']     = "ios";
 $os_groups['iosxr']     = "ios";
@@ -46,6 +47,8 @@ $os_text['freebsd']      = "FreeBSD";
 $os_text['openbsd']      = "OpenBSD";
 $os_text['netbsd']       = "NetBSD";
 $os_text['dragonflybsd'] = "DragonFlyBSD";
+$os_text['solaris']	 = "Sun Solaris";
+$os_text['opensolaris']  = "OpenSolaris";
 $os_text['powerconnect'] = "Dell PowerConnect";
 $os_text['windows']      = "Microsoft Windows";
 $os_text['junos']        = "Juniper JUNOS";