diff --git a/CHANGELOG.mdown b/CHANGELOG.mdown
index 849d3381..b9f93c7d 100644
--- a/CHANGELOG.mdown
+++ b/CHANGELOG.mdown
@@ -1,3 +1,10 @@
+* 1.2.1 (2012-08-29)
+
+  Changes:
+
+    * Added new $logopts arg to SyslogHandler to provide custom openlog options
+    * Fixed fatal error in SyslogHandler
+
 * 1.2.0 (2012-08-18)
 
   Changes:
diff --git a/composer.json b/composer.json
index 03829a81..9db9073a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "monolog/monolog",
     "description": "Logging for PHP 5.3",
-    "keywords": ["log","logging"],
+    "keywords": ["log", "logging"],
     "homepage": "http://github.com/Seldaek/monolog",
     "type": "library",
     "license": "MIT",
@@ -25,5 +25,10 @@
     },
     "autoload": {
         "psr-0": {"Monolog": "src/"}
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.3.x-dev"
+        }
     }
 }