diff --git a/core/main/client/os.js b/core/main/client/os.js
index ce25654de..fb89ab30e 100644
--- a/core/main/client/os.js
+++ b/core/main/client/os.js
@@ -182,9 +182,11 @@ beef.os = {
 		// Android
 		if(this.isAndroid()) return 'Android';
 
+		// SunOS
+		if(this.isSunOS()) return 'SunOS';
+
 		//Linux
 		if(this.isLinux()) return 'Linux';
-		if(this.isSunOS()) return 'Sun OS';
 
 		//iPhone
 		if (this.isIphone()) return 'iOS';
diff --git a/core/main/constants/os.rb b/core/main/constants/os.rb
index 86e900a8e..4f53a6321 100644
--- a/core/main/constants/os.rb
+++ b/core/main/constants/os.rb
@@ -20,6 +20,8 @@ module BeEF
         OS_MAC_IMG = 'mac.png'
         OS_QNX_UA_STR = 'QNX'
         OS_QNX_IMG = 'qnx.ico'
+        OS_SUNOS_UA_STR = 'SunOS'
+        OS_SUNOS_IMG = 'sunos.gif'
         OS_BEOS_UA_STR = 'BeOS'
         OS_BEOS_IMG = 'beos.png'
         OS_OPENBSD_UA_STR = 'OpenBSD'
@@ -54,6 +56,8 @@ module BeEF
               OS_MAC_UA_STR
             when /qnx/
               OS_QNX_UA_STR
+            when /sun/
+              OS_SUNOS_UA_STR
             when /beos/
               OS_BEOS_UA_STR
             when /openbsd/
diff --git a/core/main/models/browserdetails.rb b/core/main/models/browserdetails.rb
index 790d64564..3ffeedcc4 100644
--- a/core/main/models/browserdetails.rb
+++ b/core/main/models/browserdetails.rb
@@ -83,6 +83,7 @@ module Models
       return BeEF::Core::Constants::Os::OS_ANDROID_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_ANDROID_UA_STR
       return BeEF::Core::Constants::Os::OS_LINUX_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_LINUX_UA_STR
       return BeEF::Core::Constants::Os::OS_QNX_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_QNX_UA_STR
+      return BeEF::Core::Constants::Os::OS_SUNOS_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_SUNOS_UA_STR
       return BeEF::Core::Constants::Os::OS_BEOS_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_BEOS_UA_STR
       return BeEF::Core::Constants::Os::OS_OPENBSD_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_OPENBSD_UA_STR
       return BeEF::Core::Constants::Os::OS_WEBOS_IMG if ua_string.include? BeEF::Core::Constants::Os::OS_WEBOS_UA_STR
diff --git a/extensions/admin_ui/media/images/icons/sunos.gif b/extensions/admin_ui/media/images/icons/sunos.gif
new file mode 100644
index 000000000..f7e5c5303
Binary files /dev/null and b/extensions/admin_ui/media/images/icons/sunos.gif differ