diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index af4b423a19..cc134ba42e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -17,6 +17,7 @@ Changelog
  * Fix: Fixed typo in Wistia oEmbed pattern (Josh Hurd)
  * Fix: Added more accurate help text for the Administrator flag on user accounts (Matt Fozard)
  * Fix: Tags added on the multiple image uploader are now saved correctly
+ * Fix: Documents created by a user are no longer deleted when the user is deleted
 
 1.3.1 (05.01.2016)
 ~~~~~~~~~~~~~~~~~~
diff --git a/docs/releases/1.4.rst b/docs/releases/1.4.rst
index 3bda34cd6c..286661bc80 100644
--- a/docs/releases/1.4.rst
+++ b/docs/releases/1.4.rst
@@ -36,6 +36,7 @@ Bug fixes
  * Fixed typo in Wistia oEmbed pattern (Josh Hurd)
  * Added more accurate help text for the Administrator flag on user accounts (Matt Fozard)
  * Tags added on the multiple image uploader are now saved correctly
+ * Documents created by a user are no longer deleted when the user is deleted
 
 
 Upgrade considerations
diff --git a/wagtail/wagtaildocs/migrations/0005_alter_uploaded_by_user_on_delete_action.py b/wagtail/wagtaildocs/migrations/0005_alter_uploaded_by_user_on_delete_action.py
new file mode 100644
index 0000000000..82862206e2
--- /dev/null
+++ b/wagtail/wagtaildocs/migrations/0005_alter_uploaded_by_user_on_delete_action.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2015-12-22 16:09
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wagtaildocs', '0004_capitalizeverbose'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='document',
+            name='uploaded_by_user',
+            field=models.ForeignKey(blank=True, editable=False, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='uploaded by user'),
+        ),
+    ]
diff --git a/wagtail/wagtaildocs/models.py b/wagtail/wagtaildocs/models.py
index a2f910eca6..340d105194 100644
--- a/wagtail/wagtaildocs/models.py
+++ b/wagtail/wagtaildocs/models.py
@@ -34,7 +34,8 @@ class AbstractDocument(models.Model, TagSearchable):
         verbose_name=_('uploaded by user'),
         null=True,
         blank=True,
-        editable=False
+        editable=False,
+        on_delete=models.SET_NULL
     )
 
     tags = TaggableManager(help_text=None, blank=True, verbose_name=_('tags'))