diff --git a/HISTORY.rst b/HISTORY.rst
index 3573e665ac..70103fdc22 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,3 +1,16 @@
+2.1.8 (2017-02-12)
+==================
+- Fixes in the trashed document API endpoints.
+- Improved tags API PUT and PATCH endpoints.
+- Bulk document adding when creating and editing tags.
+- The version of django-mptt is preserved in case mayan-cabinets is installed.
+- Add Django GPG API endpoints for singing keys.
+- Add API endpoints for the document states (workflows) app.
+- Add API endpoints for the messsage of the day (MOTD) app.
+- Add Smart link API endpoints.
+- Add writable versions of the Document and Document Type serializers (GitLab issues #348 and #349).
+- Close GitLab issue #310 "Metadata's lookup with chinese messages when new document"
+
 2.1.7 (2017-02-01)
 ==================
 - Improved user management API endpoints.
diff --git a/mayan/__init__.py b/mayan/__init__.py
index 43c74b02a1..2e0898e7c8 100644
--- a/mayan/__init__.py
+++ b/mayan/__init__.py
@@ -1,8 +1,8 @@
 from __future__ import unicode_literals
 
 __title__ = 'Mayan EDMS'
-__version__ = '2.1.7'
-__build__ = 0x020107
+__version__ = '2.1.8'
+__build__ = 0x020108
 __author__ = 'Roberto Rosario'
 __author_email__ = 'roberto.rosario@mayan-edms.com'
 __description__ = 'Free Open Source Electronic Document Management System'