diff --git a/core/main/client/os.js b/core/main/client/os.js
index 78c765dcd..0b6a7f72a 100644
--- a/core/main/client/os.js
+++ b/core/main/client/os.js
@@ -155,6 +155,10 @@ beef.os = {
 		return (this.ua.match('BeOS')) ? true : false;
 	},
 
+        isAros: function() {
+                return (this.ua.match('AROS')) ? true : false;
+        },
+
 	isWindows: function() {
 		return (this.ua.match('Windows')) ? true : false;
 	},
@@ -199,6 +203,7 @@ beef.os = {
 		if(this.isQNX()) return 'QNX';
 		if(this.isBeOS()) return 'BeOS';
 		if(this.isWebOS()) return 'webOS';
+		if(this.isAros()) return 'AROS';
 		
 		return 'unknown';
 	},
diff --git a/core/main/constants/os.rb b/core/main/constants/os.rb
index 70f7e513d..2d438db4a 100644
--- a/core/main/constants/os.rb
+++ b/core/main/constants/os.rb
@@ -30,6 +30,7 @@ module BeEF
         OS_IOS_IMG = 'ios.png'
         OS_IPHONE_UA_STR = 'iPhone'
         OS_WEBOS_UA_STR = 'webos.png'
+        OS_AROS_UA_STR = 'AROS'
         OS_IPHONE_IMG = 'iphone.jpg'
         OS_IPAD_UA_STR = 'iPad'
         OS_IPAD_IMG = 'ipad.png'
@@ -70,6 +71,8 @@ module BeEF
               OS_BLACKBERRY_UA_STR
             when /android/
               OS_ANDROID_UA_STR
+            when /aros/
+              OS_AROS_UA_STR
             else
               'ALL'
           end