diff --git a/mappers/text.inc b/mappers/text.inc
index 48447d7..7a40a74 100644
--- a/mappers/text.inc
+++ b/mappers/text.inc
@@ -11,21 +11,51 @@
  * @see FeedsProcessor::getMappingTargets()
  */
 function text_feeds_processor_targets_alter(&$targets, $entity_type, $bundle_name) {
-  $text_types = array(
-    'list_text',
-    'text',
-    'text_long',
-    'text_with_summary',
-  );
   foreach (field_info_instances($entity_type, $bundle_name) as $name => $instance) {
     $info = field_info_field($name);
 
-    if (in_array($info['type'], $text_types)) {
-      $targets[$name] = array(
-        'name' => check_plain($instance['label']),
-        'callback' => 'text_feeds_set_target',
-        'description' => t('The @label field of the entity.', array('@label' => $instance['label'])),
-      );
+    switch ($info['type']) {
+
+      case 'text_with_summary':
+
+        $targets[$name . ':text'] = array(
+          'name' => t('@name Text', array('@name' => $instance['label'])),
+          'callback' => 'text_with_summary_feeds_set_target',
+          'description' => t('The @label field of the node.', array('@label' => $instance['label'])),
+        );
+        $targets[$name . ':summary'] = array(
+          'name' => t('@name Summary', array('@name' => $instance['label'])),
+          'callback' => 'text_with_summary_feeds_set_target',
+          'description' => t('The @label summary field of the node.', array('@label' => $instance['label'])),
+        );
+
+        $targets[$name . ':summary_truncated'] = array(
+          'name' => t('@name Summary Truncated', array('@name' => $instance['label'])),
+          'callback' => 'text_with_summary_feeds_set_target',
+          'description' => t('The @label field of the node truncated with the text_summary() function.', array('@label' => $instance['label'])),
+        );
+
+      break;
+
+      case 'list_text':
+
+        $targets[$name] = array(
+          'name' => check_plain($instance['label']),
+          'callback' => 'text_feeds_set_target',
+          'description' => t('The @label field of the entity.', array('@label' => $instance['label'])),
+        );
+
+      break;
+
+      case 'text':
+      case 'text_long':
+
+        $targets[$name] = array(
+          'name' => check_plain($instance['label']),
+          'callback' => 'field_feeds_set_target_text',
+          'description' => t('The @label field of the node.', array('@label' => $instance['label'])),
+        );
+      break;
     }
   }
 }
@@ -77,3 +107,64 @@ function text_feeds_set_target($source, $entity, $target, $value) {
 
   $entity->$target = $field;
 }
+
+/**
+ * Callback for mapping. Here is where the actual mapping happens.
+ *
+ * When the callback is invoked, $target contains the name of the field the
+ * user has decided to map to and $value contains the value of the feed item
+ * element the user has picked as a source.
+ */
+function text_with_summary_feeds_set_target($source, $entity, $target, $value) {
+  if (empty($value)) {
+    return;
+  }
+
+  if (isset($source->importer->processor->config['input_format'])) {
+    $format = $source->importer->processor->config['input_format'];
+  }
+
+  // Handle non-multiple value fields.
+  if (!is_array($value)) {
+    $value = array($value);
+  }
+
+  // Iterate over all values.
+  $i = 0;
+
+  list($field_name, $sub_field) = explode(':', $target);
+  $info = field_info_field($field_name);
+
+  foreach ($value as $v) {
+    if (!is_array($v) && !is_object($v)) {
+      if (isset($entity->{$field_name}['und'][$i]['value'])) {
+          $field['und'][$i]['value'] = $entity->{$field_name}['und'][$i]['value'];
+      }
+      if (isset($entity->{$field_name}['und'][$i]['summary'])) {
+          $field['und'][$i]['summary'] = $entity->{$field_name}['und'][$i]['summary'];
+      }
+
+      if ($sub_field == 'text') {
+        $field['und'][$i]['value'] = $v;
+      }
+      elseif ($sub_field == 'summary') {
+        $field['und'][$i]['summary'] = $v;
+      }
+      elseif ($sub_field == 'summary_truncated') {
+        $field['und'][$i]['summary'] = text_summary($v); // ($text, $format = NULL, $size = NULL)
+      }
+
+      if (isset($format)) {
+        $field['und'][$i]['format'] = $format;
+      }
+
+    }
+    if ($info['cardinality'] == 1) {
+      break;
+    }
+    $i++;
+  }
+
+  $entity->{$field_name} = $field;
+}
+