diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87f78b31e9..12723279bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 v1.7.0 [unreleased]
 -------------------
 
+### Breaking changes
+
+-	The `ifql` section in the configuration has been changed to `flux` and it is enabled by default on port `:8082`.
+
 ### Features
 
 -	[#9964](https://github.com/influxdata/influxdb/pull/9964): Enable the storage service by default.
diff --git a/cmd/influxd/run/config.go b/cmd/influxd/run/config.go
index 7c2182906d..cde126a354 100644
--- a/cmd/influxd/run/config.go
+++ b/cmd/influxd/run/config.go
@@ -49,7 +49,7 @@ type Config struct {
 	Subscriber     subscriber.Config `toml:"subscriber"`
 	HTTPD          httpd.Config      `toml:"http"`
 	Logging        logger.Config     `toml:"logging"`
-	Storage        storage.Config    `toml:"ifql"`
+	Storage        storage.Config    `toml:"flux"`
 	GraphiteInputs []graphite.Config `toml:"graphite"`
 	CollectdInputs []collectd.Config `toml:"collectd"`
 	OpenTSDBInputs []opentsdb.Config `toml:"opentsdb"`