diff --git a/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRenderer.java b/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRenderer.java
index aa850b05e0a..70933d33aad 100644
--- a/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRenderer.java
+++ b/marvel/src/main/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRenderer.java
@@ -20,6 +20,7 @@ public class IndexStatsRenderer extends AbstractRenderer<IndexStatsMarvelDoc> {
             "index_stats.index",
             "index_stats.primaries.docs.count",
             "index_stats.total.docs.count",
+            "index_stats.total.fielddata.memory_size_in_bytes",
             "index_stats.total.indexing.index_total",
             "index_stats.total.indexing.index_time_in_millis",
             "index_stats.total.indexing.throttle_time_in_millis",
diff --git a/marvel/src/main/resources/marvel_index_template.json b/marvel/src/main/resources/marvel_index_template.json
index b3283832c88..56464478a2b 100644
--- a/marvel/src/main/resources/marvel_index_template.json
+++ b/marvel/src/main/resources/marvel_index_template.json
@@ -86,6 +86,13 @@
                     }
                   }
                 },
+                "fielddata" : {
+                  "properties": {
+                    "memory_size_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
                 "store": {
                   "properties": {
                     "size_in_bytes": {
diff --git a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRendererTests.java b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRendererTests.java
index ac72247f8c3..578864783cc 100644
--- a/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRendererTests.java
+++ b/marvel/src/test/java/org/elasticsearch/marvel/agent/renderer/indices/IndexStatsRendererTests.java
@@ -5,10 +5,12 @@
  */
 package org.elasticsearch.marvel.agent.renderer.indices;
 
+import com.carrotsearch.hppc.ObjectLongHashMap;
 import org.elasticsearch.action.admin.indices.stats.CommonStats;
 import org.elasticsearch.action.admin.indices.stats.IndexStats;
 import org.elasticsearch.action.admin.indices.stats.ShardStats;
 import org.elasticsearch.index.engine.SegmentsStats;
+import org.elasticsearch.index.fielddata.FieldDataStats;
 import org.elasticsearch.index.indexing.IndexingStats;
 import org.elasticsearch.index.merge.MergeStats;
 import org.elasticsearch.index.refresh.RefreshStats;
@@ -41,6 +43,7 @@ public class IndexStatsRendererTests extends ESTestCase {
                         stats.merge = new MergeStats();
                         stats.merge.add(0L, 0L, 0L, 42L, 0L, 0L, 0L, 0L, 0L, 0L);
                         stats.refresh = new RefreshStats(0L, 978L);
+                        stats.fieldData = new FieldDataStats(123456L, 0L, null);
                         stats.segments = new SegmentsStats();
                         stats.segments.add(0, 87965412L);
                         return stats;
diff --git a/marvel/src/test/resources/samples/index_stats.json b/marvel/src/test/resources/samples/index_stats.json
index 77cf05cd9e7..77ed310e877 100644
--- a/marvel/src/test/resources/samples/index_stats.json
+++ b/marvel/src/test/resources/samples/index_stats.json
@@ -26,6 +26,9 @@
       "refresh" : {
         "total_time_in_millis" : 978
       },
+      "fielddata" : {
+        "memory_size_in_bytes" : 123456
+      },
       "segments" : {
         "memory_in_bytes" : 87965412
       }