diff --git a/requirements.txt b/requirements.txt
index 7221792..f10a9e1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,10 +24,9 @@ git+https://github.com/TracyWebTech/django-revproxy/
 django-conversejs
 
 # Feedzilla (planet) and deps
-https://bitbucket.org/lorien/feedzilla/get/tip.tar.gz # Temporarily work around
+feedzilla==0.22
 django-common
 django-taggit
-django-taggit-templatetags
 feedparser
 lxml
 grab
diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index 9fd2ae4..e7672e1 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -36,7 +36,6 @@ INSTALLED_APPS = INSTALLED_APPS + (
     # Feedzilla and deps
     'feedzilla',
     'taggit',
-    'taggit_templatetags',
     'common',
 )
 
diff --git a/src/planet/templates/feedzilla/base.html b/src/planet/templates/feedzilla/base.html
index d6e347e..57b21ff 100644
--- a/src/planet/templates/feedzilla/base.html
+++ b/src/planet/templates/feedzilla/base.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load i18n feedzilla_tags taggit_extras %}
+{% load i18n feedzilla_tags %}
 
 {% block main-content %}
     <h2>{% trans 'Planet' %}</h2>
--
libgit2 0.21.2