diff --git a/functions.php b/functions.php
index d37f4bdf4..d8faef6aa 100644
--- a/functions.php
+++ b/functions.php
@@ -4739,4 +4739,10 @@
 			(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
 	}
 
+        function add_feed_url() {
+		$url_path = 'http://' . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+		$url_path .= "?op=pref-feeds&quiet=1&subop=add&feed_url=%s";
+		return $url_path;
+        }
+
 ?>
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 25cbf707a..6df9804b2 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1035,6 +1035,15 @@
 				value=\"".__('Export OPML')."\">";			
 
 
+		print "<h3>" . __("Firefox Integration") . "</h3>";
+                
+                print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.');
+		print "</p><p class=\"small\"> <a href='javascript:window.navigator.registerContentHandler(" .
+                      "\"application/vnd.mozilla.maybe.feed\", " .
+                      "\"" . add_feed_url() . "\", " . " \"Tiny Tiny RSS\")'>" .
+                      __('Click here to register this site as a feed reader.') . "</a></p>";
+
+
 		print "<h3>".__("Published articles")."</h3>";
 
 		if (!get_pref($link, "_PREFS_PUBLISH_KEY")) {