diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index c25e768..e4ead34 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -33,7 +33,8 @@ INSTALLED_APPS = INSTALLED_APPS + (
 
     # Feedzilla and deps
     'feedzilla',
-    'tagging',
+    'taggit',
+    'taggit_templatetags',
     'common',
 )
 
diff --git a/src/planet/templates/feedzilla/_post_template.html b/src/planet/templates/feedzilla/_post_template.html
index 5ef998a..933a0e2 100644
--- a/src/planet/templates/feedzilla/_post_template.html
+++ b/src/planet/templates/feedzilla/_post_template.html
@@ -1,4 +1,3 @@
-{% load tagging_tags %}
 {% load i18n %}
 
 <div class="blog-post-item">
@@ -17,11 +16,10 @@
         <b><a href="{{ post.get_absolute_url }}">{% trans "Read original" %}</a></b>
     </div>
 
-    {% if post.tags %}
+    {% if post.tags.count %}
     <div class="tags">
       <span><b>Tags:</b>
-        {% tags_for_object post as tags %}
-        {% for tag in tags %}
+        {% for tag in post.tags.all %}
           <a href="{% url "feedzilla_tag" tag.name %}" class="tag">{{ tag }}</a>
         {% endfor %}
       </span>
diff --git a/src/planet/templates/feedzilla/base.html b/src/planet/templates/feedzilla/base.html
index 153aeda..18d042e 100644
--- a/src/planet/templates/feedzilla/base.html
+++ b/src/planet/templates/feedzilla/base.html
@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 {% load i18n %}
 {% load feedzilla_tags %}
+{% load taggit_extras %}
 
 {% block main-content %}
     <h2>{% trans 'Planet' %}</h2>
@@ -16,7 +17,7 @@
       </div>
       <div class="box">
         <h3>{% trans 'Tags' %}</h3>
-        {% feedzilla_tag_cloud %}
+        {% include_tagcloud 'feedzilla.post' %}
       </div>
       <div class="box">
         <h3>{% trans 'Source Blogs' %}</h3>
--
libgit2 0.21.2