diff --git a/composer.json b/composer.json
index cd57231d9bb09937ab6820f405896bde9502e9c1..60ea76fc109fb2664c52a10017fc33bc4b32ea7d 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,8 @@
         "simplesamlphp/saml2": "dev-master#00e38f85b417be1e10a2d738dd2f5ea82edb472c as 2.2",
         "robrichards/xmlseclibs": "~2.0",
         "whitehat101/apr1-md5": "~1.0",
-        "twig/twig": "~1.0"
+        "twig/twig": "~1.0",
+        "twig/extensions": "^1.3"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
diff --git a/config-templates/config.php b/config-templates/config.php
index 43017312bcb4340780167a2c8b8754bd6c2c1f25..8c614f6dfbfacc5a6d048fcfd6e61e4c5a0356ab 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -649,6 +649,11 @@ $config = array(
     'language.cookie.lifetime' => (60 * 60 * 24 * 900),
 
     /*
+     * Which i18n backend to use
+     */
+    'language.i18n.backend' => 'twig.i18n',
+
+    /**
      * Custom getLanguage function called from SimpleSAML\Locale\Language::getLanguage().
      * Function should return language code of one of the available languages or NULL.
      * See SimpleSAML\Locale\Language::getLanguage() source code for more info.