diff --git a/includes/theme.inc b/includes/theme.inc
index 0e42b0b..602e206 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -277,7 +277,7 @@ function bootstrap_css_alter(&$css) {
     $excludes[$theme_path . '/bootstrap/css/bootstrap-responsive.css'] = FALSE ;
     
     //and then add the cdn css
-    $cdn_url = '//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/css/bootstrap-combined.min.css';
+    $cdn_url = '//netdna.bootstrapcdn.com/twitter-bootstrap/'. theme_get_setting('cdn_bootstrap_version')  .'/css/bootstrap-combined.min.css';
     $css[$cdn_url]['data'] = $cdn_url;
     $css[$cdn_url]['type'] = 'external';
     $css[$cdn_url]['every_page'] = TRUE;
@@ -311,7 +311,7 @@ function bootstrap_js_alter(&$js) {
     $files[] = '//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js';
 
     if (theme_get_setting('cdn_bootstrap')) {
-      $files[] = '//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/js/bootstrap.min.js';
+      $files[] = '//netdna.bootstrapcdn.com/twitter-bootstrap/'. theme_get_setting('cdn_bootstrap_version')  .'/js/bootstrap.min.js';
     }
     else {
       $files[] = $theme_path . '/bootstrap/js/bootstrap.js';
@@ -320,7 +320,7 @@ function bootstrap_js_alter(&$js) {
   }
   else {
     if (theme_get_setting('cdn_bootstrap')) {
-      $files[] = '//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/js/bootstrap.min.js';
+      $files[] = '//netdna.bootstrapcdn.com/twitter-bootstrap/'. theme_get_setting('cdn_bootstrap_version')  .'/js/bootstrap.min.js';
     }
     else {
       $files[] = $theme_path . '/bootstrap/js/bootstrap.js';
diff --git a/theme-settings.php b/theme-settings.php
index c095e20..a28ddf6 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -33,6 +33,29 @@ function bootstrap_form_system_theme_settings_alter(&$form, $form_state, $form_i
                         .'<div class="alert alert-error">' . t('WARNING: this technique will give you a performance boost but will also make you dependant on a third party who has no obligations towards you concerning uptime and service quality.') . '</div>',
   );
 
+  $form['cdn']['cdn_bootstrap_version_container'] = array(
+    '#type' => 'container',
+    '#states' => array(
+      'invisible' => array(
+       ':input[name="cdn_bootstrap"]' => array('checked' => FALSE),
+      ),
+    ),
+  );
+
+  $form['cdn']['cdn_bootstrap_version_container']['cdn_bootstrap_version'] = array(
+    '#type' => 'select',
+    '#title' => t('Bootstrap version'),
+    '#options' => array(
+      '2.3.0' => 'v2.3.0',
+      '2.2.2' => 'v2.2.2',
+      '2.2.1' => 'v2.2.1',
+      '2.2.0' => 'v2.2.0',
+      '2.1.1' => 'v2.1.1',
+      '2.1.0' => 'v2.1.0',
+    ),
+    '#default_value' => theme_get_setting('cdn_bootstrap_version'),
+  );
+
   $form['cdn']['cdn_jquery'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Use CDN to load in a newer version of jQuery using the no-conflict solution.'),