diff --git a/ChangeLog b/ChangeLog
index 96da76ec0b..1428c649ea 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-22  Russell Bryant  <russell@digium.com>
 
+	* configs/voicemail.conf.sample: Add note to indicate that #include should not be used for this file. (issue #5828)
+
 	* indications.c: Fix spelling of "cadence", allowing the old misspelling for backwards compatability. (issue #5826)
 	* configs/indications.conf.sample: Fix spelling of "cadence", allowing the old misspelling for backwards compatability. (issue #5826)
 	* include/asterisk/indications.h: Fix spelling of "cadence", allowing the old misspelling for backwards compatability. (issue #5826)
diff --git a/configs/voicemail.conf.sample b/configs/voicemail.conf.sample
index 69b145dfc7..ba917abca6 100755
--- a/configs/voicemail.conf.sample
+++ b/configs/voicemail.conf.sample
@@ -1,6 +1,13 @@
 ;
 ; Voicemail Configuration
 ;
+
+;
+; NOTE: Asterisk has to edit this file to change a user's password.  This does
+; note currently work with the "#include <file>" directive for Asterisk
+; configuration files.  Do not use it with this configuration file.
+;
+
 [general]
 ; Default formats for writing Voicemail
 ;format=g723sf|wav49|wav