diff --git a/schedule/migrations/0006_update_text_fields_empty_string.py b/schedule/migrations/0006_update_text_fields_empty_string.py
new file mode 100644
index 0000000..9aa710f
--- /dev/null
+++ b/schedule/migrations/0006_update_text_fields_empty_string.py
@@ -0,0 +1,40 @@
+from django.db import migrations
+
+
+def forwards(apps, schema_editor):
+    model_fields = [
+        ('CalendarRelation', ['distinction']),
+        ('Event', ['color_event', 'description']),
+        ('EventRelation', ['distinction']),
+        ('Occurrence', ['description', 'title']),
+        ('Rule', ['params']),
+    ]
+    for model_name, fields in model_fields:
+        model_class = apps.get_model('schedule', model_name)
+        for field_name in fields:
+            model_class.objects.filter(**{field_name: None}).update(**{field_name: ''})
+
+
+def reverse(apps, schema_editor):
+    model_fields = [
+        ('CalendarRelation', ['distinction']),
+        ('Event', ['color_event', 'description']),
+        ('EventRelation', ['distinction']),
+        ('Occurrence', ['description', 'title']),
+        ('Rule', ['params']),
+    ]
+    for model_name, fields in model_fields:
+        model_class = apps.get_model('schedule', model_name)
+        for field_name in fields:
+            model_class.objects.filter(**{field_name: ''}).update(**{field_name: None})
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('schedule', '0003_auto_20160715_0028'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards, reverse, elidable=True),
+    ]
diff --git a/schedule/migrations/0007_merge_text_fields.py b/schedule/migrations/0007_merge_text_fields.py
new file mode 100644
index 0000000..2edcf90
--- /dev/null
+++ b/schedule/migrations/0007_merge_text_fields.py
@@ -0,0 +1,12 @@
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('schedule', '0006_update_text_fields_empty_string'),
+        ('schedule', '0005_verbose_name_plural_for_calendar'),
+    ]
+
+    operations = [
+    ]