diff --git a/config-templates/config.php b/config-templates/config.php
index c63138dc9849336b5c573a80872c8d7205d9170c..bc94a9d504685a10f60f6c585e78f95340919e94 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -797,6 +797,17 @@ $config = array(
      */
     'template.auto_reload' => false,
 
+    /*
+     * Set this option to true to indicate that your installation of SimpleSAMLphp
+     * is running in a production environment. This will affect the way resources
+     * are used, offering an optimized version when running in production, and an
+     * easy-to-debug one when not. Set it to false when you are testing or
+     * developing the software.
+     *
+     * Defaults to true.
+     */
+    'production' => true,
+
 
 
     /*********************
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 56e05b3723b30be7167d5b62735dafd17477dc54..879f2073303a59935b60db2b88c6f5d32678723d 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -247,6 +247,7 @@ class SimpleSAML_XHTML_Template
         }
         $twig->addGlobal('queryParams', $queryParams);
         $twig->addGlobal('templateId', str_replace('.twig', '', $this->normalizeTemplateName($this->template)));
+        $twig->addGlobal('isProduction', $this->configuration->getBoolean('production', true));
 
         // add a filter for translations out of arrays
         $twig->addFilter(