diff --git a/composer.json b/composer.json
index 0138ed022..f828a4afd 100644
--- a/composer.json
+++ b/composer.json
@@ -4,8 +4,7 @@
     "description": "Twig, the flexible, fast, and secure template language for PHP",
     "keywords": ["templating"],
     "homepage": "http://twig.sensiolabs.org",
-    "version": "1.7.0",
-    "license": "BSD",
+    "license": "BSD-3",
     "authors": [
         {
             "name": "Fabien Potencier",
@@ -23,5 +22,10 @@
         "psr-0" : {
             "Twig_" : "lib/"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.7-dev"
+        }
     }
 }