diff --git a/redis.conf b/redis.conf
index bfe90493bc..f135463cd7 100644
--- a/redis.conf
+++ b/redis.conf
@@ -294,6 +294,9 @@ slave-priority 100
 # an empty string:
 #
 # rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
 
 ################################### LIMITS ####################################