diff --git a/lib/msf/core/exploit/http/server.rb b/lib/msf/core/exploit/http/server.rb
index 59c58d9b83..612c736ab3 100644
--- a/lib/msf/core/exploit/http/server.rb
+++ b/lib/msf/core/exploit/http/server.rb
@@ -193,6 +193,12 @@ module Exploit::Remote::HttpServer
 				fp[:os_flavor] = 'Debian'
 			when /ubuntu/
 				fp[:os_flavor] = 'Ubuntu'
+			when /fedora/
+				fp[:os_flavor] = 'Fedora'
+			when /red hat|rhel/
+				fp[:os_flavor] = 'RHEL'
+			when /android/
+				fp[:os_flavor] = 'Android'
 			else
 				fp[:os_flavor] = ''
 		end
@@ -206,6 +212,8 @@ module Exploit::Remote::HttpServer
 				# in the useragent of 32-bit IE running on 64-bit
 				# Windows
 				fp[:arch] = ARCH_X86
+			when /android|iphone|ipod|ipad/
+				fp[:arch] = ARCH_ARMLE
 			else
 				fp[:arch] = ARCH_X86
 		end