diff --git a/plugins/OStatus/scripts/update-profile-data.php b/plugins/OStatus/scripts/update-profile-data.php
new file mode 100644
index 0000000000..20f6d57d90
--- /dev/null
+++ b/plugins/OStatus/scripts/update-profile-data.php
@@ -0,0 +1,121 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$longoptions = array('all', 'suspicious', 'quiet');
+
+$helptext = <<<END_OF_HELP
+update-profile-data.php [options] [http://example.com/profile/url]
+
+Rerun profile discovery for the given OStatus remote profile, and save the
+updated profile data (nickname, avatar, bio, etc). Doesn't touch feed state.
+Can be used to clean up after breakages.
+
+Options:
+  --all        Run for all known OStatus profiles
+  --suspicious Run for OStatus profiles with all-numeric nicknames
+               (fixes 0.9.7 prerelease back-compatibility bug)
+
+END_OF_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+function showProfileInfo($oprofile) {
+    if ($oprofile->isGroup()) {
+        echo "group\n";
+    } else {
+        $profile = $oprofile->localProfile();
+        foreach (array('nickname', 'bio', 'homepage', 'location') as $field) {
+            print "  $field: {$profile->$field}\n";
+        }
+    }
+    echo "\n";
+}
+
+function fixProfile($uri) {
+    $oprofile = Ostatus_profile::staticGet('uri', $uri);
+
+    if (!$oprofile) {
+        print "No OStatus remote profile known for URI $uri\n";
+        return false;
+    }
+
+    echo "Before:\n";
+    showProfileInfo($oprofile);
+
+    $feedurl = $oprofile->feeduri;
+    $client = new HttpClient();
+    $response = $client->get($feedurl);
+    if ($response->isOk()) {
+        echo "Updating profile from feed: $feedurl\n";
+        $dom = new DOMDocument();
+        if ($dom->loadXML($response->getBody())) {
+            $feed = $dom->documentElement;
+            $entries = $dom->getElementsByTagNameNS(Activity::ATOM, 'entry');
+            if ($entries->length) {
+                $entry = $entries->item(0);
+                $activity = new Activity($entry, $feed);
+                $oprofile->checkAuthorship($activity);
+                echo "  (ok)\n";
+            } else {
+                echo "  (no entry; skipping)\n";
+                return false;
+            }
+        } else {
+            echo "  (bad feed; skipping)\n";
+            return false;
+        }
+    } else {
+        echo "Failed feed fetch: {$response->getStatus()} for $feedurl\n";
+        return false;
+    }
+
+    echo "After:\n";
+    showProfileInfo($oprofile);
+    return true;
+}
+
+$ok = true;
+if (have_option('all')) {
+    $oprofile = new Ostatus_profile();
+    $oprofile->find();
+    echo "Found $oprofile->N profiles:\n\n";
+    while ($oprofile->fetch()) {
+        $ok = fixProfile($oprofile->uri) && $ok;
+    }
+} else if (have_option('suspicious')) {
+    $oprofile = new Ostatus_profile();
+    $oprofile->joinAdd(array('profile_id', 'profile:id'));
+    $oprofile->whereAdd("nickname rlike '^[0-9]$'");
+    $oprofile->find();
+    echo "Found $oprofile->N matching profiles:\n\n";
+    while ($oprofile->fetch()) {
+        $ok = fixProfile($oprofile->uri) && $ok;
+    }
+} else if (!empty($args[0]) && Validate::uri($args[0])) {
+    $uri = $args[0];
+    $ok = fixProfile($uri);
+} else {
+    print "$helptext";
+    $ok = false;
+}
+
+exit($ok ? 0 : 1);