diff --git a/cmd/influxd/run/config.go b/cmd/influxd/run/config.go
index e869034722..35ab070a32 100644
--- a/cmd/influxd/run/config.go
+++ b/cmd/influxd/run/config.go
@@ -49,7 +49,7 @@ type Config struct {
 	Monitor        monitor.Config    `toml:"monitor"`
 	Subscriber     subscriber.Config `toml:"subscriber"`
 	HTTPD          httpd.Config      `toml:"http"`
-	Storage        storage.Config    `toml:"storage"`
+	Storage        storage.Config    `toml:"ifql"`
 	GraphiteInputs []graphite.Config `toml:"graphite"`
 	CollectdInputs []collectd.Config `toml:"collectd"`
 	OpenTSDBInputs []opentsdb.Config `toml:"opentsdb"`
diff --git a/etc/config.sample.toml b/etc/config.sample.toml
index 22ede52a65..c56eb1ca63 100644
--- a/etc/config.sample.toml
+++ b/etc/config.sample.toml
@@ -252,6 +252,24 @@
   # The maximum size of a client request body, in bytes. Setting this value to 0 disables the limit.
   # max-body-size = 25000000
 
+
+###
+### [ifql]
+###
+### Configures the ifql RPC API.
+###
+
+[ifql]
+  # Determines whether the RPC service is enabled.
+  # enabled = true
+
+  # Determines whether additional logging is enabled.
+  # log-enabled = true
+
+  # The bind address used by the ifql RPC service.
+  # bind-address = ":8082"
+
+
 ###
 ### [subscriber]
 ###