diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82f9632f0..e52e2a8bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+
+- Support for extending APIcast location block with snippets of nginx configuration [PR #407][https://github.com/3scale/apicast/pull/407]
+
 ### Changed
 
 - `THREESCALE\_DEPLOYMENT\_ENV` defaults to `production` [PR #406](https://github.com/3scale/apicast/pull/406)
diff --git a/apicast/apicast.d/location.d/.keep b/apicast/apicast.d/location.d/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/apicast/conf.d/apicast.conf b/apicast/conf.d/apicast.conf
index 9ad9e8274..99909dc43 100644
--- a/apicast/conf.d/apicast.conf
+++ b/apicast/conf.d/apicast.conf
@@ -89,6 +89,8 @@ location / {
   proxy_set_header Connection "";
 
   post_action @out_of_band_authrep_action;
+
+  include ../apicast.d/location.d/*.conf;
 }
 
 location = /_threescale/oauth_store_token {