diff --git a/includes/discovery/os/solaris.inc.php b/includes/discovery/os/solaris.inc.php
index 17ded0274..6795b0dea 100755
--- a/includes/discovery/os/solaris.inc.php
+++ b/includes/discovery/os/solaris.inc.php
@@ -6,6 +6,9 @@ if(!$os) {
     $os = "solaris"; 
     list(,,$version) = explode (" ", $sysDescr);
     if($version > "5.10") { $os = "opensolaris"; }
+    if($version > "5.10") { 
+      if(preg_match("/oi_/", $sysDescr)) { $os = "openindiana"; }
+    }
   }
 }
 
diff --git a/includes/static-config.php b/includes/static-config.php
index 251c37393..fddeef3a8 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -63,6 +63,10 @@ $os = "opensolaris";
 $config['os'][$os]['group']		= "unix";
 $config['os'][$os]['text']		= "Sun OpenSolaris";
 
+$os = "openindiana";
+$config['os'][$os]['group']             = "unix";
+$config['os'][$os]['text']              = "OpenIndiana";
+
 $os = "ios";
 $config['os'][$os]['group']		= "ios";
 $config['os'][$os]['text']		= "Cisco IOS";