Index: typo3/sysext/cms/tslib/class.tslib_content.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_content.php	(revision 10073)
+++ typo3/sysext/cms/tslib/class.tslib_content.php	(working copy)
@@ -1369,16 +1369,15 @@
 	}
 
 	/**
-	 * Returns the 'border' attribute for an <img> tag only if the doctype is not xhtml_strict,xhtml_11 or xhtml_2
+	 * Returns the 'border' attribute for an <img> tag only if the doctype is not xhtml_strict, xhtml_11, xhtml_2 or html_5
 	 * or if the config parameter 'disableImgBorderAttr' is not set.
 	 *
 	 * @param	string		the border attribute
 	 * @return	string		the border attribute
 	 */
 	function getBorderAttr($borderAttr) {
-		if (!t3lib_div::inList(	'xhtml_strict,xhtml_11,xhtml_2',
-			$GLOBALS['TSFE']->xhtmlDoctype)
-			&& !$GLOBALS['TSFE']->config['config']['disableImgBorderAttr']) {
+		if (! t3lib_div::inList('xhtml_strict,xhtml_11,xhtml_2,html_5', $GLOBALS['TSFE']->config['config']['doctype']) &&
+				! $GLOBALS['TSFE']->config['config']['disableImgBorderAttr']) {
 			return $borderAttr;
 		}
 	}