diff --git a/speedy.module b/speedy.module
index 762ff2c..a5e870b 100644
--- a/speedy.module
+++ b/speedy.module
@@ -7,13 +7,35 @@
  * Copyright 2012 Hewlett-Packard Development Company, L.P.
  */
 
+
+/**
+ * Implements hook_FORM_ID_alter().
+ *
+ * @param type $form
+ * @param type $form_state
+ */
+function speedy_form_system_performance_settings_alter(&$form, &$form_state) {
+  $form['bandwidth_optimization']['speedy_js_production'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Use minified JS files created by Speedy'),
+    '#default_value' => variable_get('speedy_js_production'),
+    '#description' => t('Enabling this will replace non-minified Drupal core,
+      contributed, and theme Javascript files with a minfied versions - if they
+      exist.'),
+  );
+}
+
+
 /**
  * Implements hook_library_alter().
  *
  * If minified core JS exists for the current version of Drupal swap it out.
  */
 function speedy_js_alter(&$javascript) {
-  
+  // Ensure that Speedy is enabled
+  if (! variable_get('speedy_js_production', FALSE)) {
+    return;
+  }
   // Manage the map of replacements. This is cached so we don't have to hit the
   // file system on each pageload to do the swap.
   static $replacement_map = NULL;
@@ -42,4 +64,4 @@ function speedy_js_alter(&$javascript) {
       $javascript[$name]['data'] = $new_path . $data['data'];
     }
   }
-}
\ No newline at end of file
+}