diff --git a/admin/custom_fields.php b/admin/custom_fields.php
index a71b6a5a..934cceda 100755
--- a/admin/custom_fields.php
+++ b/admin/custom_fields.php
@@ -166,7 +166,31 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 											</div>
 											<?php
 										}
-										?>
+
+										$descriptions = hesk_SESSION(array('new_cf','descriptions')); ?>
+                                    </div>
+                                    <div class="form-group">
+                                        <label for="description[]" class="col-sm-3 control-label">
+                                            <?php echo $hesklang['description']; ?>
+                                        </label>
+										<?php if ($hesk_settings['can_sel_lang'] && count($hesk_settings['languages']) > 1): ?>
+                                            <table border="0">
+                                                <?php foreach ($hesk_settings['languages'] as $lang => $info): ?>
+                                                    <tr>
+                                                        <td><?php echo $lang; ?></td>
+                                                        <td>
+                                                            <textarea class="form-control"
+                                                                      name="description[<?php echo $lang; ?>]"><?php echo (isset($descriptions[$lang]) ? $descriptions[$lang] : ''); ?></textarea>
+                                                        </td>
+                                                    </tr>
+                                                <?php endforeach; ?>
+                                            </table>
+                                        <?php else: ?>
+                                            <div class="col-sm-9">
+                                                <textarea class="form-control"
+                                                          name="description[<?php echo $hesk_settings['language']; ?>]"><?php echo (isset($descriptions[$hesk_settings['language']]) ? $descriptions[$hesk_settings['language']] : ''); ?></textarea>
+                                            </div>
+                                        <?php endif; ?>
 									</div>
 									<div class="form-group">
 										<label for="name[]" class="col-sm-3 control-label">
@@ -772,7 +796,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 										?>
 										<tr>
 											<td><?php echo $tmp_id; ?></td>
-											<td><?php echo $cf['name']; ?></td>
+											<td>
+                                            <?php
+                                                echo $cf['name'];
+                                                if ($cf['mfh_description'] !== null && trim($cf['mfh_description']) !== '') {
+                                                    echo ' <i class="fa fa-info-circle" data-toggle="popover" 
+                                                        data-title="' . htmlspecialchars($hesklang['description']) . '" 
+                                                        data-content="' . htmlspecialchars($cf['mfh_description']) . '"></i>';
+                                                }
+                                            ?>
+                                            </td>
 											<td><?php echo $cf['type']; ?></td>
 											<td><?php echo $cf['use']; ?></td>
 											<td><?php echo $cf['req']; ?></td>
@@ -916,6 +949,9 @@ function edit_cf()
 	$cf['names'] = json_decode($cf['name'], true);
 	unset($cf['name']);
 
+	$cf['descriptions'] = json_decode($cf['mfh_description'], true);
+	unset($cf['mfh_description']);
+
 	if (strlen($cf['category']))
 	{
 		$cf['categories'] = json_decode($cf['category'], true);
@@ -1057,6 +1093,27 @@ function cf_validate()
 		$hesk_error_buffer[] = $hesklang['err_custname'];
 	}
 
+	// Descriptions
+    $cf['descriptions'] = hesk_POST_array('descriptions');
+
+	// Make sure only non-empty descriptions pass
+    foreach ($cf['descriptions'] as $key => $description) {
+        if (!isset($hesk_settings['languages'][$key])) {
+            unset($cf['descriptions'][$key]);
+        } else {
+            $description = is_array($description) ? '' : hesk_input($description, 0, 0, HESK_SLASH);
+
+            if (strlen($description) < 1)
+            {
+                unset($cf['descriptions'][$key]);
+            }
+            else
+            {
+                $cf['descriptions'][$key] = stripslashes($description);
+            }
+        }
+    }
+
 	// Get type and values
 	$cf['type'] = hesk_POST('type');
 	switch ($cf['type'])
@@ -1264,6 +1321,7 @@ function cf_validate()
 	}
 
 	$cf['names'] = addslashes(json_encode($cf['names']));
+	$cf['descriptions'] = addslashes(json_encode($cf['descriptions']));
 	$cf['value'] = $cf['type'] == 'date' ? json_encode($cf['value']) : addslashes(json_encode($cf['value']));
 
 	return $cf;
@@ -1305,7 +1363,8 @@ function new_cf()
 	`req`      = '{$cf['req']}',
 	`category` = ".(count($cf['categories']) ? "'".json_encode($cf['categories'])."'" : 'NULL').",
 	`name`     = '".hesk_dbEscape($cf['names'])."',
-	`value`    = ".(strlen($cf['value']) ? "'".hesk_dbEscape($cf['value'])."'" : 'NULL').",
+	`mfh_description` = '".hesk_dbEscape($cf['mfh_description'])."',
+    `value`    = ".(strlen($cf['value']) ? "'".hesk_dbEscape($cf['value'])."'" : 'NULL').",
 	`order`    = 990
 	WHERE `id`={$_SESSION['cford']}");
 
diff --git a/inc/custom_fields.inc.php b/inc/custom_fields.inc.php
index 4d57778f..7cbd4ef9 100755
--- a/inc/custom_fields.inc.php
+++ b/inc/custom_fields.inc.php
@@ -77,6 +77,12 @@ function hesk_load_custom_fields($category=0, $use_cache=1)
 		// Decode options
 		$row['value'] = json_decode($row['value'], true);
 
+		// Description
+        $descriptions = strlen($row['mfh_description']) ? json_decode($row['mfh_description'], true) : array();
+        $row['mfh_description'] = (isset($descriptions[$hesk_settings['language']])) ?
+            $descriptions[$hesk_settings['language']] :
+            reset($descriptions);
+
 		// Add to custom_fields array
 		$hesk_settings['custom_fields'][$id] = $row;
 	}
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index c8922f46..22a2c000 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1138,6 +1138,14 @@ function execute320Scripts() {
 
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` 
         ADD COLUMN `mfh_description` VARCHAR(255)");
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_fields`
+        ADD COLUMN `mfh_description` VARCHAR(255)");
+
+    // Purge the custom field caches as we're adding a new field
+    foreach ($hesk_settings['languages'] as $key => $value) {
+        $language_hash = sha1($key);
+        hesk_unlink(HESK_PATH . "cache/cf_{$language_hash}.cache.php");
+    }
 
     updateVersion('3.2.0');
 }
\ No newline at end of file