diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index fbb473556..06e1cab88 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -5,8 +5,15 @@ GnuCash Android is built by people like you! Please [join us](https://github.com
 * You can maintain your stable installation of GnuCash and test with another installation.
 The two instances of GnuCash Android will live side-by-side on your device and not affect each other. You can install the development version by executing `gradle installDD` inside the root project directory
 * The latest changes are in the `develop` branch.
+  * Always rebase develop before working on a fix or issuing a pull request
 * The master branch contains only stable releases.
   * Pull requests to the `master` branch will be rejected.
+* The `hotfix/patches` branch is reserved for very small fixes to the current release
+  * This branch may diverge significantly from the `develop` branch
+  * When working on a hotfix, always rebase and start off the `origin/hotfix/patches` branch
+  * Examples of such are typos, translation updates, critical bugs (e.g. cannot save transactions)
+  * Any bigger changes should be made to develop
+
 * Make a new branch for every feature you're working on.
 * Try to make clean commits that are easily readable (including descriptive commit messages!)
 * Test before you push make sure all test pass on your machine.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index a16247155..0c9d370c0 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,12 +1,12 @@
+#### Steps to reproduce the behaviour
+1. <!-- List the detail steps to reproduce the problem here -->
+
 #### Expected behaviour
 
 
 #### Actual behaviour
 
 
-#### Steps to reproduce the behaviour
-1. <!-- List the detail steps to reproduce the problem here -->
-
 #### Software specifications
 * GnuCash Android version:
 * System Android version:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bcb4529e..3cf2c62df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 Change Log
 ===============================================================================
+Version 2.1.2 *(2016-09-21)*
+----------------------------
+* Fixed: Scheduled exports always run daily (no matter the actual schedule)
+* Fixed: New transactions cannot be saved in single-entry mode
+* Fixed: ownCloud connect success messages displayed in red (now green)
+* Fixed: Crash when scheduled action service cannot find transaction in db
+* Improved: German and Brazilian Portuguese translations
+
 Version 2.1.1 *(2016-09-05)*
 ----------------------------
 * Fixed: Bug cause crash during start-up for devices with no scheduled transactions
diff --git a/app/build.gradle b/app/build.gradle
index c6e330fb9..1d5200fad 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'io.fabric'
 
 def versionMajor = 2
 def versionMinor = 1
-def versionPatch = 1
+def versionPatch = 2
 def versionBuild = 0
 
 def buildTime() {