diff --git a/scripts/delete_orphan_files.php b/scripts/delete_orphan_files.php
new file mode 100755
index 0000000000..ad575187bd
--- /dev/null
+++ b/scripts/delete_orphan_files.php
@@ -0,0 +1,66 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, 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__) . '/..'));
+
+$shortoptions = 'y';
+$longoptions = array('yes');
+
+$helptext = <<<END_OF_HELP
+delete_orphan_files.php [options]
+Deletes all files and their File entries where there is no link to a
+Notice entry. Good for cleaning up after user deletion or so where the
+attached files weren't removed as well.
+
+  -y --yes      do not wait for confirmation
+
+Will print '.' for each deleted File entry and 'x' if it also had a locally stored file.
+
+END_OF_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (!have_option('y', 'yes')) {
+    print "About to delete local files that are not related to a Notice. Are you sure? [y/N] ";
+    $response = fgets(STDIN);
+    if (strtolower(trim($response)) != 'y') {
+        print "Aborting.\n";
+        exit(0);
+    }
+}
+
+print "Finding File entries...";
+$file = new File();
+$sql = 'SELECT * FROM file WHERE NOT EXISTS (SELECT id FROM file_to_post WHERE file.id=file_id);';
+if ($file->query($sql) !== false) {
+    print " Deleting {$file->N} entries: ";
+    while ($file->fetch()) {
+        try {
+            $file->getPath();
+            $file->delete();
+            print 'x';
+        } catch (Exception $e) {
+            // either FileNotFound exception or ClientException
+            $file->delete();
+            print '.';
+        }
+    }
+}
+print "\nDONE.\n";