diff --git a/include/ostatus.php b/include/ostatus.php
index d2d25b76ff..bcaef4f439 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -2,6 +2,7 @@
 require_once("include/Contact.php");
 require_once("include/threads.php");
 require_once("include/html2bbcode.php");
+require_once("include/bbcode.php");
 require_once("include/items.php");
 require_once("mod/share.php");
 require_once("include/enotify.php");
@@ -141,7 +142,7 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
 
 			$value = $xpath->evaluate('atom:author/poco:note/text()', $context)->item(0)->nodeValue;
 			if ($value != "")
-				$contact["about"] = $value;
+				$contact["about"] = html2bbcode($value);
 
 			$value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()', $context)->item(0)->nodeValue;
 			if ($value != "")
@@ -1288,7 +1289,7 @@ function ostatus_add_author($doc, $owner, $profile) {
 
 	xml_add_element($doc, $author, "poco:preferredUsername", $owner["nick"]);
 	xml_add_element($doc, $author, "poco:displayName", $profile["name"]);
-	xml_add_element($doc, $author, "poco:note", $profile["about"]);
+	xml_add_element($doc, $author, "poco:note", bbcode($profile["about"]));
 
 	if (trim($owner["location"]) != "") {
 		$element = $doc->createElement("poco:address");