diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index 0cfaaff..9d542a9 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -8,7 +8,10 @@
   <?php print $scripts; ?>    
   <!-- www.phpied.com/conditional-comments-block-downloads/ -->
   <!--[if IE]><![endif]-->
-  <!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+  <?php // Add HTML5 shiv if Modernizr is not included 
+    if (!theme_get_setting('html5_base_modernizr')): ?>
+   <!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+  <?php endif; ?>
 </head>
 
   <!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->