diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46eb30d..94903ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v1.2.0
+## 10/09/2015
+
+1. [](#new)
+  * Added support for Shortcode filter methods
+2. [](#improved)
+  * Assets from shortcode `{{% assets %}}` are now being cached with page contents
+  * Added blueprints for Grav Admin plugin
+  * Use `fieldset` fields to group shortcode options **(requires Grav 0.9.44+)**
+3. [](#bugfix)
+  * Fixed [#2](https://github.com/Sommerregen/grav-plugin-shortcodes/issues/2) (Not working with Grav's Admin Panel)
+
 # v1.1.0
 ## 08/08/2015
 
@@ -19,7 +31,7 @@
   * Improved error handling in Twig
 3. [](#bugfix)
   * Fixed indentation of source code
-  * Fixed error while trying to call a shortcodes directory instead of Shortcodes [#1](https://github.com/Sommerregen/grav-plugin-shortcodes/issues/1)
+  * Fixed [#1](https://github.com/Sommerregen/grav-plugin-shortcodes/issues/1) (Error while trying to call a shortcodes directory instead of Shortcodes)
 
 # v1.0.0
 ## 06/23/2015
diff --git a/blueprints.yaml b/blueprints.yaml
index 5d151d4..b9587e4 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: "Shortcodes"
-version: 1.1.0
+version: 1.2.0
 description: "This plugin enables to use shortcodes (simple snippets) inside a document to be rendered by Grav."
 icon: puzzle-piece
 author:
diff --git a/shortcodes.php b/shortcodes.php
index 82251f9..9ba0624 100644
--- a/shortcodes.php
+++ b/shortcodes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Shortcodes v1.1.0
+ * Shortcodes v1.2.0
  *
  * This plugin enables to use shortcodes (simple snippets) inside a
  * document to be rendered by Grav.
@@ -9,7 +9,7 @@
  * http://benjamin-regler.de/license/
  *
  * @package     Shortcodes
- * @version     1.1.0
+ * @version     1.2.0
  * @link        <https://github.com/sommerregen/grav-plugin-shortcodes>
  * @author      Benjamin Regler <sommerregen@benjamin-regler.de>
  * @copyright   2015, Benjamin Regler