diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4ba18fb..84fdbab7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [v2.6.1]
+
+### Fixed
+
+ - Prevent `http://` from being added to email host field
+
 ## [v2.6.0]
 
 **Note** - this release moves the Twilio and email sending configuration into the database to make management and intial setup easier.
diff --git a/VERSION b/VERSION
index e70b4523..6a6a3d8e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.0
+2.6.1
diff --git a/ansible/env_vars/base.yml b/ansible/env_vars/base.yml
index 9dd99cf1..dbd80a1a 100644
--- a/ansible/env_vars/base.yml
+++ b/ansible/env_vars/base.yml
@@ -1,7 +1,7 @@
 ---
 
 git_repo: https://github.com/monty5811/apostello.git
-git_version: v2.6.0
+git_version: v2.6.1
 
 project_name: apostello
 application_name: apostello
diff --git a/scripts/ansible_install.sh b/scripts/ansible_install.sh
index cac713ee..4a7adadf 100755
--- a/scripts/ansible_install.sh
+++ b/scripts/ansible_install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 # setup some constants
-AP_VER=v2.6.0
+AP_VER=v2.6.1
 REPO_URL=https://github.com/monty5811/apostello.git
 HOME_DIR=/home/apostello
 CUSTOM_VARS_FILE=$HOME_DIR/custom_vars.yml
diff --git a/site_config/migrations/0015_auto_20171107_1326.py b/site_config/migrations/0015_auto_20171107_1326.py
new file mode 100644
index 00000000..7360c779
--- /dev/null
+++ b/site_config/migrations/0015_auto_20171107_1326.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.7 on 2017-11-07 13:26
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('site_config', '0014_auto_20171025_1053'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='siteconfiguration',
+            name='email_from',
+            field=models.EmailField(blank=True, help_text='Email will be sent from this address.', max_length=254, null=True),
+        ),
+        migrations.AlterField(
+            model_name='siteconfiguration',
+            name='email_host',
+            field=models.CharField(blank=True, help_text='Email host.', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='siteconfiguration',
+            name='email_password',
+            field=models.CharField(blank=True, help_text='Email password.', max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='siteconfiguration',
+            name='email_port',
+            field=models.PositiveIntegerField(blank=True, help_text='Email host port.', null=True),
+        ),
+        migrations.AlterField(
+            model_name='siteconfiguration',
+            name='email_username',
+            field=models.CharField(blank=True, help_text='Email user name.', max_length=255, null=True),
+        ),
+    ]
diff --git a/site_config/models.py b/site_config/models.py
index 4808d9c7..d2675576 100644
--- a/site_config/models.py
+++ b/site_config/models.py
@@ -82,9 +82,10 @@ class SiteConfiguration(SingletonModel):
         help_text='This message will be shown on the "not approved" page.',
     )
     # email sending settings
-    email_host = models.URLField(
+    email_host = models.CharField(
         blank=True,
         null=True,
+        max_length=255,
         help_text='Email host.',
     )
     email_port = models.PositiveIntegerField(