diff --git a/lib/common.php b/lib/common.php
index f215192f45..0355d01e3a 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -144,6 +144,8 @@ $config =
         array('enabled' => false,
               'server' => 'localhost',
               'port' => 11211),
+ 		'ping' =>
+        array('notify' => array()),
         'inboxes' =>
         array('enabled' => true), # on by default for new sites
         );
diff --git a/lib/ping.php b/lib/ping.php
new file mode 100644
index 0000000000..32c0b9806a
--- /dev/null
+++ b/lib/ping.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, 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/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+function ping_broadcast_notice($notice) {
+	if (!$notice->is_local) {
+		return;
+	}
+	
+	# Array of servers, URL => type
+	$notify = common_config('ping', 'notify');
+	$profile = $notice->getProfile();
+	$tags = ping_notice_tags($notice);
+	
+	foreach ($notify as $notify_url => $type) {
+		switch ($type) {
+		 case 'xmlrpc':
+		 case 'extended':
+			$req = xmlrpc_encode_request('weblogUpdates.ping',
+										 array($profile->nickname, # site name
+											   common_local_url('showstream', 
+																array('nickname' => $profile->nickname)),
+											   common_local_url('shownotice',
+																array('notice' => $notice->id)),
+											   common_local_url('userrss', 
+																array('nickname' => $profile->nickname)),
+											   $tags));
+			
+			# We re-use this tool's fetcher, since it's pretty good
+	
+			$fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
+
+			if (!$fetcher) {
+				common_log(LOG_WARNING, 'Failed to initialize Yadis fetcher.', __FILE__);
+				return false;
+			}
+	
+			$result = $fetcher->post($notify_url,
+									 $req);
+											   
+		 case 'get':
+		 case 'post':			
+		 default:
+			common_log(LOG_WARNING, 'Unknown notify type for ' . $notify_url . ': ' . $type);
+										   }
+	}
+}
+		
+function ping_notice_tags($notice) {
+	$tag = new Notice_tag();
+	$tag->notice_id = $notice->id;
+	$tags = array();
+	if ($tag->find()) {
+		while ($tag->fetch()) {
+			$tags[] = $tag->tag;
+		}
+		$tag->free();
+		unset($tag);
+		return implode('|', $tags);
+	}
+	return NULL;
+}
\ No newline at end of file
diff --git a/lib/util.php b/lib/util.php
index 167508d2b3..9637dc5063 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -852,7 +852,7 @@ function common_broadcast_notice($notice, $remote=false)
 
 function common_enqueue_notice($notice)
 {
-    foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook') as $transport) {
+    foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook', 'ping') as $transport) {
         $qi = new Queue_item();
         $qi->notice_id = $notice->id;
         $qi->transport = $transport;
diff --git a/scripts/pingqueuehandler.php b/scripts/pingqueuehandler.php
new file mode 100644
index 0000000000..55a266e4a4
--- /dev/null
+++ b/scripts/pingqueuehandler.php
@@ -0,0 +1,64 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, 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/>.
+ */
+
+# Abort if called from a web server
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+	print "This script must be run from the command line\n";
+	exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+require_once(INSTALLDIR . '/lib/ping.php');
+require_once(INSTALLDIR . '/lib/queuehandler.php');
+
+set_error_handler('common_error_handler');
+
+class PingQueueHandler extends QueueHandler {
+	
+	function transport() {
+		return 'ping';
+	}
+
+	function start() {
+		$this->log(LOG_INFO, "INITIALIZE");
+		return true;
+	}
+
+	function handle_notice($notice) {
+		return ping_broadcast_notice($notice);
+	}
+	
+	function finish() {
+	}
+}
+
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
+mb_internal_encoding('UTF-8');
+
+$id = ($argc > 1) ? $argv[1] : NULL;
+
+$handler = new PingQueueHandler($id);
+
+$handler->runOnce();