diff --git a/NEWS b/NEWS
index 2508f4e6..df466fe5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+    - escape html entities in html_options (Monte)
     - fixed bug with label for html_options (Monte)
     - added caching to config file loading (Monte)
     - added "extra" parameter to mailto function (Monte,
diff --git a/libs/plugins/function.html_options.php b/libs/plugins/function.html_options.php
index e68f6c93..ed5d06f6 100644
--- a/libs/plugins/function.html_options.php
+++ b/libs/plugins/function.html_options.php
@@ -43,10 +43,11 @@ function smarty_function_html_options($params, &$smarty)
 
 function smarty_function_html_options_optoutput($key, $value, $selected) {
 	if(!is_array($value)) {
-    	$html_result = "<option label=\"$value\" value=\"$key\"";
+    	$html_result = '<option label="' . htmlspecialchars($value) . '" value="' . 
+				htmlspecialchars($key) . '"';
     	if (in_array($key, $selected))
         	$html_result .= " selected=\"selected\"";
-    	$html_result .= ">$value</option>\n";
+    	$html_result .= '>' . htmlspecialchars($value) . '</option>' . "\n";
 	} else {
 		$html_result = smarty_function_html_options_optgroup($key, $value, $selected);
 	}
@@ -54,7 +55,7 @@ function smarty_function_html_options_optoutput($key, $value, $selected) {
 }
 
 function smarty_function_html_options_optgroup($key, $values, $selected) {
-	$optgroup_html = "<optgroup label=\"$value\">\n";
+	$optgroup_html = '<optgroup label="' . htmlspecialchars($value) . '">' . "\n";
 	foreach ($values as $key => $value) {
 		$optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected);
 	}
diff --git a/plugins/function.html_options.php b/plugins/function.html_options.php
index e68f6c93..ed5d06f6 100644
--- a/plugins/function.html_options.php
+++ b/plugins/function.html_options.php
@@ -43,10 +43,11 @@ function smarty_function_html_options($params, &$smarty)
 
 function smarty_function_html_options_optoutput($key, $value, $selected) {
 	if(!is_array($value)) {
-    	$html_result = "<option label=\"$value\" value=\"$key\"";
+    	$html_result = '<option label="' . htmlspecialchars($value) . '" value="' . 
+				htmlspecialchars($key) . '"';
     	if (in_array($key, $selected))
         	$html_result .= " selected=\"selected\"";
-    	$html_result .= ">$value</option>\n";
+    	$html_result .= '>' . htmlspecialchars($value) . '</option>' . "\n";
 	} else {
 		$html_result = smarty_function_html_options_optgroup($key, $value, $selected);
 	}
@@ -54,7 +55,7 @@ function smarty_function_html_options_optoutput($key, $value, $selected) {
 }
 
 function smarty_function_html_options_optgroup($key, $values, $selected) {
-	$optgroup_html = "<optgroup label=\"$value\">\n";
+	$optgroup_html = '<optgroup label="' . htmlspecialchars($value) . '">' . "\n";
 	foreach ($values as $key => $value) {
 		$optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected);
 	}