diff -ruN sks-1.0.8-old/dbserver.ml sks-1.0.8/dbserver.ml
--- sks-1.0.8-old/dbserver.ml	2004-10-06 10:40:48.000000000 +0200
+++ sks-1.0.8/dbserver.ml	2004-10-18 22:41:20.000000000 +0200
@@ -203,7 +203,7 @@
     match request.kind with
       | Stats -> 
 	  plerror 4 "/pks/lookup: DB Stats request";
-	  ("text/html", !last_stat_page)
+	  ("text/html; charset=UTF-8", !last_stat_page)
       | Get -> 
 	  plerror 4 "/pks/lookup: Get request (%s)"
 	    (String.concat " " request.search);
@@ -211,7 +211,7 @@
 	  let keys = clean_keys request keys in
 	  let keystr = Key.to_string_multiple keys in
 	  let aakeys = Armor.encode_pubkey_string keystr in
-	  ("text/html",
+	  ("text/html; charset=UTF-8",
 	   HtmlTemplates.page  
 	     ~title:(sprintf "Public Key Server -- Get ``%s ''" 
 		       (String.concat ~sep:" " request.search))
@@ -235,7 +235,7 @@
 	  in
 	  let keystr = Key.to_string key in
 	  let aakeys = Armor.encode_pubkey_string keystr in
-	  ("text/html",
+	  ("text/html; charset=UTF-8",
 	   HtmlTemplates.page  
 	     ~title:(sprintf "Public Key Server -- Get ``%s ''" hash_str)
 	     ~body:(sprintf "\r\n<pre>\r\n%s\r\n</pre>\r\n" aakeys)
@@ -267,7 +267,7 @@
 		let pre = HtmlTemplates.preformat_list 
 			    (Index.keyinfo_header request :: output)
 		in
-		("text/html",
+		("text/html; charset=UTF-8",
 		 HtmlTemplates.page ~body:pre
 		   ~title:(sprintf "Search results for '%s'" 
 			     (String.concat ~sep:" " request.search))
@@ -387,7 +387,7 @@
 	      let fname = convert_web_fname "index.html" in 
 	      let text = read_file fname in
 	      cout#write_string text;
-	      "text/html"
+	      "text/html; charset=UTF-8"
 	    else 
 	      (try 
 		 let extension = get_extension base in
@@ -450,7 +450,7 @@
 		  cout#write_string (sprintf "%d keys added succesfully.<br>" !ctr)
 		);
 		cout#write_string "</html></body>";
-		"text/html"
+		"text/html; charset=UTF-8"
 	    | "/pks/hashquery" ->
 		plerror 4 "Handling /pks/hashquery"; 
 		let sin = new Channel.string_in_channel body 0 in
@@ -466,7 +466,7 @@
 		cout#write_string (HtmlTemplates.page 
 				     ~title:"Unexpected POST request" 
 				     ~body:"");
-		"text/html"
+		"text/html; charset=UTF-8"
 
 
   (** Prepare handler for use with eventloop by transforming system
diff -ruN sks-1.0.8-old/wserver.ml sks-1.0.8/wserver.ml
--- sks-1.0.8-old/wserver.ml	2004-10-04 04:07:50.000000000 +0200
+++ sks-1.0.8/wserver.ml	2004-10-18 22:40:52.000000000 +0200
@@ -236,7 +236,7 @@
 
 
 
-let send_result cout ?(error_code = 200) ?(content_type = "text/html") body =
+let send_result cout ?(error_code = 200) ?(content_type = "text/html; charset=UTF-8") body =
   fprintf cout "HTTP/1.0 %03d OK\r\n" error_code;
   fprintf cout "Server: sks_www/%s\r\n" version;
   fprintf cout "Content-type: %s\r\n\r\n" content_type;
@@ -301,7 +301,7 @@
 	    ignore (Unix.alarm recover_timeout);
 	    plerror 2 "Error handling request %s: %s"
 	      (request_to_string request) (Common.err_to_string e);
-	    let content_type = "text/html" in
+	    let content_type = "text/html; charset=UTF-8" in
 	    let output = 
 	      (HtmlTemplates.page ~title:"Error handling request"
 		 ~body:(sprintf "Error handling request.  Exception raised: %s"