diff --git a/mainpage/settings.py b/mainpage/settings.py
index ba9787c0..60978d21 100644
--- a/mainpage/settings.py
+++ b/mainpage/settings.py
@@ -174,6 +174,16 @@
 WIKI_LOCK_DURATION = 30
 WIKI_URL_RE = r"[:\-\w ]+"
 WIKI_WORD_RE = r"[:\-\w ]+"
+# List pages below the URL '/wiki/...' here if they are dynamically created
+WIKI_SPECIAL_PAGES = [
+    "list",
+    "search",
+    "history",
+    "feeds",
+    "observe",
+    "edit",
+    "tag_list",
+]
 
 ######################
 # User configuration #
@@ -203,9 +213,14 @@
 ####################
 # threadedcomments #
 ####################
-
 DEFAULT_MARKUP = 1  # "markdown"
 
+##################
+# django-tagging #
+##################
+FORCE_LOWERCASE_TAGS = True
+MAX_TAG_LENGTH = 20
+
 ##################################
 # Uploading files and validation #
 ##################################
diff --git a/mainpage/templatetags/wl_markdown.py b/mainpage/templatetags/wl_markdown.py
index b3f720d8..ceb0569e 100644
--- a/mainpage/templatetags/wl_markdown.py
+++ b/mainpage/templatetags/wl_markdown.py
@@ -142,7 +142,7 @@ def _classify_link(tag):
             return
 
         # Wiki special pages are also not counted
-        if article_name in ["list", "search", "history", "feeds", "observe", "edit"]:
+        if article_name in settings.WIKI_SPECIAL_PAGES:
             tag["class"] = "specialLink"
             return
 
diff --git a/wiki/models.py b/wiki/models.py
index 97cfca83..90cd5b8b 100644
--- a/wiki/models.py
+++ b/wiki/models.py
@@ -13,7 +13,7 @@
 from django.contrib.contenttypes.fields import GenericRelation, GenericForeignKey
 
 from tagging.fields import TagField
-from tagging.models import Tag
+
 from wlimages.models import Image
 
 try:
diff --git a/wiki/static/css/wiki.css b/wiki/static/css/wiki.css
index 5216b900..bb356889 100644
--- a/wiki/static/css/wiki.css
+++ b/wiki/static/css/wiki.css
@@ -9,7 +9,7 @@
 	float: right;
 	max-width: 20em;
 }
-		
+
 .toc ul {
 	padding-left: 1.8em;
 }
@@ -59,7 +59,7 @@
 	text-align: left;
 }
 
-#edit_wiki_page_form #id_title,#id_comment {
+#edit_wiki_page_form #id_title, #id_comment, #id_tags {
 	width: 100%;
 }
 
diff --git a/wiki/templates/wiki/edit.html b/wiki/templates/wiki/edit.html
index d336525f..7a32e320 100644
--- a/wiki/templates/wiki/edit.html
+++ b/wiki/templates/wiki/edit.html
@@ -16,19 +16,19 @@
 
 	$(document).ready(function() {
 		// Insert rendered markup for preview
-		$("#id_preview").click(function(){ 
+		$("#id_preview").click(function(){
 			// Activate preview
 			$("#preview").html("<h3>Preview</h3>\n<hr>\n<div class=\"wiki_article\" id=\"content_preview\">Loading...</div>\n<hr>");
-			$("#content_preview").load( "{% url 'wiki_preview' %}", 
+			$("#content_preview").load( "{% url 'wiki_preview' %}",
 				{"body": $("#id_content").val()});
 		});
 
-	{% ifequal new_article 0 %} 
-		// Insert diff  
-		$("#id_diff").click(function(){ 
+	{% ifequal new_article 0 %}
+		// Insert diff
+		$("#id_diff").click(function(){
 			// Activate preview
 			$("#diff").html("<h3>Diff</h3>\n<hr>\n<div id=\"content_diff\">Loading...</div>\n<hr>");
-			$("#content_diff").load( "{% url 'wiki_preview_diff' %}", 
+			$("#content_diff").load( "{% url 'wiki_preview_diff' %}",
 				{"body": $("#id_content").val(), "article": {{ object_id }} });
 		});
 	{%endifequal%}
@@ -54,6 +54,7 @@ <h1>{% trans "Editing" %} {{ article.title }}</h1>
 	{% endif %}
 	<p>
 	You can edit the wiki pages contents using the syntax described on the <a href="/wiki/WikiSyntax">WikiSyntax</a>.
+	For a description of the input fields see: <a href="/wiki/WikiHelp">WikiHelp</a>
 	</p>
 
 	<div id="preview"></div>
@@ -70,6 +71,17 @@ <h1>{% trans "Editing" %} {{ article.title }}</h1>
 			<!-- Content -->
 			<tr><th colspan="2"><label for="id_content">{% trans "Content" %}:</label></th></tr>
 			<tr><td colspan="2"  class="errormessage">{{ form.content.errors }}{{ form.content }}</td></tr>
+			<!-- Tags -->
+			<tr>
+				<th colspan="2">
+					<label for={{ form.tags.id_for_label }}>Tags:</label>
+					<a href="/wiki/WikiHelp/#tagging" title="Help (new window)" style="float: right;" target="_blank">
+						<img src="{% static "img/menu_help_borderless.png" %}" alt="Help for tags" class="middle">
+						Help for Tags
+					</a>
+				</th>
+			</tr>
+			<tr><td colspan="2"  class="errormessage">{{ form.tags.errors }}{{ form.tags }}</td></tr>
 			<!-- Summary -->
 			<tr><th colspan="2"><label for="id_summary">{% trans "Page Summary" %}:</label></th></tr>
 			<tr><td colspan="2"  class="errormessage">{{ form.summary.errors }}{{ form.summary }}</td></tr>
@@ -91,7 +103,7 @@ <h1>{% trans "Editing" %} {{ article.title }}</h1>
 			<input type="submit" value="{% trans "Save" %}" />
 		</div>
 		{% csrf_token %}
-	</form> 
+	</form>
 	<br />
 	<h3>Images</h3>
 	{% if new_article %}
diff --git a/wiki/templates/wiki/index.html b/wiki/templates/wiki/index.html
index 7996f4f1..05cadcc8 100644
--- a/wiki/templates/wiki/index.html
+++ b/wiki/templates/wiki/index.html
@@ -18,6 +18,7 @@ <h1>Wiki: Index</h1>
 				<th>{% trans "Page" %}</th>
 				<th>{% trans "Summary" %}</th>
 				<th>{% trans "Last update" %}</th>
+				<th>{% trans "Tagged with" %}</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -26,6 +27,7 @@ <h1>Wiki: Index</h1>
 				<td><a href="{% url 'wiki_article' article.title %}">{{ article.title }}</a></td>
 				<td>{{ article.summary }}</td>
 				<td>{{ article.last_update|custom_date:user }}</td>
+				<td>{% include "wiki/inlines/tag_urls.html" %}</td>
 			</tr>
 			{% endfor %}
 		</tbody>
diff --git a/wiki/templates/wiki/inlines/tag_urls.html b/wiki/templates/wiki/inlines/tag_urls.html
new file mode 100644
index 00000000..4097726f
--- /dev/null
+++ b/wiki/templates/wiki/inlines/tag_urls.html
@@ -0,0 +1,11 @@
+{% load tagging_tags %}
+
+{% tags_for_object article as tag_list %}
+	{% for t in tag_list %}
+		{% if t != tag %}
+		{% comment %}the forloop.last needs to be in every line to prevent a space after the tag {% endcomment %}
+			<a href="{% url 'article_tag_detail' t.name %}">{{t.name}}</a>{% if not forloop.last %},{% endif %}
+		{% else %}
+			<span class="grey">{{ t.name }}</span>{% if not forloop.last %},{% endif %}
+		{% endif %}
+   {% endfor %}
diff --git a/wiki/templates/wiki/tag_view.html b/wiki/templates/wiki/tag_view.html
new file mode 100644
index 00000000..e777bae8
--- /dev/null
+++ b/wiki/templates/wiki/tag_view.html
@@ -0,0 +1,33 @@
+{% extends 'wiki/base.html' %}
+{% load i18n %}
+{% load wiki_extras %}
+
+{% block title %}
+{{ article.title }} - {{block.super}}
+{% endblock %}
+
+
+{% block content_header %}
+	<h1>Articles with tag '{{ tag.name }}'</h1>
+{% endblock %}
+
+{% block content_main %}
+	<div class="blogEntry">
+	<table>
+		<thead>
+			<tr>
+				<th>Article name</th>
+				<th>Tagged with</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for article in object_list %}
+			<tr>
+				<td><a href="{% url 'wiki_article' article %}">{{ article }}</a></td>
+				<td>{% include "wiki/inlines/tag_urls.html" %}</td>
+			</tr>
+		</tbody>
+			{% endfor %}
+	</table>
+{% endblock %}
+
diff --git a/wiki/templates/wiki/view.html b/wiki/templates/wiki/view.html
index b5308dc1..6234a30b 100644
--- a/wiki/templates/wiki/view.html
+++ b/wiki/templates/wiki/view.html
@@ -1,6 +1,7 @@
 {% extends 'wiki/base.html' %}
 {% load i18n %}
 {% load wiki_extras %}
+{% load tagging_tags %}
 
 {% block title %}
 {{ article.title }} - {{block.super}}
@@ -43,7 +44,18 @@ <h1>{{ article.title }}</h1>
 			({% trans "Viewing revision " %} {{ revision }})
 		</p>
 	{% endif %}
+	{% if outdated %}
+		<h2 class="errormessage">Outdated</h2>
+		<p class="errormessage">This article is marked as outdated.
+			If you are familiar with this topic, please consider updating and improving this page.
+			In case of any questions, please ask in the forum! For pointers see <a href="/wiki/WikiHelp">WikiHelp</a> in our wiki.
+			After finishing your work remove the 'outdated' tag.</p>
+	{% endif %}
 	{% render_content article %}
+	{% tags_for_object article as tag_list %}
+		{% if tag_list %}
+			<div class="right">Tagged with: {% include "wiki/inlines/tag_urls.html" %}</div>
+		{% endif %}
 </div>
 {% endblock %}
 
diff --git a/wiki/urls.py b/wiki/urls.py
index 9863cd5f..00214e10 100644
--- a/wiki/urls.py
+++ b/wiki/urls.py
@@ -11,6 +11,9 @@
     RssArticleHistoryFeed,
     AtomArticleHistoryFeed,
 )
+from wiki.models import Article
+from tagging.views import TaggedObjectList
+
 
 urlpatterns = [
     # Redirects
@@ -96,4 +99,13 @@
         views.backlinks,
         name="backlinks",
     ),
+    url(
+        r"^tag_list/(?P<tag>[^/]+(?u))/$",
+        TaggedObjectList.as_view(
+            model=Article,
+            allow_empty=True,
+            template_name="wiki/tag_view.html",
+        ),
+        name="article_tag_detail",
+    ),
 ]
diff --git a/wiki/views.py b/wiki/views.py
index cca7c027..98822808 100644
--- a/wiki/views.py
+++ b/wiki/views.py
@@ -27,6 +27,8 @@
 from mainpage.wl_utils import get_real_ip
 from mainpage.wl_utils import get_valid_cache_key
 
+from tagging.models import Tag
+
 import re
 import urllib.request, urllib.parse, urllib.error
 
@@ -226,11 +228,16 @@ def view_article(
             changeset = get_object_or_404(article.changeset_set, revision=revision)
             article.content = changeset.get_content()
 
+        outdated = False
+        tags = [x.name for x in Tag.objects.get_for_object(article)]
+        if "outdated" in tags:
+            outdated = True
         template_params = {
             "article": article,
             "revision": revision,
             "redirected_from": redirected_from,
             "allow_write": allow_write,
+            "outdated": outdated,
         }
 
         if notification is not None: