--- typo3/sysext/cms/tslib/class.tslib_pagegen.php.orig.php	2007-08-27 13:24:20.826312280 +0200
+++ typo3/sysext/cms/tslib/class.tslib_pagegen.php	2007-08-27 13:24:35.439520030 +0200
@@ -470,8 +470,42 @@
 		$GLOBALS['TSFE']->content.= chr(10).$headTag;
 
 			// Setting charset meta tag:
-		$GLOBALS['TSFE']->content.='
+		if ($GLOBALS['TSFE']->config['config']['doctype'])	{
+			switch((string)$GLOBALS['TSFE']->config['config']['doctype'])	{
+				case 'xhtml_trans':
+					$GLOBALS['TSFE']->content.='
+	<meta http-equiv="Content-Type" content="text/html; charset='.$theCharset.'" />';
+				break;
+				case 'xhtml_strict':
+					$GLOBALS['TSFE']->content.='
+	<meta http-equiv="Content-Type" content="text/html; charset='.$theCharset.'" />';
+				break;
+				case 'xhtml_frames':
+					$GLOBALS['TSFE']->content.='
+	<meta http-equiv="Content-Type" content="text/html; charset='.$theCharset.'" />';
+				break;
+				case 'xhtml_basic':
+					$GLOBALS['TSFE']->content.='
+	<meta http-equiv="Content-Type" content="text/html; charset='.$theCharset.'" />';
+				break;
+				case 'xhtml_11':
+					$GLOBALS['TSFE']->content.='
+	<meta http-equiv="Content-Type" content="application/xhtml+xml; charset='.$theCharset.'" />';
+				break;
+				case 'xhtml_2':
+					$GLOBALS['TSFE']->content.='
 	<meta http-equiv="Content-Type" content="text/html; charset='.$theCharset.'" />';
+				break;
+				case 'none':
+				break;
+				default:
+					$GLOBALS['TSFE']->content.='
+	<meta http-equiv="Content-Type" content="text/html; charset='.$theCharset.'" />';
+			}
+		} else {
+			$GLOBALS['TSFE']->content.='
+	<meta http-equiv="Content-Type" content="text/html; charset='.$theCharset.'" />';
+		}
 
 $GLOBALS['TSFE']->content.='