diff --git a/lib/msf/core/exploit/http.rb b/lib/msf/core/exploit/http.rb
index a71a1045a0..2f12818896 100644
--- a/lib/msf/core/exploit/http.rb
+++ b/lib/msf/core/exploit/http.rb
@@ -391,7 +391,7 @@ module Exploit::Remote::HttpServer
 	#
 	# Store the results of server-side User-Agent fingerprinting in the DB.
 	#
-	# Returns an array containing host and client information.
+	# Returns a Hash containing host and client information.
 	#
 	def report_user_agent(address, request)
 		ua = request['User-Agent'].downcase
@@ -472,9 +472,9 @@ module Exploit::Remote::HttpServer
 			:host      => address,
 			:os_name   => os_name,
 			:os_flavor => os_flavor,
-			:os_lang   => os_lang || 'en',
 			:arch      => arch
 		}
+		host[:os_lang] = os_lang if os_lang
 		report_host(host)
 		client = {
 			:host      => address,
@@ -488,7 +488,7 @@ module Exploit::Remote::HttpServer
 			:type => 'http_request',
 			:data => "#{address}: #{request.method} #{request.resource} #{os_name} #{ua_name} #{ua_ver}"
 		)
-		return [host, client]
+		return host.merge(client)
 	end
 
 	#