diff --git a/config-templates/config.php b/config-templates/config.php
index 7921d6daed4b46dc0862d0575c6afb17f8e49b67..54121b5faac74832007f2a85bcba2c7490266098 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -697,9 +697,9 @@ $config = array(
      * Languages available, RTL languages, and what language is the default.
      */
     'language.available' => array(
-        'en', 'no', 'nn', 'se', 'da', 'de', 'sv', 'fi', 'es', 'fr', 'it', 'nl', 'lb', 'cs',
-        'sl', 'lt', 'hr', 'hu', 'pl', 'pt', 'pt-br', 'tr', 'ja', 'zh', 'zh-tw', 'ru', 'et',
-        'he', 'id', 'sr', 'lv', 'ro', 'eu', 'el', 'af'
+        'en', 'no', 'nn', 'se', 'da', 'de', 'sv', 'fi', 'es', 'ca', 'fr', 'it', 'nl', 'lb', 
+        'cs', 'sl', 'lt', 'hr', 'hu', 'pl', 'pt', 'pt-br', 'tr', 'ja', 'zh', 'zh-tw', 'ru',
+        'et', 'he', 'id', 'sr', 'lv', 'ro', 'eu', 'el', 'af'
     ),
     'language.rtl' => array('ar', 'dv', 'fa', 'ur', 'he'),
     'language.default' => 'en',
diff --git a/lib/SimpleSAML/Locale/Language.php b/lib/SimpleSAML/Locale/Language.php
index 015ddf90b2881aa88fe573c077062038c428a1e3..56bf91b400f1bcc55e936e1a4fe4b2949721df0a 100644
--- a/lib/SimpleSAML/Locale/Language.php
+++ b/lib/SimpleSAML/Locale/Language.php
@@ -88,6 +88,7 @@ class Language
         'sv'    => 'Svenska', // Swedish
         'fi'    => 'Suomeksi', // Finnish
         'es'    => 'Español', // Spanish
+        'ca'    => 'CatalĂ ', // Catalan
         'fr'    => 'Français', // French
         'it'    => 'Italiano', // Italian
         'nl'    => 'Nederlands', // Dutch
diff --git a/templates/includes/header.php b/templates/includes/header.php
index b58d4a1920a21f75dd520d9ddb980eee772dbbb5..d79b006e1b5c76aae12633d2e5bcef35d81e8faf 100644
--- a/templates/includes/header.php
+++ b/templates/includes/header.php
@@ -162,6 +162,7 @@ if ($onLoad !== '') {
                 'sv' => 'Svenska', // Swedish
                 'fi' => 'Suomeksi', // Finnish
                 'es' => 'Español', // Spanish
+                'ca' => 'CatalĂ ', // Catalan
                 'fr' => 'Français', // French
                 'it' => 'Italiano', // Italian
                 'nl' => 'Nederlands', // Dutch