diff --git a/config/logging.yml b/config/logging.yml
index f0cd60282ec..a76eb175fc4 100644
--- a/config/logging.yml
+++ b/config/logging.yml
@@ -38,7 +38,7 @@ appender:
     datePattern: "'.'yyyy-MM-dd"
     layout:
       type: pattern
-      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
+      conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %.10000m%n"
 
   # Use the following log4j-extras RollingFileAppender to enable gzip compression of log files. 
   # For more information see https://logging.apache.org/log4j/extras/apidocs/org/apache/log4j/rolling/RollingFileAppender.html
diff --git a/docs/reference/migration/migrate_2_0.asciidoc b/docs/reference/migration/migrate_2_0.asciidoc
index 2bdd5fe90d3..e8f0ebff33a 100644
--- a/docs/reference/migration/migrate_2_0.asciidoc
+++ b/docs/reference/migration/migrate_2_0.asciidoc
@@ -508,3 +508,8 @@ Settings settings = ImmutableSettings.settingsBuilder()
         .put("cluster.name", "myClusterName").build();
 Client client = TransportClient.builder().settings(settings).build();
 --------------------------------------------------
+
+=== Logging
+
+Log messages are now truncated at 10,000 characters. This can be changed in the
+`logging.yml` configuration file.