diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23407a22d4..d6472a1a6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - [2635](https://github.com/influxdb/influxdb/issues/2635): Fix querying against boolean field in WHERE clause.
 - [2644](https://github.com/influxdb/influxdb/issues/2644): Make SHOW queries work with FROM /<regex>/.
 - [2501](https://github.com/influxdb/influxdb/issues/2501): Name the FlagSet for the shell and add a version flag. Thanks @neonstalwart
+- [2647](https://github.com/influxdb/influxdb/issues/2647): Fixes typos in sample config file - thanks @claws!
 
 ## v0.9.0-rc31 [2015-05-21]
 
diff --git a/etc/config.sample.toml b/etc/config.sample.toml
index 12bd5a9984..97d15e885b 100644
--- a/etc/config.sample.toml
+++ b/etc/config.sample.toml
@@ -43,7 +43,7 @@ port = 8083
 [[graphite]] # 1 or more of these sections may be present.
 enabled = false
 # protocol = "" # Set to "tcp" or "udp"
-# address = "0.0.0.0" # If not set, is actually set to bind-address.
+# bind-address = "0.0.0.0" # If not set, is actually set to bind-address.
 # port = 2003
 # name-position = "last"
 # name-separator = "-"
@@ -52,23 +52,23 @@ enabled = false
 # Configure the collectd input.
 [collectd]
 enabled = false
-#address = "0.0.0.0" # If not set, is actually set to bind-address.
-#port = 25827
-#database = "collectd_database"
-#typesdb = "types.db"
+# bind-address = "0.0.0.0" # If not set, is actually set to bind-address.
+# port = 25827
+# database = "collectd_database"
+# typesdb = "types.db"
 
 # Configure the OpenTSDB input.
 [opentsdb]
 enabled = false
-#address = "0.0.0.0" # If not set, is actually set to bind-address.
-#port = 4242
-#database = "opentsdb_database"
+# address = "0.0.0.0" # If not set, is actually set to bind-address.
+# port = 4242
+# database = "opentsdb_database"
 
 # Configure UDP listener for series data.
 [udp]
 enabled = false
-#bind-address = "0.0.0.0"
-#port = 4444
+# bind-address = "0.0.0.0"
+# port = 4444
 
 # Broker configuration. Brokers are nodes which participate in distributed
 # consensus.