diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index bc6afef..0e1c2b2 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -339,7 +339,7 @@ protected function registerTwig(ContainerBuilder $container) {
         // This is saved / loaded via drupal_php_storage().
         // All files can be refreshed by clearing caches.
         // @todo ensure garbage collection of expired files.
-        'cache' => TRUE,
+        'cache' => $config->get('twig.debug.enabled') ? TRUE : FALSE,
         'base_template_class' => 'Drupal\Core\Template\TwigTemplate',
         // @todo Remove in followup issue
         // @see http://drupal.org/node/1712444.
@@ -348,9 +348,9 @@ protected function registerTwig(ContainerBuilder $container) {
         // @see http://drupal.org/node/1806538.
         'strict_variables' => FALSE,
         // @todo Maybe make debug mode dependent on "production mode" setting.
-        'debug' => TRUE,
+        'debug' => $config->get('twig.debug.enabled') ? TRUE : FALSE,
         // @todo Make auto reload mode dependent on "production mode" setting.
-        'auto_reload' => FALSE,
+        'auto_reload' => $config->get('twig.autorefresh.enabled') ? TRUE : FALSE,
       ))
       ->addMethodCall('addExtension', array(new Definition('Drupal\Core\Template\TwigExtension')))
       // @todo Figure out what to do about debugging functions.
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 17f02df..159a4ef 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -1701,6 +1701,65 @@ function system_performance_settings_submit($form, &$form_state) {
 }
 
 /**
+ * Form builder; Configure Twig settings.
+ *
+ * @ingroup forms
+ * @see system_twig_settings_submit().
+ */
+function system_twig_settings($form, &$form_state) {
+  drupal_add_library('system', 'drupal.system');
+  $config = config('system.twig');
+
+  $form['twig'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Twig'),
+    '#description' => t('Provide Twig specific development switches.  Not recommended for use in production!'),
+  );
+
+  $form['twig']['debug'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Turn twig debugging on'),
+    '#default_value' => $config->get('twig.debug.enabled'),
+    '#description' => t('When enabled, the generated templates have a __toString() method that you can use to display the generated nodes'),
+    '#weight' => -2,
+  );
+
+  $form['twig']['debug_verbose'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Turn verbose twig debugging on'),
+    '#default_value' => $config->get('twig.debug_verbose.enabled'),
+    '#description' => t('Similar to the debug switch, but gives even more output information'),
+    '#weight' => -2,
+  );
+
+  $form['twig']['autorefresh'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Enable twig autorefesh'),
+    '#default_value' => $config->get('twig.autorefresh.enabled'),
+    '#description' => t('When developing with Twig, it is useful to recompile the template whenever the source code changes.'),
+    '#weight' => -2,
+  );
+
+  $form['#submit'][] = 'system_clear_page_cache_submit';
+  $form['#submit'][] = 'system_twig_settings_submit';
+
+  return system_config_form($form, $form_state);
+}
+
+/**
+ * Form submission handler for system_twig_settings().
+ *
+ * @ingroup forms
+ */
+function system_twig_settings_submit($form, &$form_state) {
+  $config = config('system.twig');
+  $config->set('twig.debug.enabled', $form_state['values']['debug']);
+  $config->set('twig.debug_verbose.enabled', $form_state['values']['debug_verbose']);
+  $config->set('twig.autorefresh.enabled', $form_state['values']['autorefresh']);
+  $config->save();
+}
+
+/**
  * Submit callback; clear system caches.
  *
  * @ingroup forms
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index ebb6a33..17034a2 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -941,6 +941,15 @@ function system_menu() {
     'file' => 'system.admin.inc',
     'weight' => -15,
   );
+  $items['admin/config/development/twig'] = array(
+    'title' => 'Twig',
+    'description' => 'Enable or disable twig debugging and autoreload functionality.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('system_twig_settings'),
+    'access arguments' => array('administer site configuration'),
+    'file' => 'system.admin.inc',
+    'weight' => -20,
+  );
 
   // Regional and date settings.
   $items['admin/config/regional'] = array(