diff --git a/HISTORY.rst b/HISTORY.rst
index c0d083a4f0..96074f7476 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,3 +1,7 @@
+2.2.1 (2017-05-25)
+==================
+- Allow for bigger indexing expression templates.
+
 2.2 (2017-04-26)
 ================
 - Remove the installation app (GitLab #301).
diff --git a/docs/releases/2.2.1.rst b/docs/releases/2.2.1.rst
new file mode 100644
index 0000000000..d65004c2e0
--- /dev/null
+++ b/docs/releases/2.2.1.rst
@@ -0,0 +1,73 @@
+===============================
+Mayan EDMS v2.2.1 release notes
+===============================
+
+Released: May 25, 2017
+
+What's new
+==========
+
+This is a bug-fix and minor feature release and all users are encouraged to
+upgrade.
+
+Changes
+-------------
+- Index node expression template field changed from a 128 character field to an
+  unlimited size text field to allow for complex indexing expressions.
+
+Removals
+--------
+* None
+
+Upgrading from a previous version
+---------------------------------
+
+Using PIP
+~~~~~~~~~
+
+Type in the console::
+
+    $ pip install -U mayan-edms
+
+the requirements will also be updated automatically.
+
+Using Git
+~~~~~~~~~
+
+If you installed Mayan EDMS by cloning the Git repository issue the commands::
+
+    $ git reset --hard HEAD
+    $ git pull
+
+otherwise download the compressed archived and uncompress it overriding the
+existing installation.
+
+Next upgrade/add the new requirements::
+
+    $ pip install --upgrade -r requirements.txt
+
+Common steps
+~~~~~~~~~~~~
+
+Migrate existing database schema with::
+
+    $ mayan-edms.py performupgrade
+
+Add new static media::
+
+    $ mayan-edms.py collectstatic --noinput
+
+The upgrade procedure is now complete.
+
+
+Backward incompatible changes
+=============================
+
+* None
+
+Bugs fixed or issues closed
+===========================
+
+* `GitLab issue #357 <https://gitlab.com/mayan-edms/mayan-edms/issues/357>`_ It should be possible to retrieve all workflows for a given DocumentType from the API
+
+.. _PyPI: https://pypi.python.org/pypi/mayan-edms/
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index 091513a7f8..d2aaa11fa2 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -22,6 +22,7 @@ versions of the documentation contain the release notes for any later releases.
 .. toctree::
    :maxdepth: 1
 
+   2.2.1
    2.2
    2.1.11
    2.1.10
diff --git a/mayan/apps/document_indexing/migrations/0011_auto_20170524_0456.py b/mayan/apps/document_indexing/migrations/0011_auto_20170524_0456.py
new file mode 100644
index 0000000000..8f0ac49d50
--- /dev/null
+++ b/mayan/apps/document_indexing/migrations/0011_auto_20170524_0456.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.6 on 2017-05-24 04:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('document_indexing', '0010_documentindexinstancenode_indexinstance'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='indextemplatenode',
+            name='expression',
+            field=models.TextField(help_text="Enter a template to render. Use Django's default templating language (https://docs.djangoproject.com/en/1.7/ref/templates/builtins/)", verbose_name='Indexing expression'),
+        ),
+    ]
diff --git a/mayan/apps/document_indexing/models.py b/mayan/apps/document_indexing/models.py
index a276a8113a..ff0b112a73 100644
--- a/mayan/apps/document_indexing/models.py
+++ b/mayan/apps/document_indexing/models.py
@@ -114,8 +114,7 @@ class IndexTemplateNode(MPTTModel):
     index = models.ForeignKey(
         Index, related_name='node_templates', verbose_name=_('Index')
     )
-    expression = models.CharField(
-        max_length=128,
+    expression = models.TextField(
         help_text=_(
             'Enter a template to render. '
             'Use Django\'s default templating language '