diff --git a/src/Module/Feed.php b/src/Module/Feed.php
index 4c7059c038..e5ebe2a4d6 100644
--- a/src/Module/Feed.php
+++ b/src/Module/Feed.php
@@ -44,6 +44,7 @@ class Feed extends BaseModule
 			case 'posts':
 			case 'comments':
 			case 'activity':
+				// Correct type names, no change needed
 				break;
 			case 'replies':
 				$type = 'comments';
@@ -53,8 +54,8 @@ class Feed extends BaseModule
 		}
 
 		$nickname = $a->argv[1];
-		header("Content-type: application/atom+xml");
+		header("Content-type: application/atom+xml; charset=utf-8");
 		echo OStatus::feed($nickname, $last_update, 10, $type, $nocache, true);
-		killme();
+		exit();
 	}
 }