diff --git a/.versioneer-lookup b/.versioneer-lookup
index 0b326cc1..dd26fce5 100644
--- a/.versioneer-lookup
+++ b/.versioneer-lookup
@@ -7,12 +7,13 @@
 # The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out,
 # the lookup table does not apply to the matched branches
 
-# master and staging shall not use the lookup table
+# master shall not use the lookup table, only tags
 master
-staging
 
-# fix/ branches are fixes for master, so we don't handle those either
-fix/.*
+# maintenance is currently the branch for preparation of maintenance release 1.2.2
+# so are any fix/... branches
+maintenance 1.2.2-dev 9f8d30a66c2fcc5cd0e8984c72dc36f7e84fde10
+fix/.* 1.2.2-dev 9f8d30a66c2fcc5cd0e8984c72dc36f7e84fde10
 
 # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now
 .* 1.3.0-dev 198d3450d94be1a2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d754f68e..b565dcb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,30 @@
 # OctoPrint Changelog
 
-## 1.2.1 (unreleased)
+## 1.2.1 (2015-06-30)
+
+### Improvements
+
+* More flexibility when interpreting compatibility data from plugin repository. If compatibility information is provided
+  only as a version number it's prefixed with `>=` for the check (so stating a compatibility of only
+  `1.2.0` will now make the plugin compatible to OctoPrint 1.2.0+, not only 1.2.0). Alternatively the compatibility
+  information may now contain stuff like `>=1.2,<1.3` in which case the plugin will only be shown as compatible
+  to OctoPrint versions 1.2.0 and up but not 1.3.0 or anything above that. See also
+  [the requirement specification format of the `pkg_resources` package](https://pythonhosted.org/setuptools/pkg_resources.html#requirements-parsing).
+* Only print the commands of configured event handlers to the log when a new `debug` flag is present in the config
+  (see [the docs](http://docs.octoprint.org/en/master/configuration/config_yaml.html#events)). Reduces risk of disclosing sensitive data when sharing log files.
 
 ### Bug Fixes
 
-* [IRC] - OctoPrint will now exit cleanly on `SIGTERM`, calling the shutdown functions provided by plugins.
-  Thanks @Salandora for the heads-up.
+* [#956](https://github.com/foosel/OctoPrint/issues/956) - Fixed server crash when trying to configure a default
+  slicing profile for a still unconfigured slicer.
+* [#957](https://github.com/foosel/OctoPrint/issues/957) - Increased maximum allowed body size for plugin archive uploads.
+* Bugs without tickets:
+  * Clean exit on `SIGTERM`, calling the shutdown functions provided by plugins.
+  * Don't disconnect on `volume.init` errors from the firmware.
+  * `touch` uploaded files on local file storage to ensure proper "uploaded date" even for files that are just moved
+    from other locations of the file system (e.g. when being added from the `watched` folder).
+
+([Commits](https://github.com/foosel/OctoPrint/compare/1.2.0...1.2.1))
 
 ## 1.2.0 (2015-06-25)