diff --git a/CHANGES.txt b/CHANGES.txt
index 8e8119c7696..3f1b7699d2e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -54,6 +54,9 @@ Trunk (unreleased changes)
     HADOOP-6995. Allow wildcards to be used in ProxyUsers configurations.
     (todd)
 
+    HADOOP-6376. Add a comment header to conf/slaves that specifies the file
+    format. (Kay Kay via todd)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/conf/slaves.template b/conf/slaves.template
index 2fbb50c4a8d..23067fa3b86 100644
--- a/conf/slaves.template
+++ b/conf/slaves.template
@@ -1 +1,2 @@
+# Specify multiple slaves, one per each line. 
 localhost