diff --git a/actions/public.php b/actions/public.php
index 6ab9d1de9c..90e0e6e259 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -226,8 +226,8 @@ class PublicAction extends Action
         $ibs->show();
         $pop = new PopularNoticeSection($this);
         $pop->show();
-        $gbp = new GroupsByMembersSection($this);
-        $gbp->show();
+        $cloud = new PublicTagCloudSection($this);
+        $cloud->show();
         $feat = new FeaturedUsersSection($this);
         $feat->show();
     }
diff --git a/lib/publictagcloudsection.php b/lib/publictagcloudsection.php
new file mode 100644
index 0000000000..04cca16108
--- /dev/null
+++ b/lib/publictagcloudsection.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Public tag cloud section
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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/>.
+ *
+ * @category  Widget
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Public tag cloud section
+ *
+ * @category Widget
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+class PublicTagCloudSection extends TagCloudSection
+{
+    function __construct($out=null)
+    {
+        parent::__construct($out);
+    }
+
+    function title()
+    {
+        // TRANS: Title for inbox tag cloud section.
+        return _m('TITLE', 'Trending topics');
+    }
+
+    function getTags()
+    {
+        $profile = Profile::current();
+
+        if (empty($profile)) {
+            $keypart = sprintf('Notice:public_tag_cloud:null');
+        } else {
+            $keypart = sprintf('Notice:public_tag_cloud:%d', $profile->id);
+        }
+
+        $tag = Memcached_DataObject::cacheGet($keypart);
+
+        if ($tag === false) {
+
+            $stream = new PublicNoticeStream($profile);
+
+            $ids = $stream->getNoticeIds(0, 500, null, null);
+
+            $weightexpr = common_sql_weight('notice_tag.created', common_config('tag', 'dropoff'));
+            // @fixme should we use the cutoff too? Doesn't help with indexing per-user.
+
+            $qry = 'SELECT notice_tag.tag, '.
+                $weightexpr . ' as weight ' .
+                'FROM notice_tag JOIN notice ' .
+                'ON notice_tag.notice_id = notice.id ' .
+                'WHERE notice.id in (' . implode(',', $ids) . ')'.
+                'GROUP BY notice_tag.tag ' .
+                'ORDER BY weight DESC ';
+
+            $limit = TAGS_PER_SECTION;
+            $offset = 0;
+
+            if (common_config('db','type') == 'pgsql') {
+                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+            } else {
+                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+            }
+
+            $t = new Notice_tag();
+
+            $t->query($qry);
+
+            $tag = array();
+
+            while ($t->fetch()) {
+                $tag[] = clone($t);
+            }
+
+            Memcached_DataObject::cacheSet($keypart, $tag, 60 * 60 * 24);
+        }
+
+        return new ArrayWrapper($tag);
+    }
+
+    function showMore()
+    {
+    }
+}