diff --git a/AUTHORS.rst b/AUTHORS.rst
index 1bbf8519..6257141f 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -12,3 +12,4 @@ Contributors:
 * `Omer Katz <https://github.com/thedrow>`_
 * `Andrew Velis <https://github.com/avelis>`_
 * `Tom Davis <https://github.com/tdavis>`_
+* `Nicolas Noirbent <https://github.com/noirbee>`_
diff --git a/HISTORY.rst b/HISTORY.rst
index fb9e9168..e37241c5 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,11 @@
 History
 =======
 
+0.6.1
+-----
+
+* Fixes email parsing from settings
+
 0.6.0
 -----
 
diff --git a/docs/conf.py b/docs/conf.py
index 023a8529..6f948ce2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '0.6'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.0'
+release = '0.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/organizations/__init__.py b/organizations/__init__.py
index 314240ad..bf76c4a9 100644
--- a/organizations/__init__.py
+++ b/organizations/__init__.py
@@ -26,7 +26,7 @@
 
 __author__ = 'Ben Lopatin'
 __email__ = 'ben@wellfire.co'
-__version__ = '0.6.0'
+__version__ = '0.6.1'
 
 
 default_app_config = 'organizations.apps.OrganizationsConfig'