diff --git a/CHANGELOG.md b/CHANGELOG.md
index d326423f1c27c6..0066751925ff3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.12.2
+###### _Oct 6, 2015_
+
+##### General
+- NEW GridList component and documentation! Thanks to @igorbt (#1320)
+
+##### Component Fixes / Enhancements
+- Added back canvasColor to theme palette (#1762)
+- Added hintStyle prop to TextField (#1510)
+- Add isScrollbarVisible function to table (#1539)
+- Add rowsMax prop to EnhancedTextarea (#1562)
+- Tab "item three" renamed on docs site (#1775)
+- Fixed docs server to run on Windows (#1774)
+- FlatButton now has a backgroundColor prop (#1561)
+- Fixed DropdownMenu buggy value prop check (#1768)
+
 ## 0.12.1
 ###### _Sep 28, 2015_
 
diff --git a/docs/package.json b/docs/package.json
index 0173d3a2ac5e20..75a5730251362b 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "material-ui-docs",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Documentation site for material-ui",
   "repository": {
     "type": "git",
diff --git a/package.json b/package.json
index c629e93ea4b28b..e0fce83ce7bff3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "material-ui",
   "author": "Call-em-all Engineering Team",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Material Design UI components built with React",
   "main": "./lib",
   "scripts": {