diff --git a/AUTHORS.md b/AUTHORS.md
index 0f761872..8423df06 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -4,8 +4,8 @@ This list is sorted by the number of commits per contributor in _descending_ ord
Avatar|Contributor|Contributions
:-:|---|:-:
-
|[@myii](https://github.com/myii)|144
+|[@myii](https://github.com/myii)|158
---
-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-08.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-10.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5765cd3c..e625ef83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,36 @@
# Changelog
+# [1.18.0](https://github.com/myii/ssf-formula/compare/v1.17.1...v1.18.0) (2019-10-10)
+
+
+### Bug Fixes
+
+* **bin/kitchen:** fix `rubocop` errors ([](https://github.com/myii/ssf-formula/commit/58881a7))
+* **gemfile:** fix `rubocop` errors ([](https://github.com/myii/ssf-formula/commit/e0ec88a))
+* **salt-lint:** fix errors ([](https://github.com/myii/ssf-formula/commit/5890b8a))
+
+
+### Code Refactoring
+
+* **defaults:** use node anchors for common `line_length` values ([](https://github.com/myii/ssf-formula/commit/ac9b7a5))
+
+
+### Continuous Integration
+
+* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/myii/ssf-formula/commit/2dac9b0))
+
+
+### Features
+
+* **rubocop:** add per-formula overrides ([](https://github.com/myii/ssf-formula/commit/212edf0))
+* **rubocop:** include for this repo ([](https://github.com/myii/ssf-formula/commit/f4fc3c1))
+* **salt-lint:** add per-formula overrides (via. TOFS) ([](https://github.com/myii/ssf-formula/commit/9ec9b1e))
+* **salt-lint:** include for this repo ([](https://github.com/myii/ssf-formula/commit/1d9636e))
+* **travis:** update for new structure of merging the `lint` stage ([](https://github.com/myii/ssf-formula/commit/dbee3f7))
+* **travis:** use `env` and `name` for improved display in Travis ([](https://github.com/myii/ssf-formula/commit/8d86eb4)), closes [/github.com/saltstack-formulas/template-formula/pull/175#discussion_r332613933](https://github.com//github.com/saltstack-formulas/template-formula/pull/175/issues/discussion_r332613933)
+* **travis:** use conditional to provide one or two lint jobs ([](https://github.com/myii/ssf-formula/commit/5c2f134))
+* **ufw:** add specific `pip3` customisations to `.travis.yml` ([](https://github.com/myii/ssf-formula/commit/c3acbd1))
+
## [1.17.1](https://github.com/myii/ssf-formula/compare/v1.17.0...v1.17.1) (2019-10-08)
diff --git a/FORMULA b/FORMULA
index 1165441c..6133ab80 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
name: ssf
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
-version: 1.17.1
+version: 1.18.0
release: 1
minimum_version: 2017.7
summary: ssf formula
diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst
index 85caf097..da9d6226 100644
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@@ -15,9 +15,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
- Contributions
* - :raw-html-m2r:``
- `@myii `_
- - 144
+ - 158
----
-Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-10-08.
+Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-10-10.
diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
index d4ef3eb9..769f6d70 100644
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@@ -2,6 +2,42 @@
Changelog
=========
+`1.18.0 `_ (2019-10-10)
+------------------------------------------------------------------------------------------
+
+Bug Fixes
+^^^^^^^^^
+
+
+* **bin/kitchen:** fix ``rubocop`` errors (\ ` `_\ )
+* **gemfile:** fix ``rubocop`` errors (\ ` `_\ )
+* **salt-lint:** fix errors (\ ` `_\ )
+
+Code Refactoring
+^^^^^^^^^^^^^^^^
+
+
+* **defaults:** use node anchors for common ``line_length`` values (\ ` `_\ )
+
+Continuous Integration
+^^^^^^^^^^^^^^^^^^^^^^
+
+
+* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` `_\ )
+
+Features
+^^^^^^^^
+
+
+* **rubocop:** add per-formula overrides (\ ` `_\ )
+* **rubocop:** include for this repo (\ ` `_\ )
+* **salt-lint:** add per-formula overrides (via. TOFS) (\ ` `_\ )
+* **salt-lint:** include for this repo (\ ` `_\ )
+* **travis:** update for new structure of merging the ``lint`` stage (\ ` `_\ )
+* **travis:** use ``env`` and ``name`` for improved display in Travis (\ ` `_\ ), closes `/github.com/saltstack-formulas/template-formula/pull/175#discussion_r332613933 `_
+* **travis:** use conditional to provide one or two lint jobs (\ ` `_\ )
+* **ufw:** add specific ``pip3`` customisations to ``.travis.yml`` (\ ` `_\ )
+
`1.17.1 `_ (2019-10-08)
------------------------------------------------------------------------------------------