diff --git a/htdocs/index.php b/htdocs/index.php
index 9ee2aad5d3c0f8b199bab5afcfb5f4be0ba8b6cc..45bcb2bbb21c64e84853c7e156302e00487699a3 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -156,12 +156,8 @@ $smarty->assign("user_messages", $messages);
// Render the results
if (!(isset($no_template)) || (!$no_template)) {
// Send appropriate Content-Type
- if (preg_match('#application/xhtml\+xml#', @$_SERVER['HTTP_ACCEPT'])) {
- header('Content-Type: application/xhtml+xml');
- echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
- } else {
- header('Content-Type: text/html');
- }
+ header('Content-Type:text/html; charset=UTF-8');
+
$smarty->display("head.tpl");
$smarty->display("index.tpl");
diff --git a/templates/head.tpl b/templates/head.tpl
index 2bc226b0d15bce6a4b2197d8b6c5d44603baa230..75a223e6c60a6db83cda0d1370e2e7cd69b8c1b2 100644
--- a/templates/head.tpl
+++ b/templates/head.tpl
@@ -1,6 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$language.code}">
+<!doctype html>
+<html lang="{$language.code}">
<head>
<title>{$title} - SUCS</title>