diff --git a/docs/conf.py b/docs/conf.py
index 98255e2f923b31d2bc00fef70b50631c29e1ce7d..c50416ba6568bb8ec0c28eae2236ebb5a818fb1b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@ copyright = u'2016, Branko Majic'
 # built documents.
 #
 # The short X.Y version.
-version = '1.6-dev'
+version = '1.7.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.6-dev'
+release = '1.7.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
index 36f8d2f740f605b8d5436adc6b62d24c50d06fa9..413d518267a7ed0dade33fdcc83ffb25ac04f775 100644
--- a/docs/releasenotes.rst
+++ b/docs/releasenotes.rst
@@ -2,10 +2,46 @@ Release notes
 =============
 
 
+1.7.0
+-----
+
+Minor improvements for mail-related roles, internal refactoring of task syntax,
+and improvements of tests.
+
+New features/improvements:
+
+* Documentation
+
+  * Added new sub-section in development section describing some of the
+    conventions used while developing the roles.
+
+* All roles
+
+  * Switched to using expanded syntax in all roles and cleaned-up the tasks a
+    bit (mainly internal change).
+  * Minor cleanups within tests and tasks to accomodate the syntax changes
+    (mainly internal change).
+
+* ``mail_forwarder`` role
+
+  * Added parameter ``smtp_from_relay_allowed`` that controls if managed machine
+    should accept incoming SMTP connections from the relay server. Useful for
+    NAT'ed or laptop machines.
+  * Added parameter ``smtp_relay_host_port`` that controls what port is used for
+    connecting to the specified SMTP relay. Useful for machines behind
+    restrictive ISPs.
+
+* ``mail_server`` role
+
+  * Introduced firewall rules to redirect from TCP port 27 to TCP port 25,
+    useful for machines behind restrictive ISPs.
+
+
 1.6.0
 -----
 
-GENERAL DESCRIPTION
+Implemented full test suite with a plethora of smaller bug-fixes, and some minor
+(internal) improvements.
 
 Breaking changes:
 
diff --git a/docs/usage.rst b/docs/usage.rst
index 12ce92a573686c906e5d9d0975106aea61adfa25..c6350dda3faafda1ce127b3df4508b6e2fb69046 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -149,7 +149,7 @@ Ansible Roles:
 2. Checkout the correct version of the roles::
 
      cd ~/majic-ansible-roles/
-     git checkout -b 1.6-dev 1.6-dev
+     git checkout -b 1.7.0 1.7.0
 
 
 Preparing the basic site configuration