diff --git a/includes/form.inc b/includes/form.inc
index 3f83b8e..eda8b02 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -3868,7 +3868,11 @@ function theme_form_element($variables) {
   }
 
   if (!empty($element['#description'])) {
-    $output .= '<div class="description">' . $element['#description'] . "</div>\n";
+    $attributes = array('class' => 'description');
+    if (!empty($element['#id'])) {
+      $attributes['for'] = $element['#id'];
+    }
+    $output .= '<label' . drupal_attributes($attributes) . '>' . $element['#description'] . "</label>\n";
   }
 
   $output .= "</div>\n";