diff --git a/progit/templates/issue.html b/progit/templates/issue.html
index 5dff76a..4930d8b 100644
--- a/progit/templates/issue.html
+++ b/progit/templates/issue.html
@@ -48,6 +48,24 @@
     </aside>
 </h2>
 
+<section id="tags">
+    Tags:
+    {% for tag in issue.tags %}
+    <a href="{{ url_for('view_issues', username=username,
+               repo=repo.name, tags=tag.tag) }}">
+        {{ tag.tag }}</a>{% if not loop.last %},{% endif %}
+    {% endfor %}
+    {% if authenticated and tagform %}
+      <form action="{{ url_for('view_issue', username=username,
+               repo=repo.name, issueid=issueid) }}" method="post">
+        {{ render_field(tagform.tags) }}
+        <input id="add_tags" type="submit"
+            class="submit positive button" value="Add">
+        {{ form.csrf_token }}
+      </form>
+    {% endif %}
+</section>
+
 {{ show_comment(issue.user, issue.date_created, issue.content) }}
 
 {% if issue.comments %}