diff --git a/machines/migrations/0064_auto_20171115_0253.py b/machines/migrations/0064_auto_20171115_0253.py
new file mode 100644
index 00000000..a028e2cb
--- /dev/null
+++ b/machines/migrations/0064_auto_20171115_0253.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-11-15 01:53
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('machines', '0063_auto_20171020_0040'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='text',
+            name='field2',
+            field=models.TextField(max_length=2047),
+        ),
+    ]
diff --git a/machines/models.py b/machines/models.py
index c2cd2143..6453f08a 100644
--- a/machines/models.py
+++ b/machines/models.py
@@ -388,7 +388,7 @@ class Text(models.Model):
 
     zone = models.ForeignKey('Extension', on_delete=models.PROTECT)
     field1 = models.CharField(max_length=255)
-    field2 = models.CharField(max_length=255)
+    field2 = models.TextField(max_length=2047)
 
     def __str__(self):
         return str(self.zone) + " : " + str(self.field1) + " " +\
diff --git a/machines/templates/machines/aff_txt.html b/machines/templates/machines/aff_txt.html
index fd7c5ee6..eb060440 100644
--- a/machines/templates/machines/aff_txt.html
+++ b/machines/templates/machines/aff_txt.html
@@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <th></th>
             </tr>
         </thead>
-        {% for txt in txt_list %}
+        {% for txt in text_list %}
         <tr>
 	    <td>{{ txt.zone }}</td>
 	    <td>{{ txt.dns_entry }}</td>
diff --git a/machines/urls.py b/machines/urls.py
index 3669b5b9..906fec1c 100644
--- a/machines/urls.py
+++ b/machines/urls.py
@@ -51,7 +51,7 @@ urlpatterns = [
     url(r'^edit_mx/(?P<mxid>[0-9]+)$', views.edit_mx, name='edit-mx'),
     url(r'^del_mx/$', views.del_mx, name='del-mx'),
     url(r'^add_txt/$', views.add_txt, name='add-txt'),
-    url(r'^edit_txt/(?P<textid>[0-9]+)$', views.edit_txt, name='edit-txt'),
+    url(r'^edit_txt/(?P<txtid>[0-9]+)$', views.edit_txt, name='edit-txt'),
     url(r'^del_txt/$', views.del_txt, name='del-txt'),
     url(r'^add_ns/$', views.add_ns, name='add-ns'),
     url(r'^edit_ns/(?P<nsid>[0-9]+)$', views.edit_ns, name='edit-ns'),