diff --git a/include/items.php b/include/items.php
index 839baf4b6..688ef244a 100644
--- a/include/items.php
+++ b/include/items.php
@@ -123,11 +123,16 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
 
 	$atom = '';
 
+	$hub = get_config('system','huburl');
+
+	$hubxml = ((strlen($hub)) ? '<link rel="hub" href="' . xmlify($hub) . '" />' . "\n" : '');
+
 
 	$atom .= replace_macros($feed_template, array(
 			'$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner_nick),
 			'$feed_title'   => xmlify($owner['name']),
 			'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
+			'$hub'          => $hubxml,
 			'$name'         => xmlify($owner['name']),
 			'$profile_page' => xmlify($owner['url']),
 			'$photo'        => xmlify($owner['photo']),
diff --git a/include/notifier.php b/include/notifier.php
index 967f4ff55..c339d2fb3 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -83,6 +83,8 @@
 	else
 		killme();
 
+	$hub = get_config('system','huburl');
+
 	if($cmd != 'mail') {
 
 		require_once('include/group.php');
@@ -138,11 +140,14 @@
 
 	$atom = '';
 
+	$hubxml = ((strlen($hub)) ? '<link rel="hub" href="' . xmlify($hub) . '" />' . "\n" : '');
+	
 
 	$atom .= replace_macros($feed_template, array(
 			'$feed_id'      => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
 			'$feed_title'   => xmlify($owner['name']),
 			'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
+			'$hub'          => $hubxml,
 			'$name'         => xmlify($owner['name']),
 			'$profile_page' => xmlify($owner['url']),
 			'$photo'        => xmlify($owner['photo']),
@@ -297,5 +302,10 @@
 		}
 	}
 
+	if((strlen($hub)) && ($cmd !== 'mail') && (followup == false)) {
+		$params = array('hub.mode' => 'publish', 'hub.url' => $a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
+		post_url($hub,$params);
+	}
+
 	killme();
 
diff --git a/mod/pubsub.php b/mod/pubsub.php
index 3a3122d72..65705069a 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -104,7 +104,7 @@ function pubsub_post(&$a) {
 
 	consume_feed($xml,$importer,$contact);
 
-	hub_post_return();;
+	hub_post_return();
 
 }
 
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
index 56bd278ea..893d42036 100644
--- a/view/atom_feed.tpl
+++ b/view/atom_feed.tpl
@@ -10,6 +10,7 @@
   <title>$feed_title</title>
   <generator uri="http://mistpark.com" version="2.0">Mistpark</generator>
   <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
+  $hub
 
   <updated>$feed_updated</updated>