diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc
index c5660cc47d1a..2abd1186a084 100644
--- a/filebeat/docs/fields.asciidoc
+++ b/filebeat/docs/fields.asciidoc
@@ -21,7 +21,7 @@ Contains common fields available in all event types.
 
 ==== beat.name
 
-The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used.
+The name of the Beat sending the log messages. If the shipper name is set in the configuration file, then that value is used. If it is not set, the hostname is used. To set the shipper name, use the `name` option in the `shipper` section of the configuration file.
 
 
 ==== beat.hostname
diff --git a/filebeat/etc/fields.yml b/filebeat/etc/fields.yml
index f36784554ea4..a977921d7780 100644
--- a/filebeat/etc/fields.yml
+++ b/filebeat/etc/fields.yml
@@ -16,7 +16,8 @@ env:
       description: >
         The name of the Beat sending the log messages. If the shipper name is set
         in the configuration file, then that value is used. If it is not set,
-        the hostname is used.
+        the hostname is used. To set the shipper name, use the `name` option in
+        the `shipper` section of the configuration file.
 
     - name: beat.hostname
       description: >