diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index 23486106b6..9bf4bf86ce 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -46,9 +46,9 @@ function generate_device_link($device, $text=0, $start=0, $end=0)
 
 
   $contents .= "<div>";
-  if($device['os']) { $contents .= $config['os'][$device['os']]['text']; }
-  if($device['version']) { $contents .= " ".$device['version']; }
-  if($device['features']) { $contents .= " (".$device['features'].")"; }
+  if($device['os']) { $contents .= htmlentities($config['os'][$device['os']]['text']); }
+  if($device['version']) { $contents .= " ".htmlentities($device['version']); }
+  if($device['features']) { $contents .= " (".htmlentities($device['features']).")"; }
 #  if($device['hardware']) { $contents .= " - ".$device['hardware']; }
   $contents .= "</div>";