diff --git a/.gitignore b/.gitignore
index be1d8ea..dd5cbc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ PYSMELLTAGS
 *.tar.gz
 .hyde_deps
 src
+.tm_properties
\ No newline at end of file
diff --git a/AUTHORS.rst b/AUTHORS.rst
index b0fc710..e8f0060 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -6,15 +6,19 @@ This version would not exist without the contributions from the
 
 Contributors
 ===============================================================================
--	|jd|
+-   |idank|_
 
-	*	Bug Fix: Metadata Plugin: Do not try to read meta data on `simple_copy` files.
+    *   Bug Fix: Tag archive generator uses subscript syntax to avoid failure when tags contain '-' or space.
+
+-   |jd|_
+
+    *   Bug Fix: Metadata Plugin: Do not try to read meta data on `simple_copy` files.
+
+    |vinilios|_
+
+    *   Added a helper method in Expando class to ease up non existing keys handling.
+    *   Some improvements in LessCSSPlugin to be able to build complex less projects (such as twitter bootstrap)
 
--	|vinilios|
-	
-	*	Added a helper method in Expando class to ease up non existing keys handling.
-	*	Some improvements in LessCSSPlugin to be able to build complex less projects (such as twitter bootstrap)
-	
 -   |nud|_
 
     *   Bug Fix: Fix class name of `test_stylus`
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2828d35..7a7e0d3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,15 +1,23 @@
+Version 0.8.5a12
+============================================================
+
+Thanks to @idank
+
+*   Bug Fix: Tag archive generator uses subscript syntax to avoid failure when tags contain '-' or space. (Issue #130)
+
+
 Version 0.8.5a11
 ============================================================
 
-*	Bug Fix: Folder Flattener updates node's `relative_deploy_path` & `url` attributes as well. (Issue #126)
-*	BREAKING: As part of the above fix, `resource.url` is prefixed with a `/`. (Issue #126)
+*   Bug Fix: Folder Flattener updates node's `relative_deploy_path` & `url` attributes as well. (Issue #126)
+*   BREAKING: As part of the above fix, `resource.url` is prefixed with a `/`. (Issue #126)
 
 Version 0.8.5a10
 ============================================================
 
 Thanks to @jd
 
-*	Bug Fix: Metadata Plugin: Do not try to read meta data on `simple_copy` files. (Issue #124, Issue #121)
+*   Bug Fix: Metadata Plugin: Do not try to read meta data on `simple_copy` files. (Issue #124, Issue #121)
 
 
 Version 0.8.5a9
@@ -17,8 +25,8 @@ Version 0.8.5a9
 
 Thanks to @vinilios
 
-*	Added a helper method in Expando class to ease up non existing keys handling. (Issue #117)
-*	Some improvements in LessCSSPlugin to be able to build complex less projects (such as twitter bootstrap) (Issue #117)
+*   Added a helper method in Expando class to ease up non existing keys handling. (Issue #117)
+*   Some improvements in LessCSSPlugin to be able to build complex less projects (such as twitter bootstrap) (Issue #117)
 
 
 Version 0.8.5a8
diff --git a/README.rst b/README.rst
index 8af495d..f79b029 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-Version 0.8.5a11
+Version 0.8.5a12
 
 A brand new **hyde**
 ====================
diff --git a/hyde/version.py b/hyde/version.py
index 11ff266..b2250ea 100644
--- a/hyde/version.py
+++ b/hyde/version.py
@@ -3,4 +3,4 @@
 Handles hyde version
 TODO: Use fabric like versioning scheme
 """
-__version__ = '0.8.5a11'
+__version__ = '0.8.5a12'