diff --git a/mayan/apps/common/migrations/0001_initial.py b/mayan/apps/common/migrations/0001_initial.py
index 2f885d2550..019703b945 100644
--- a/mayan/apps/common/migrations/0001_initial.py
+++ b/mayan/apps/common/migrations/0001_initial.py
@@ -3,8 +3,9 @@ from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.conf import settings
+from django.core.files.storage import FileSystemStorage
+
 import common.models
-import storage.backends.filebasedstorage
 
 
 class Migration(migrations.Migration):
@@ -77,7 +78,7 @@ class Migration(migrations.Migration):
                 (
                     'file', models.FileField(
                         upload_to=common.models.upload_to,
-                        storage=storage.backends.filebasedstorage.FileBasedStorage(),
+                        storage=FileBasedStorage(),
                         verbose_name='File'
                     )
                 ),
diff --git a/mayan/apps/document_signatures/migrations/0001_initial.py b/mayan/apps/document_signatures/migrations/0001_initial.py
index 77e7b73f48..930bb3e73f 100644
--- a/mayan/apps/document_signatures/migrations/0001_initial.py
+++ b/mayan/apps/document_signatures/migrations/0001_initial.py
@@ -2,7 +2,8 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import storage.backends.filebasedstorage
+from django.core.files.storage import FileSystemStorage
+
 import document_signatures.models
 
 
@@ -24,7 +25,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     'signature_file', models.FileField(
-                        storage=storage.backends.filebasedstorage.FileBasedStorage(),
+                        storage=FileBasedStorage(),
                         upload_to=document_signatures.models.upload_to,
                         blank=True, editable=False, null=True,
                         verbose_name='Signature file'
diff --git a/mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py b/mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py
index e93f18009f..543acd240b 100644
--- a/mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py
+++ b/mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py
@@ -2,7 +2,8 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import storage.backends.filebasedstorage
+from django.core.files.storage import FileSystemStorage
+
 import document_signatures.models
 
 
@@ -25,7 +26,7 @@ class Migration(migrations.Migration):
             model_name='documentversionsignature',
             name='signature_file',
             field=models.FileField(
-                storage=storage.backends.filebasedstorage.FileBasedStorage(),
+                storage=FleBasedStorage(),
                 upload_to=document_signatures.models.upload_to, null=True,
                 verbose_name='Signature file', blank=True
             ),
diff --git a/mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py b/mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py
index 044e6f5a35..f9ace93145 100644
--- a/mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py
+++ b/mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py
@@ -2,7 +2,8 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-import storage.backends.filebasedstorage
+from django.core.files.storage import FileSystemStorage
+
 import document_signatures.models
 
 
@@ -90,7 +91,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     'signature_file', models.FileField(
-                        storage=storage.backends.filebasedstorage.FileBasedStorage(),
+                        storage=FileBasedStorage(),
                         upload_to=document_signatures.models.upload_to,
                         null=True, verbose_name='Signature file', blank=True
                     )
diff --git a/mayan/apps/documents/migrations/0001_initial.py b/mayan/apps/documents/migrations/0001_initial.py
index 204ac5eef1..16b583da7b 100644
--- a/mayan/apps/documents/migrations/0001_initial.py
+++ b/mayan/apps/documents/migrations/0001_initial.py
@@ -3,8 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.conf import settings
-
-import storage.backends.filebasedstorage
+from django.core.files.storage import FileSystemStorage
 
 
 class Migration(migrations.Migration):
@@ -574,7 +573,7 @@ class Migration(migrations.Migration):
                 (
                     'file', models.FileField(
                         upload_to='2a2af9b3-8079-4753-9863-f1c342ec0d06',
-                        storage=storage.backends.filebasedstorage.FileBasedStorage(),
+                        storage=FileBasedStorage(),
                         verbose_name='File'
                     )
                 ),
diff --git a/mayan/apps/documents/migrations/0003_auto_20150608_1915.py b/mayan/apps/documents/migrations/0003_auto_20150608_1915.py
index a0ca568e13..e6d8ec19f5 100644
--- a/mayan/apps/documents/migrations/0003_auto_20150608_1915.py
+++ b/mayan/apps/documents/migrations/0003_auto_20150608_1915.py
@@ -2,8 +2,9 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+from django.core.files.storage import FileSystemStorage
+
 import documents.models
-import storage.backends.filebasedstorage
 
 
 class Migration(migrations.Migration):
@@ -27,7 +28,7 @@ class Migration(migrations.Migration):
             name='file',
             field=models.FileField(
                 upload_to=documents.models.UUID_FUNCTION,
-                storage=storage.backends.filebasedstorage.FileBasedStorage(),
+                storage=FileBasedStorage(),
                 verbose_name='File'
             ),
             preserve_default=True,