diff --git a/doc/index.markdown b/doc/index.markdown
index c1e9a5063..6d52db279 100644
--- a/doc/index.markdown
+++ b/doc/index.markdown
@@ -46,6 +46,7 @@ Using Kanboard
 - [Subtasks](subtasks.markdown)
 - [Analytics for tasks](analytics-tasks.markdown)
 - [User mentions](user-mentions.markdown)
+- [Tags](tags.markdown)
 
 ### Working with users and groups
 
diff --git a/doc/screenshots/tags-board.png b/doc/screenshots/tags-board.png
new file mode 100644
index 000000000..1a7f710d7
Binary files /dev/null and b/doc/screenshots/tags-board.png differ
diff --git a/doc/screenshots/tags-global.png b/doc/screenshots/tags-global.png
new file mode 100644
index 000000000..f5059ae84
Binary files /dev/null and b/doc/screenshots/tags-global.png differ
diff --git a/doc/screenshots/tags-projects.png b/doc/screenshots/tags-projects.png
new file mode 100644
index 000000000..2e08ce903
Binary files /dev/null and b/doc/screenshots/tags-projects.png differ
diff --git a/doc/screenshots/tags-task.png b/doc/screenshots/tags-task.png
new file mode 100644
index 000000000..c9c8b2f79
Binary files /dev/null and b/doc/screenshots/tags-task.png differ
diff --git a/doc/tags.markdown b/doc/tags.markdown
new file mode 100644
index 000000000..ef2d5b26d
--- /dev/null
+++ b/doc/tags.markdown
@@ -0,0 +1,24 @@
+Tags
+====
+
+With Kanboard, you can associate one or many tags to a task.
+You can define tags globally for all projects or only for a specific project.
+
+![Tags on the board](screenshots/tags-board.png)
+
+From the task form, you can enter the desired tags:
+
+![Tags form](screenshots/tags-task.png)
+
+The auto-completion form will show up to suggest available tags.
+
+You can also create tags directly from the task form.
+By default, when you create tags from a task form they are associated to the current project:
+
+![Project Tags](screenshots/tags-projects.png)
+
+You can also create these tags manually in the project settings.
+
+To define tags globally for all projects, go to the application settings:
+
+![Global Tags](screenshots/tags-global.png)