diff --git a/config/server.properties b/config/server.properties
index 7f4fec282e12e97ce047bf811bbc4ba6a6cc4fc7..8a2c0a773920eddab861b4b8b21847b6e5d4796a 100644
--- a/config/server.properties
+++ b/config/server.properties
@@ -92,8 +92,8 @@ log.default.flush.scheduler.interval.ms=1000
 log.retention.hours=168
 
 # A size-based retention policy for logs. Segments are pruned from the log as long as the remaining
-# segments don't drop below log.retention.size.
-#log.retention.size=1073741824
+# segments don't drop below log.retention.size.bytes.
+#log.retention.size.bytes=1073741824
 
 # The maximum size of a log segment file. When this size is reached a new log segment will be created.
 log.file.size=536870912
diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala
index eef4326d90b712b383d192a1af274ece2272e648..2f0765c5dc342bf6a35aa578e7df9a02c055e927 100644
--- a/core/src/main/scala/kafka/server/KafkaConfig.scala
+++ b/core/src/main/scala/kafka/server/KafkaConfig.scala
@@ -72,7 +72,7 @@ class KafkaConfig(props: Properties) extends ZKConfig(props) {
   val logRetentionHours = Utils.getIntInRange(props, "log.retention.hours", 24 * 7, (1, Int.MaxValue))
   
   /* the maximum size of the log before deleting it */
-  val logRetentionSize = Utils.getLong(props, "log.retention.size", -1)
+  val logRetentionSize = Utils.getLong(props, "log.retention.size.bytes", -1)
 
   /* the number of hours to keep a log file before deleting it for some specific topic*/
   val logRetentionHoursMap = Utils.getTopicRentionHours(Utils.getString(props, "topic.log.retention.hours", ""))