diff --git a/core/filters/browser.rb b/core/filters/browser.rb
index d184648de..ff58ebae3 100644
--- a/core/filters/browser.rb
+++ b/core/filters/browser.rb
@@ -91,8 +91,9 @@ module Filters
   # verify the browser_plugins string is valid
   def self.is_valid_browser_plugins?(str)
     # this string can be empty if there are no browser plugins
+    #print_debug(str)
     return true if not is_non_empty_string?(str)
-    return false if str.length > 400
+    return false if str.length > 1000
     if RUBY_VERSION >= "1.9" && str.encoding === Encoding.find('UTF-8')
       return (str =~ /[^\w\d\s()-.,;_!\302\256]/u).nil?
     else
diff --git a/core/main/client/browser.js b/core/main/client/browser.js
index 14730d4c3..c897eb917 100644
--- a/core/main/client/browser.js
+++ b/core/main/client/browser.js
@@ -424,8 +424,13 @@ beef.browser = {
                 for (var i=0; i < length; i++)
                 {
                     if (i != 0)
-                        results += ', ';
-                    results += navigator.plugins[i].name;
+                        results += '\n';
+                    if(beef.browser.isFF()){ //FF returns exact plugin versions
+                        results += navigator.plugins[i].name + '-v.' + navigator.plugins[i].version;
+                    }else{ // Webkit and Presto (Opera) doesn't support the version attribute, and
+                           // sometimes they store plugin version in description (Real, Adobe)
+                        results += navigator.plugins[i].name;// + '-desc.' + navigator.plugins[i].description;
+                    }
                 }
             } else {
                 results = 'navigator.plugins is not supported in this browser!';