diff --git a/NEWS b/NEWS
index 4a7f2ced..636f9b35 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+  - added <labels> to html_checkboxes and html_radios (Philippe, messju)
+  - added "labels"-options to turn off labels in html_checkboxes and _radios
+    (messju)
+
 Version 2.5.0 (April 11, 2003)
 ------------------------------
 
diff --git a/libs/plugins/function.html_checkboxes.php b/libs/plugins/function.html_checkboxes.php
index 2b8de7b4..41b375e9 100644
--- a/libs/plugins/function.html_checkboxes.php
+++ b/libs/plugins/function.html_checkboxes.php
@@ -31,10 +31,11 @@ function smarty_function_html_checkboxes($params, &$smarty)
    $options = null;
    $selected = null;
    $separator = '';
+   $labels = true;
    $output = null;
-
+ 
    $extra = '';
-
+   
    foreach($params as $_key => $_val) {
       switch($_key) {
       case 'name':
@@ -42,6 +43,10 @@ function smarty_function_html_checkboxes($params, &$smarty)
          $$_key = $_val;
          break;
 
+      case 'labels':
+         $$_key = (bool)$_val;
+         break;
+
       case 'options':
          $$_key = (array)$_val;
          break;
@@ -76,13 +81,13 @@ function smarty_function_html_checkboxes($params, &$smarty)
    if (is_array($options)) {
 
       foreach ($options as $_key=>$_val)
-         $_html_result .= smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator);
+         $_html_result .= smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
 
 
    } else {
       foreach ($values as $_i=>$_key) {
          $_val = isset($output[$_i]) ? $output[$_i] : '';
-         $_html_result .= smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator);
+         $_html_result .= smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
       }
 
    }
@@ -91,15 +96,19 @@ function smarty_function_html_checkboxes($params, &$smarty)
 
 }
 
-function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator) {
-   $_output = '<input type="checkbox" name="'
+function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels) {
+   $_output = '';
+   if ($labels) $_output .= '<label>';
+   $_output .= '<input type="checkbox" name="'
       . smarty_function_escape_special_chars($name) . '[]" value="'
       . smarty_function_escape_special_chars($value) . '"';
 
    if (in_array($value, $selected)) {
       $_output .= ' checked="checked"';
    }
-   $_output .= $extra . ' />' . $output . $separator . "\n";
+   $_output .= $extra . ' />' . $output;
+   if ($labels) $_output .= '</label>';
+   $_output .=  $separator . "\n";
 
    return $_output;
 }
diff --git a/libs/plugins/function.html_radios.php b/libs/plugins/function.html_radios.php
index bb9ccfb1..c8a128da 100644
--- a/libs/plugins/function.html_radios.php
+++ b/libs/plugins/function.html_radios.php
@@ -31,6 +31,7 @@ function smarty_function_html_radios($params, &$smarty)
    $options = null;
    $selected = null;
    $separator = '';
+   $labels = true;
    $output = null;
    $extra = '';
 
@@ -50,6 +51,10 @@ function smarty_function_html_radios($params, &$smarty)
 			}
 			break;
 
+        case 'labels':
+            $$_key = (bool)$_val;
+            break;
+
 		case 'options':
 			$$_key = (array)$_val;
 			break;
@@ -79,13 +84,13 @@ function smarty_function_html_radios($params, &$smarty)
    if (isset($options) && is_array($options)) {
 
       foreach ((array)$options as $_key=>$_val)
-	 $_html_result .= smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator);
+	 $_html_result .= smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
 
    } else {
 
       foreach ((array)$values as $_i=>$_key) {
 	 $_val = isset($output[$_i]) ? $output[$_i] : '';
-	 $_html_result .= smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator);
+	 $_html_result .= smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels);
       }
 
    }
@@ -94,15 +99,19 @@ function smarty_function_html_radios($params, &$smarty)
 
 }
 
-function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator) {
-   $_output = '<input type="radio" name="'
+function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels) {
+   $_output = '';
+   if ($labels) $_output .= '<label>';
+   $_output .= '<input type="radio" name="'
       . smarty_function_escape_special_chars($name) . '" value="'
       . smarty_function_escape_special_chars($value) . '"';
 
    if ($value==$selected) {
       $_output .= ' checked="checked"';
    }
-   $_output .= $extra . ' />' . $output . $separator . "\n";
+   $_output .= $extra . ' />' . $output;
+   if ($labels) $_output .= '</label>';
+   $_output .=  $separator . "\n";
 
    return $_output;
 }