diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61485aedd8..1d94f61394 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
### HEAD
+* Rename config.php to setup.php ([#1556](https://github.com/roots/sage/pull/1556))
* Move init.php to config.php ([#1555](https://github.com/roots/sage/pull/1555))
* Use Sass to style search form, remove search template ([#1545](https://github.com/roots/sage/pull/1545))
* Remove Modernizr ([#1541](https://github.com/roots/sage/pull/1541))
diff --git a/README.md b/README.md
index 8708fe6e10..2cbe69335c 100644
--- a/README.md
+++ b/README.md
@@ -43,13 +43,13 @@ Install the [Soil](https://github.com/roots/soil) plugin to enable additional fe
* Google CDN jQuery snippet from [HTML5 Boilerplate](http://html5boilerplate.com/)
* Google Analytics snippet from [HTML5 Boilerplate](http://html5boilerplate.com/)
-## Installation
+## Theme installation
Clone the git repo - `git clone https://github.com/roots/sage.git` and then rename the directory to the name of your theme or website.
-## Configuration
+## Theme setup
-Edit `lib/config.php` to enable or disable theme features, setup navigation menus, post thumbnail sizes, post formats, and sidebars.
+Edit `lib/setup.php` to enable or disable theme features, setup navigation menus, post thumbnail sizes, post formats, and sidebars.
## Theme development
diff --git a/base.php b/base.php
index 422c1d9fb2..e9d714e645 100644
--- a/base.php
+++ b/base.php
@@ -1,6 +1,6 @@
@@ -20,11 +20,11 @@
?>