diff --git a/template.php b/template.php
index 17698ba..82bcb50 100644
--- a/template.php
+++ b/template.php
@@ -352,8 +352,53 @@ function aurora_preprocess_node(&$variables) {
   * Implements hook_js_alter
   */
 function aurora_js_alter(&$js) {
+  global $base_url;
   // Forces Modernizr to header if the Modernizr module is enabled.
   if (module_exists('modernizr')) {
     $js[modernizr_get_path()]['force header'] = true;
   }
-}
\ No newline at end of file
+
+  // Updates jQuery and loads it from a CDN if wanted.
+  // Partially pulled from jquery_update module.
+  $version = theme_get_setting('aurora_jquery_version');
+  $cdn = theme_get_setting('aurora_jquery_cdn');
+  if ($cdn != 0 && $version == '1.4.4') {
+    return;
+  }
+
+  $min = theme_get_setting('aurora_jquery_min');
+  $min = ($min === 1) ? '' : '.min';
+  $path_to_theme = $base_url . '/' . drupal_get_path('theme', 'aurora');
+  $js['misc/jquery.js']['version'] = $version;
+
+  if ($cdn !== '0') {
+    $js['misc/jquery.js']['type'] = 'external';
+
+    switch ($cdn) {
+      case 'google':
+        $js['misc/jquery.js']['data'] = "//ajax.googleapis.com/ajax/libs/jquery/$version/jquery$min.js";
+      break;
+      case 'microsoft':
+        $js['misc/jquery.js']['data'] = "http://ajax.aspnetcdn.com/ajax/jquery/jquery-$version$min.js";
+      break;
+      case 'jquery':
+        $js['misc/jquery.js']['data'] = "http://code.jquery.com/jquery-$version$min.js";
+      break;
+    }
+    // Now add code to fall back on if the CDN is unavailable.
+    $js['misc/jquery-fallback.js'] = array(
+      'group' => JS_LIBRARY,
+      'weight' => -19,
+      'every_page' => TRUE,
+      'type' => 'inline',
+      'scope' => $js['misc/jquery.js']['scope'],
+      'cache' => FALSE,
+      'defer' => FALSE,
+      'data' => 'window.jQuery || document.write(\'<script type="text/javascript" src="' . $path_to_theme . '/js/jquery-' . $version . '.min.js"><\/script>\')'
+    );
+  }
+  else {
+    // If a CDN is not selected, but an updated version still wants to be used.
+    $js['misc/jquery.js']['data'] = "$path_to_theme/js/jquery-$version.min.js";
+  }
+}
diff --git a/theme-settings.php b/theme-settings.php
index 958a0eb..173c78e 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -102,7 +102,7 @@ function aurora_form_system_theme_settings_alter(&$form, &$form_state, $form_id
     ),
     '#description' => t('Will move all JavaScript to the bottom of your page. This can be overridden on an individual basis by setting the <pre>\'force header\' => true</pre> option in <pre>drupal_add_js</pre> or by using <pre>hook_js_alter</pre> to add the option to other JavaScript files.'),
   );
-  
+
   $form['optimizations']['aurora_html_tags'] = array(
     '#type' => 'checkbox',
     '#title' => t('Prune HTML Tags'),
@@ -112,7 +112,34 @@ function aurora_form_system_theme_settings_alter(&$form, &$form_state, $form_id
     ),
     '#description' => t('Prunes your <pre>style</pre>, <pre>link</pre>, and <pre>script</pre> tags as <a href="!link" target="_blank"> suggested by Nathan Smith</a>.', array('!link' => 'http://sonspring.com/journal/html5-in-drupal-7#_pruning')),
   );
-  
+
+
+  $form['optimizations']['aurora_jquery_cdn'] = array(
+    '#type' => 'select',
+    '#title' => t('Load jQuery from CDN'),
+    '#default_value' => theme_get_setting('aurora_jquery_cdn'),
+    '#options' => array(
+      0 => t('Use local files'),
+      'google' => t('Google CDN'),
+      'microsoft' => t('Microsoft CDN'),
+      'jquery' => t('jQuery CDN'),
+    ),
+    '#description' => t('Will load the jQuery file from a select Content Delivery Network with a local fallback. Note that the local fallback is always minified.'),
+  );
+
+  $form['optimizations']['aurora_jquery_version'] = array(
+    '#type' => 'select',
+    '#title' => t('Update jQuery Version'),
+    '#default_value' => theme_get_setting('aurora_jquery_version'),
+    '#options' => array(
+      '1.4.4' => t('Do not update'),
+      '1.8.2' => '1.8.2',
+      '1.7.2' => '1.7.2',
+      '1.5.2' => '1.5.2',
+    ),
+    '#description' => t('Select which version of jQuery you want to use on your site. Drupal 7 ships with version 1.4.4 by default. It is HIGHLY recommended that you upgrade to at least 1.7.2.'),
+  );
+
   //////////////////////////////
   // Development
   //////////////////////////////
@@ -133,6 +160,13 @@ function aurora_form_system_theme_settings_alter(&$form, &$form_state, $form_id
     ),
     '#description' => t('<a href="!link" target="_blank">Rebuild the theme registry</a> during project development.', array('!link' => 'http://drupal.org/node/173880#theme-registry')),
   );
+
+  $form['development']['aurora_jquery_min'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Use uncompressed jQuery'),
+    '#default_value' => theme_get_setting('aurora_jquery_min'),
+    '#description' => t('If you are loading your jQuery from a CDN, selecting this will use the uncompressed version of jQuery. Do not use on production sites.'),
+  );
   
   $form['development']['aurora_livereload'] = array(
     '#type' => 'checkbox',