diff --git a/changelog b/changelog
index 150f957e0..ccb9b2ceb 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,26 @@
+ietfdb (6.22.1) ietf; urgency=low
+
+  This is a small bugfix release which fixes a number of issues which made
+  some manual actions necessary in order to use the 6.22.0 release in
+  development mode.
+
+  * Added a missing __init__.py file.
+
+  * Added default media and photo directories for use in development.  
+    Changed settings to point to the media dir in development.
+
+  * Fixed a bug in the default alias-file settings.
+
+  * Improved data migration for plain_name aliases.
+
+  * Tweaked indentation of inline python in the mkdevbranch bash script.
+
+  * Tweaked bin/mkrelease to be more quiet.
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  13 Jun 2016 07:05:26 -0700
+
+
+
 ietfdb (6.22.0) ietf; urgency=medium
 
   **Support for profile photo and biograpy**
diff --git a/ietf/person/migrations/0014_auto_20160613_0751.py b/ietf/person/migrations/0014_auto_20160613_0751.py
new file mode 100644
index 000000000..954eaddc3
--- /dev/null
+++ b/ietf/person/migrations/0014_auto_20160613_0751.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import ietf.utils.storage
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0013_add_plain_name_aliases'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='person',
+            name='photo',
+            field=models.ImageField(default=None, storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=b'photo', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='person',
+            name='photo_thumb',
+            field=models.ImageField(default=None, storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=b'photo', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='personhistory',
+            name='photo',
+            field=models.ImageField(default=None, storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=b'photo', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='personhistory',
+            name='photo_thumb',
+            field=models.ImageField(default=None, storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=b'photo', blank=True),
+            preserve_default=True,
+        ),
+    ]