diff --git a/CHANGES.rst b/CHANGES.rst
index 754d5c5b..7f6d0fbd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,11 @@
 Changes
 =======
 
+2.3.1 (2016-07-06)
+----------------
+
+* Changes models.File.name max_length from 255 to 1023
+
 2.3 (2015-12-11)
 ----------------
 
diff --git a/easy_thumbnails/migrations/0003_alter_name_max_length_to_1023.py b/easy_thumbnails/migrations/0003_alter_name_max_length_to_1023.py
new file mode 100644
index 00000000..935c935f
--- /dev/null
+++ b/easy_thumbnails/migrations/0003_alter_name_max_length_to_1023.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('easy_thumbnails', '0002_thumbnaildimensions'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='source',
+            name='name',
+            field=models.CharField(max_length=1023, db_index=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='thumbnail',
+            name='name',
+            field=models.CharField(max_length=1023, db_index=True),
+            preserve_default=True,
+        ),
+    ]
diff --git a/easy_thumbnails/models.py b/easy_thumbnails/models.py
index 7cb82018..accd9829 100644
--- a/easy_thumbnails/models.py
+++ b/easy_thumbnails/models.py
@@ -54,7 +54,7 @@ def _get_thumbnail_manager(self):
 
 class File(models.Model):
     storage_hash = models.CharField(max_length=40, db_index=True)
-    name = models.CharField(max_length=255, db_index=True)
+    name = models.CharField(max_length=1023, db_index=True)
     modified = models.DateTimeField(default=timezone.now)
 
     objects = FileManager()
diff --git a/easy_thumbnails/south_migrations/0017_auto__chg_field_source_name__chg_field_thumbnail_name.py b/easy_thumbnails/south_migrations/0017_auto__chg_field_source_name__chg_field_thumbnail_name.py
new file mode 100644
index 00000000..a80e7033
--- /dev/null
+++ b/easy_thumbnails/south_migrations/0017_auto__chg_field_source_name__chg_field_thumbnail_name.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'Source.name'
+        db.alter_column(u'easy_thumbnails_source', 'name', self.gf('django.db.models.fields.CharField')(max_length=1023))
+
+        # Changing field 'Thumbnail.name'
+        db.alter_column(u'easy_thumbnails_thumbnail', 'name', self.gf('django.db.models.fields.CharField')(max_length=1023))
+
+    def backwards(self, orm):
+
+        # Changing field 'Source.name'
+        db.alter_column(u'easy_thumbnails_source', 'name', self.gf('django.db.models.fields.CharField')(max_length=255))
+
+        # Changing field 'Thumbnail.name'
+        db.alter_column(u'easy_thumbnails_thumbnail', 'name', self.gf('django.db.models.fields.CharField')(max_length=255))
+
+    models = {
+        u'easy_thumbnails.source': {
+            'Meta': {'unique_together': "((u'storage_hash', u'name'),)", 'object_name': 'Source'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '1023', 'db_index': 'True'}),
+            'storage_hash': ('django.db.models.fields.CharField', [], {'max_length': '40', 'db_index': 'True'})
+        },
+        u'easy_thumbnails.thumbnail': {
+            'Meta': {'unique_together': "((u'storage_hash', u'name', u'source'),)", 'object_name': 'Thumbnail'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '1023', 'db_index': 'True'}),
+            'source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'thumbnails'", 'to': u"orm['easy_thumbnails.Source']"}),
+            'storage_hash': ('django.db.models.fields.CharField', [], {'max_length': '40', 'db_index': 'True'})
+        },
+        u'easy_thumbnails.thumbnaildimensions': {
+            'Meta': {'object_name': 'ThumbnailDimensions'},
+            'height': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'thumbnail': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "u'dimensions'", 'unique': 'True', 'to': u"orm['easy_thumbnails.Thumbnail']"}),
+            'width': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'})
+        }
+    }
+
+    complete_apps = ['easy_thumbnails']