diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index e16aa98..1c63098 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2056,8 +2056,6 @@ function drupal_pre_render_html(array $element) {
       'type' => $type,
     );
   }
-  // HTML5 Shiv
-  $element['#attached']['library'][] = array('core', 'html5shiv');
 
   return $element;
 }
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 4521d22..06cf578 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -268,6 +268,12 @@ function system_element_info() {
   $types['html'] = array(
     '#theme' => 'html',
     '#pre_render' => array('drupal_pre_render_html'),
+    // HTML5 Shiv
+    '#attached' => array(
+      'library' => array(
+        array('core', 'html5shiv')
+      ),
+    ),
   );
   $types['form'] = array(
     '#method' => 'post',