diff --git a/templates/index.html b/templates/index.html
index 3560a1e..79b1ce0 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,6 +10,13 @@
            when=article.locale_date,
            category='<a href="%s/%s">%s</a>'|format(SITEURL, article.category.url, article.category)|safe) }}
 
+      {% if article.tags and not HOME_HIDE_TAGS %}
+          &#8226; {{ _('Tagged with') }}
+          {% for tag in article.tags %}
+              <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% if not loop.last %},{% endif %}
+          {% endfor %}
+      {% endif %}
+
       {% if 'post_stats' in PLUGINS %}
         &#8226; {{ article.stats['read_mins'] }} min read
       {% endif %}
diff --git a/translations/babel.cfg b/translations/babel.cfg
index cbbbc92..2274808 100644
--- a/translations/babel.cfg
+++ b/translations/babel.cfg
@@ -1,2 +1 @@
 [jinja2: templates/**.html]
-extensions=jinja2.ext.autoescape,jinja2.ext.with_
diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po
index 6ad1938..8c1cae3 100644
--- a/translations/de/LC_MESSAGES/messages.po
+++ b/translations/de/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  1.2\n"
 "Report-Msgid-Bugs-To: marcelhuth@users.noreply.github.com\n"
-"POT-Creation-Date: 2016-08-13 16:49+0200\n"
+"POT-Creation-Date: 2016-08-24 21:51-0300\n"
 "PO-Revision-Date: 2016-08-13 16:49+0200\n"
 "Last-Translator: Marcel Huth <marcelhuth@users.noreply.github.com>\n"
 "Language: de\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
+"Generated-By: Babel 2.3.4\n"
 
 #: templates/archives.html:2 templates/archives.html:7
 msgid "Archives"
@@ -66,7 +66,11 @@ msgstr "Kategorien"
 msgid "Category %(name)s"
 msgstr "Kategorie %(name)s"
 
-#: templates/index.html:22
+#: templates/index.html:14
+msgid "Tagged with"
+msgstr "Stichw&ouml;rter"
+
+#: templates/index.html:29
 msgid "Continue reading"
 msgstr "Weiterlesen"
 
@@ -99,3 +103,4 @@ msgstr "&Auml;ltere Artikel"
 #: templates/partial/pagination.html:10
 msgid "Newer Posts"
 msgstr "Neuere Artikel"
+
diff --git a/translations/pt_BR/LC_MESSAGES/messages.po b/translations/pt_BR/LC_MESSAGES/messages.po
index d7d58fa..28f13c3 100644
--- a/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/translations/pt_BR/LC_MESSAGES/messages.po
@@ -1,15 +1,15 @@
-# Portuguese (Brazil) translations for PROJECT.
-# Copyright (C) 2016 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+# Portuguese (Brazil) translations for Flex.
+# Copyright (C) 2016 Alexandre Vicenzi
+# This file is distributed under the same license as the Flex project.
+# Alexandre Vicenzi <contact@alexandrevicenzi.com>, 2016.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-08-10 23:14-0300\n"
+"Project-Id-Version: Flex 2.0\n"
+"Report-Msgid-Bugs-To: contact@alexandrevicenzi.com\n"
+"POT-Creation-Date: 2016-08-24 21:51-0300\n"
 "PO-Revision-Date: 2016-08-09 21:46-0300\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Alexandre Vicenzi <contact@alexandrevicenzi.com>\n"
 "Language: pt_BR\n"
 "Language-Team: pt_BR <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Archives"
 msgstr "Arquivos"
 
-#: templates/article.html:18 templates/index.html:10
+#: templates/article.html:17 templates/index.html:9
 #, python-format
 msgid "Posted on %(when)s in %(category)s"
 msgstr "Publicado em %(when)s na categoria %(category)s"
@@ -44,15 +44,15 @@ msgstr "Publicações de %(name)s"
 msgid "Authors"
 msgstr "Autores"
 
-#: templates/base.html:98
+#: templates/base.html:104
 msgid "Home"
-msgstr "Home"
+msgstr "Início"
 
-#: templates/base.html:105
+#: templates/base.html:111
 msgid "Atom"
 msgstr "Atom"
 
-#: templates/base.html:109
+#: templates/base.html:115
 msgid "RSS"
 msgstr "RSS"
 
@@ -65,7 +65,11 @@ msgstr "Categorias"
 msgid "Category %(name)s"
 msgstr "Categoria %(name)s"
 
-#: templates/index.html:22
+#: templates/index.html:14
+msgid "Tagged with"
+msgstr "Com as tags"
+
+#: templates/index.html:29
 msgid "Continue reading"
 msgstr "Continue lendo"
 
@@ -87,7 +91,8 @@ msgstr "Habilite JavaScript para ver os comentários."
 msgid ""
 "Powered by %(pelican_url)s - %(flex_url)s theme by "
 "%(alexandrevicenzi_url)s"
-msgstr "Powered by %(pelican_url)s - O tema %(flex_url)s foi criado por "
+msgstr ""
+"Powered by %(pelican_url)s - O tema %(flex_url)s foi criado por "
 "%(alexandrevicenzi_url)s"
 
 #: templates/partial/pagination.html:5
@@ -97,3 +102,4 @@ msgstr "Anteriores"
 #: templates/partial/pagination.html:10
 msgid "Newer Posts"
 msgstr "Próximos"
+