diff --git a/CHANGELOG.md b/CHANGELOG.md
index afc0a17..c85b6e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [v1.0.18](https://github.com/netlify/netlify-dev-plugin/compare/v1.0.17...v1.0.18) - 2019-05-08
+
+### Merged
+
+- update serve-functions to watch all files in functions folder, fixes #167 [`#171`](https://github.com/netlify/netlify-dev-plugin/pull/171)
+- Add Middleman detector [`#172`](https://github.com/netlify/netlify-dev-plugin/pull/172)
+
+### Commits
+
+- prettify [`e2c36cc`](https://github.com/netlify/netlify-dev-plugin/commit/e2c36ccb07f7113a6585144d44cd24554375071a)
+- remove build from env vars message in function templates [`008575b`](https://github.com/netlify/netlify-dev-plugin/commit/008575bfb67bd2e1f42f8b4008b761c45792a3a7)
+
 ## [v1.0.17](https://github.com/netlify/netlify-dev-plugin/compare/v1.0.16...v1.0.17) - 2019-05-06
 
 ### Merged
@@ -19,8 +31,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 ### Commits
 
+- update serve-functions to watch all files in functions folder [`a706084`](https://github.com/netlify/netlify-dev-plugin/commit/a7060849faa5611e81acb454a868f367c655b9ef)
+- Add Middleman detector [`340a442`](https://github.com/netlify/netlify-dev-plugin/commit/340a44291c7bc21b3c52609434580c44d77e1c2d)
 - Update index.js [`13cb5a0`](https://github.com/netlify/netlify-dev-plugin/commit/13cb5a012940b7819bbae5f51e6a587bb1dd8cc9)
-- Update detect-server.js [`3760e23`](https://github.com/netlify/netlify-dev-plugin/commit/3760e2362b0a54c5181570503544e2a3c938bb5a)
 
 ## [v1.0.16](https://github.com/netlify/netlify-dev-plugin/compare/v1.0.15...v1.0.16) - 2019-04-29
 
diff --git a/package-lock.json b/package-lock.json
index 0b1d2e7..a0b8b47 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "netlify-dev-plugin",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3bf0aac..5a0e631 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "netlify-dev-plugin",
   "description": "Netlify development tools plugin",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "author": "David Calavera @calavera",
   "bugs": "https://github.com/netlify/netlify-dev-plugin/issues",
   "dependencies": {