diff --git a/STARTERKIT/STARTERKIT.info.txt b/STARTERKIT/STARTERKIT.info.txt
index 858bb45..335bce4 100644
--- a/STARTERKIT/STARTERKIT.info.txt
+++ b/STARTERKIT/STARTERKIT.info.txt
@@ -144,6 +144,7 @@ settings[zen_skip_link_anchor]     = main-menu
 settings[zen_skip_link_text]       = Jump to navigation
 settings[zen_rebuild_registry]     = 1
 settings[zen_wireframes]           = 0
+settings[zen_html5_respondjs]      = 1
 
 ; To make this sub-theme an admin theme with shortcut links next to titles,
 ; uncomment the line below.
diff --git a/js/html5-respond.js b/js/html5-respond.js
index ea7a5a2..8aa9f0c 100644
--- a/js/html5-respond.js
+++ b/js/html5-respond.js
@@ -2,9 +2,16 @@
 // iepp v1.6.2 @jon_neal iecss.com/print-protector
 // Dual licensed under the MIT or GPL Version 2 licenses
 /*@cc_on(function(a,b){function r(a){var b=-1;while(++b<f)a.createElement(e[b])}if(!(!window.attachEvent||!b.createStyleSheet||!function(){var a=document.createElement("div");a.innerHTML="<elem></elem>";return a.childNodes.length!==1}())){a.iepp=a.iepp||{};var c=a.iepp,d=c.html5elements||"abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",e=d.split("|"),f=e.length,g=new RegExp("(^|\\s)("+d+")","gi"),h=new RegExp("<(/*)("+d+")","gi"),i=/^\s*[\{\}]\s*$/,j=new RegExp("(^|[^\\n]*?\\s)("+d+")([^\\n]*)({[\\n\\w\\W]*?})","gi"),k=b.createDocumentFragment(),l=b.documentElement,m=l.firstChild,n=b.createElement("body"),o=b.createElement("style"),p=/print|all/,q;c.getCSS=function(a,b){if(a+""===undefined)return"";var d=-1,e=a.length,f,g=[];while(++d<e){f=a[d];if(f.disabled)continue;b=f.media||b,p.test(b)&&g.push(c.getCSS(f.imports,b),f.cssText),b="all"}return g.join("")},c.parseCSS=function(a){var b=[],c;while((c=j.exec(a))!=null)b.push(((i.exec(c[1])?"\n":c[1])+c[2]+c[3]).replace(g,"$1.iepp_$2")+c[4]);return b.join("\n")},c.writeHTML=function(){var a=-1;q=q||b.body;while(++a<f){var c=b.getElementsByTagName(e[a]),d=c.length,g=-1;while(++g<d)c[g].className.indexOf("iepp_")<0&&(c[g].className+=" iepp_"+e[a])}k.appendChild(q),l.appendChild(n),n.className=q.className,n.id=q.id,n.innerHTML=q.innerHTML.replace(h,"<$1font")},c._beforePrint=function(){o.styleSheet.cssText=c.parseCSS(c.getCSS(b.styleSheets,"all")),c.writeHTML()},c.restoreHTML=function(){n.innerHTML="",l.removeChild(n),l.appendChild(q)},c._afterPrint=function(){c.restoreHTML(),o.styleSheet.cssText=""},r(b),r(k);if(c.disablePP)return;m.insertBefore(o,m.firstChild),o.media="print",o.className="iepp-printshim",a.attachEvent("onbeforeprint",c._beforePrint),a.attachEvent("onafterprint",c._afterPrint)}})(this,document);@*/
-// http://bit.ly/ishiv | WTFPL (and now GPL) License
+
+// http://bit.ly/ishiv | Dual licensed under the MIT or GPL Version 2 licenses
+// http://jdbartlett.github.com/innershiv
+// Allows browsers who aren't natively capable of rendering unknown elements
+// when they are created outside of the active DOM to do so.
 window.innerShiv=function(){function h(c,e,b){return/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i.test(b)?c:e+"></"+b+">"}var c,e=document,j,g="abbr article aside audio canvas datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video".split(" ");return function(d,i){if(!c&&(c=e.createElement("div"),c.innerHTML="<nav></nav>",j=c.childNodes.length!==1)){for(var b=e.createDocumentFragment(),f=g.length;f--;)b.createElement(g[f]);b.appendChild(c)}d=d.replace(/^\s\s*/,"").replace(/\s\s*$/,"").replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,"").replace(/(<([\w:]+)[^>]*?)\/>/g,h);c.innerHTML=(b=d.match(/^<(tbody|tr|td|col|colgroup|thead|tfoot)/i))?"<table>"+d+"</table>":d;b=b?c.getElementsByTagName(b[1])[0].parentNode:c;if(i===!1)return b.childNodes;for(var f=e.createDocumentFragment(),k=b.childNodes.length;k--;)f.appendChild(b.firstChild);return f}}();
-// Monkeypatch the innerShiv in the ajax insert method.
-(function(){var a=Drupal.ajax.prototype.commands.insert;Drupal.ajax.prototype.commands.insert=function(b,c,d){c.data=innerShiv(c.data,false);a(b,c,d)}})()
+
+// Monkeypatch the innerShiv in the ajax insert method. This will allow browsers
+// who aren't natively capable of rendering unknown elements when they are
+// created outside of the active DOM.
+(function(){var _insert=Drupal.ajax.prototype.commands.insert;Drupal.ajax.prototype.commands.insert=function(ajax,response,status){response.data=innerShiv(response.data,false);_insert(ajax,response,status);}})();
 /*! Respond.js: min/max-width media query polyfill. (c) Scott Jehl. MIT/GPLv2 Lic. j.mp/respondjs  */
 (function(e,h){e.respond={};respond.update=function(){};respond.mediaQueriesSupported=h;if(h){return}var u=e.document,r=u.documentElement,i=[],k=[],p=[],o={},g=30,f=u.getElementsByTagName("head")[0]||r,b=f.getElementsByTagName("link"),d=[],a=function(){var B=b,w=B.length,z=0,y,x,A,v;for(;z<w;z++){y=B[z],x=y.href,A=y.media,v=y.rel&&y.rel.toLowerCase()==="stylesheet";if(!!x&&v&&!o[x]){if(y.styleSheet&&y.styleSheet.rawCssText){m(y.styleSheet.rawCssText,x,A);o[x]=true}else{if(!/^([a-zA-Z]+?:(\/\/)?)/.test(x)||x.replace(RegExp.$1,"").split("/")[0]===e.location.host){d.push({href:x,media:A})}}}}t()},t=function(){if(d.length){var v=d.shift();n(v.href,function(w){m(w,v.href,v.media);o[v.href]=true;t()})}},m=function(G,v,x){var E=G.match(/@media[^\{]+\{([^\{\}]+\{[^\}\{]+\})+/gi),H=E&&E.length||0,v=v.substring(0,v.lastIndexOf("/")),w=function(I){return I.replace(/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,"$1"+v+"$2$3")},y=!H&&x,B=0,A,C,D,z,F;if(v.length){v+="/"}if(y){H=1}for(;B<H;B++){A=0;if(y){C=x;k.push(w(G))}else{C=E[B].match(/@media ([^\{]+)\{([\S\s]+?)$/)&&RegExp.$1;k.push(RegExp.$2&&w(RegExp.$2))}z=C.split(",");F=z.length;for(;A<F;A++){D=z[A];i.push({media:D.match(/(only\s+)?([a-zA-Z]+)(\sand)?/)&&RegExp.$2,rules:k.length-1,minw:D.match(/\(min\-width:[\s]*([\s]*[0-9]+)px[\s]*\)/)&&parseFloat(RegExp.$1),maxw:D.match(/\(max\-width:[\s]*([\s]*[0-9]+)px[\s]*\)/)&&parseFloat(RegExp.$1)})}}j()},l,q,j=function(E){var v="clientWidth",x=r[v],D=u.compatMode==="CSS1Compat"&&x||u.body[v]||x,z={},C=u.createDocumentFragment(),B=b[b.length-1],w=(new Date()).getTime();if(E&&l&&w-l<g){clearTimeout(q);q=setTimeout(j,g);return}else{l=w}for(var y in i){var F=i[y];if(!F.minw&&!F.maxw||(!F.minw||F.minw&&D>=F.minw)&&(!F.maxw||F.maxw&&D<=F.maxw)){if(!z[F.media]){z[F.media]=[]}z[F.media].push(k[F.rules])}}for(var y in p){if(p[y]&&p[y].parentNode===f){f.removeChild(p[y])}}for(var y in z){var G=u.createElement("style"),A=z[y].join("\n");G.type="text/css";G.media=y;if(G.styleSheet){G.styleSheet.cssText=A}else{G.appendChild(u.createTextNode(A))}C.appendChild(G);p.push(G)}f.insertBefore(C,B.nextSibling)},n=function(v,x){var w=c();if(!w){return}w.open("GET",v,true);w.onreadystatechange=function(){if(w.readyState!=4||w.status!=200&&w.status!=304){return}x(w.responseText)};if(w.readyState==4){return}w.send(null)},c=(function(){var v=false;try{v=new XMLHttpRequest()}catch(w){v=new ActiveXObject("Microsoft.XMLHTTP")}return function(){return v}})();a();respond.update=a;function s(){j(true)}if(e.addEventListener){e.addEventListener("resize",s,false)}else{if(e.attachEvent){e.attachEvent("onresize",s)}}})(this,(function(f){if(f.matchMedia){return true}var e,i=document,c=i.documentElement,g=c.firstElementChild||c.firstChild,h=!i.body,d=i.body||i.createElement("body"),b=i.createElement("div"),a="only all";b.id="mq-test-1";b.style.cssText="position:absolute;top:-99em";d.appendChild(b);b.innerHTML='_<style media="'+a+'"> #mq-test-1 { width: 9px; }</style>';if(h){c.insertBefore(d,g)}b.removeChild(b.firstChild);e=b.offsetWidth==9;if(h){c.removeChild(d)}else{d.removeChild(b)}return e})(this));
\ No newline at end of file
diff --git a/template.php b/template.php
index 503e863..ff9a9d9 100644
--- a/template.php
+++ b/template.php
@@ -153,6 +153,24 @@ function zen_preprocess_html(&$variables, $hook) {
   }
   $variables['skip_link_anchor'] = theme_get_setting('zen_skip_link_anchor');
   $variables['skip_link_text'] = theme_get_setting('zen_skip_link_text');
+
+  if (theme_get_setting('zen_html5_respondjs')) {
+  $element = array(
+    'element' => array(
+      '#tag' => 'script',
+      '#value' => '',
+      '#attributes' => array(
+      'src' => file_create_url(drupal_get_path('theme', 'zen') . '/js/html5-respond.js'),
+      ),
+    ),
+  );
+    $script = theme('html_tag', $element);
+    $variables['html5shiv_respondjs'] = "\n<!--[if lt IE 9]>\n" . $script . "<![endif]-->\n";
+  }
+  else {
+    $variables['html5shiv_respondjs'] = '';
+  }
+
 }
 
 /**
diff --git a/templates/html.tpl.php b/templates/html.tpl.php
index 7c90918..1831aa6 100644
--- a/templates/html.tpl.php
+++ b/templates/html.tpl.php
@@ -86,9 +86,7 @@
 
   <?php print $styles; ?>
   <?php print $scripts; ?>
-  <!--[if lt IE 9]>
-  <script src="<?php print $base_path . $path_to_zen; ?>/js/html5-respond.js"></script>
-  <![endif]-->
+  <?php print $html5shiv_respondjs; ?>
 </head>
 <body class="<?php print $classes; ?>" <?php print $attributes;?>>
   <?php if ($skip_link_text && $skip_link_anchor): ?>
diff --git a/theme-settings.php b/theme-settings.php
index 442fdad..e2efc66 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -109,4 +109,15 @@ function zen_form_system_theme_settings_alter(&$form, $form_state, $form_id = NU
     '#default_value' => theme_get_setting('zen_wireframes'),
     '#description'   => t('<a href="!link">Wireframes</a> are useful when prototyping a website.', array('!link' => 'http://www.boxesandarrows.com/view/html_wireframes_and_prototypes_all_gain_and_no_pain')),
   );
+    $form['at']['conditional_js'] = array(
+    '#type' => 'fieldset',
+    '#weight' => '97',
+    '#title' => t('Conditional Javascript'),
+    '#description' => t('Enable or disable conditional javascript'),
+  );
+  $form['at']['conditional_js']['classes']['zen_html5_respondjs'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('html5-respond.js') . '<span class="description">' . t('Polyfill IE 6-8 with HTML5 elements and min/max-width CSS3 Media Queries') . '</span>',
+    '#default_value' => theme_get_setting('zen_html5_respondjs'),
+  );
 }
diff --git a/zen.info b/zen.info
index ba29ad5..fe14a6b 100644
--- a/zen.info
+++ b/zen.info
@@ -27,5 +27,6 @@ settings[zen_skip_link_anchor]     = main-menu
 settings[zen_skip_link_text]       = Jump to navigation
 settings[zen_rebuild_registry]     = 0
 settings[zen_wireframes]           = 0
+settings[zen_html5_respondjs]      = 1
 
 plugins[panels][layouts] = layouts