-			<link rel="alternate" type="text/html" href="<?php $Blog->disp( 'blogurl', 'xml' ) ?>" />
-			<link rel="self" type="text/html" href="<?php $Blog->disp( 'atom_url', 'xmlattr' ) ?>" />
-			<id><?php $Blog->disp( 'atom_url', 'xmlattr' ); /* TODO: may need a regenerate_url() */ ?></id>
+			<link rel="alternate" type="text/html" href="<?php $Blog->disp( 'blogurl', 'xmlattr' ) ?>" />
+			<link rel="self" type="<?php echo $debug? 'application/xml' : 'application/atom+xml' ?>" href="<?php $Blog->disp( 'atom_url', 'xmlattr' ) ?>" />
+			<id><?php $Blog->disp( 'atom_url', 'xml' ); /* TODO: may need a regenerate_url() */ ?></id>

Thie current one is valid as is, still.