diff --git a/CHANGELOG.md b/CHANGELOG.md
index 697832c4..fc14e5c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+# [0.6.0](https://github.com/saltstack-formulas/template-formula/compare/v0.5.0...v0.6.0) (2019-02-23)
+
+
+### Documentation
+
+* **contributing:** add basic introductory text before the TOC ([45ccaf6](https://github.com/saltstack-formulas/template-formula/commit/45ccaf6))
+* **contributing:** modify quoted heading to prevent TOC inclusion ([abcb6ef](https://github.com/saltstack-formulas/template-formula/commit/abcb6ef))
+* **readme:** convert note into a heading ([5f2d789](https://github.com/saltstack-formulas/template-formula/commit/5f2d789))
+
+
+### Features
+
+* **toc:** use `markdown-toc` directly to update inline ([a5bae1e](https://github.com/saltstack-formulas/template-formula/commit/a5bae1e))
+
 # [0.5.0](https://github.com/saltstack-formulas/template-formula/compare/v0.4.0...v0.5.0) (2019-02-23)
 
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 56c94ae1..78297028 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,8 +4,16 @@ This document will eventually outline all aspects of guidance to make your contr
 What it already contains is information about _commit message formatting_ and how that directly affects the numerous automated processes that are used for this repo.
 
 <table><tr><th>Table of Contents</th></tr><tr><td>
+
 <!-- toc -->
+
+- [Commit message formatting](#commit-message-formatting)
+  * [Automation of multiple processes](#automation-of-multiple-processes)
+  * [Linting commit messages in Travis CI](#linting-commit-messages-in-travis-ci)
+  * [Relationship between commit type and version bump](#relationship-between-commit-type-and-version-bump)
+
 <!-- tocstop -->
+
 </td></tr></table>
 
 ## Commit message formatting
diff --git a/FORMULA b/FORMULA
index b2a206d0..c5c63151 100644
--- a/FORMULA
+++ b/FORMULA
@@ -1,7 +1,7 @@
 name: template
 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: 0.5.0
+version: 0.6.0
 release: 1
 minimum_version: 2016.11
 summary: Template formula
diff --git a/TOFS_pattern.md b/TOFS_pattern.md
index c133e91d..8b84669d 100644
--- a/TOFS_pattern.md
+++ b/TOFS_pattern.md
@@ -8,8 +8,17 @@ Modified by Daniel Dehennin <daniel.dehennin@baby-gnu.org>
 All that follows is a proposal based on my experience with [Saltstack](http://www.saltstack.com/). The good thing of a piece of software like this is that you can "bend it" to suit your needs in many possible ways, and this is one of them. All the recommendations and thoughts are given "as it is" with no warranty of any type.
 
 <table><tr><th>Table of Contents</th></tr><tr><td>
+
 <!-- toc -->
+
+- [Usage of values in pillar vs templates in file_roots](#usage-of-values-in-pillar-vs-templates-in-file_roots)
+- [On reusability of Saltstack state files](#on-reusability-of-saltstack-state-files)
+- [The Template Override and Files Switch (TOFS) pattern](#the-template-override-and-files-switch-tofs-pattern)
+  * [Template Override](#template-override)
+  * [Files Switch](#files-switch)
+
 <!-- tocstop -->
+
 </td></tr></table>