diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 3eb54ccc36..6c740c4902 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -349,7 +349,7 @@ class TwitapisearchatomAction extends ApiAction
         $ns = $notice->getSource();
         if ($ns) {
             if (!empty($ns->name) && !empty($ns->url)) {
-                $source = '<a href="' . $ns->url . '">' . $ns->name . '</a>';
+                $source = '<a href="' . $ns->url . '" rel="nofollow">' . $ns->name . '</a>';
             } else {
                 $source = $ns->code;
             }
diff --git a/lib/apiaction.php b/lib/apiaction.php
index 8c4dc6c262..2608be227a 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -319,13 +319,13 @@ class ApiAction extends Action
         $ns = $notice->getSource();
         if ($ns) {
             if (!empty($ns->name) && !empty($ns->url)) {
-                $source = '<a href="' . $ns->url . '">' . $ns->name . '</a>';
+                $source = '<a href="' . $ns->url . '" rel="nofollow">' . $ns->name . '</a>';
             } else {
                 $source = $ns->code;
             }
         }
 
-        $twitter_status['source'] = $source;
+        $twitter_status['source'] = htmlentities($source);
         $twitter_status['id'] = intval($notice->id);
 
         $replier_profile = null;