diff --git a/gnuviechadmin/domains/migrations/0001_initial.py b/gnuviechadmin/domains/south_migrations/0001_initial.py
similarity index 100%
rename from gnuviechadmin/domains/migrations/0001_initial.py
rename to gnuviechadmin/domains/south_migrations/0001_initial.py
diff --git a/gnuviechadmin/domains/migrations/__init__.py b/gnuviechadmin/domains/south_migrations/__init__.py
similarity index 100%
rename from gnuviechadmin/domains/migrations/__init__.py
rename to gnuviechadmin/domains/south_migrations/__init__.py
diff --git a/gnuviechadmin/managemails/migrations/0001_initial.py b/gnuviechadmin/managemails/south_migrations/0001_initial.py
similarity index 100%
rename from gnuviechadmin/managemails/migrations/0001_initial.py
rename to gnuviechadmin/managemails/south_migrations/0001_initial.py
diff --git a/gnuviechadmin/managemails/migrations/0002_auto__chg_field_mailbox_password.py b/gnuviechadmin/managemails/south_migrations/0002_auto__chg_field_mailbox_password.py
similarity index 100%
rename from gnuviechadmin/managemails/migrations/0002_auto__chg_field_mailbox_password.py
rename to gnuviechadmin/managemails/south_migrations/0002_auto__chg_field_mailbox_password.py
diff --git a/gnuviechadmin/managemails/migrations/0003_auto__del_field_mailbox_domain.py b/gnuviechadmin/managemails/south_migrations/0003_auto__del_field_mailbox_domain.py
similarity index 100%
rename from gnuviechadmin/managemails/migrations/0003_auto__del_field_mailbox_domain.py
rename to gnuviechadmin/managemails/south_migrations/0003_auto__del_field_mailbox_domain.py
diff --git a/gnuviechadmin/managemails/migrations/0004_auto__del_field_mailaddressmailbox_id__chg_field_mailaddressmailbox_ma.py b/gnuviechadmin/managemails/south_migrations/0004_auto__del_field_mailaddressmailbox_id__chg_field_mailaddressmailbox_ma.py
similarity index 100%
rename from gnuviechadmin/managemails/migrations/0004_auto__del_field_mailaddressmailbox_id__chg_field_mailaddressmailbox_ma.py
rename to gnuviechadmin/managemails/south_migrations/0004_auto__del_field_mailaddressmailbox_id__chg_field_mailaddressmailbox_ma.py
diff --git a/gnuviechadmin/managemails/migrations/0005_auto__add_field_mailaddressmailbox_created__add_field_mailaddressmailb.py b/gnuviechadmin/managemails/south_migrations/0005_auto__add_field_mailaddressmailbox_created__add_field_mailaddressmailb.py
similarity index 100%
rename from gnuviechadmin/managemails/migrations/0005_auto__add_field_mailaddressmailbox_created__add_field_mailaddressmailb.py
rename to gnuviechadmin/managemails/south_migrations/0005_auto__add_field_mailaddressmailbox_created__add_field_mailaddressmailb.py
diff --git a/gnuviechadmin/managemails/migrations/0006_add_osusers_for_mailboxes.py b/gnuviechadmin/managemails/south_migrations/0006_add_osusers_for_mailboxes.py
similarity index 100%
rename from gnuviechadmin/managemails/migrations/0006_add_osusers_for_mailboxes.py
rename to gnuviechadmin/managemails/south_migrations/0006_add_osusers_for_mailboxes.py
diff --git a/gnuviechadmin/managemails/migrations/0007_use_osusers_for_mailboxes.py b/gnuviechadmin/managemails/south_migrations/0007_use_osusers_for_mailboxes.py
similarity index 100%
rename from gnuviechadmin/managemails/migrations/0007_use_osusers_for_mailboxes.py
rename to gnuviechadmin/managemails/south_migrations/0007_use_osusers_for_mailboxes.py
diff --git a/gnuviechadmin/managemails/migrations/0008_copy_existing_maildomains.py b/gnuviechadmin/managemails/south_migrations/0008_copy_existing_maildomains.py
similarity index 100%
rename from gnuviechadmin/managemails/migrations/0008_copy_existing_maildomains.py
rename to gnuviechadmin/managemails/south_migrations/0008_copy_existing_maildomains.py
diff --git a/gnuviechadmin/managemails/migrations/0009_auto__del_maildomain__del_field_mailbox_uid__chg_field_mailaddress_dom.py b/gnuviechadmin/managemails/south_migrations/0009_auto__del_maildomain__del_field_mailbox_uid__chg_field_mailaddress_dom.py
similarity index 100%
rename from gnuviechadmin/managemails/migrations/0009_auto__del_maildomain__del_field_mailbox_uid__chg_field_mailaddress_dom.py
rename to gnuviechadmin/managemails/south_migrations/0009_auto__del_maildomain__del_field_mailbox_uid__chg_field_mailaddress_dom.py
diff --git a/gnuviechadmin/managemails/migrations/__init__.py b/gnuviechadmin/managemails/south_migrations/__init__.py
similarity index 100%
rename from gnuviechadmin/managemails/migrations/__init__.py
rename to gnuviechadmin/managemails/south_migrations/__init__.py
diff --git a/gnuviechadmin/osusers/migrations/0001_initial.py b/gnuviechadmin/osusers/south_migrations/0001_initial.py
similarity index 100%
rename from gnuviechadmin/osusers/migrations/0001_initial.py
rename to gnuviechadmin/osusers/south_migrations/0001_initial.py
diff --git a/gnuviechadmin/osusers/migrations/0002_auto__add_additionalgroup__add_unique_additionalgroup_user_group.py b/gnuviechadmin/osusers/south_migrations/0002_auto__add_additionalgroup__add_unique_additionalgroup_user_group.py
similarity index 100%
rename from gnuviechadmin/osusers/migrations/0002_auto__add_additionalgroup__add_unique_additionalgroup_user_group.py
rename to gnuviechadmin/osusers/south_migrations/0002_auto__add_additionalgroup__add_unique_additionalgroup_user_group.py
diff --git a/gnuviechadmin/osusers/migrations/0003_auto__add_grouptaskresult__add_usertaskresult__add_deletetaskresult.py b/gnuviechadmin/osusers/south_migrations/0003_auto__add_grouptaskresult__add_usertaskresult__add_deletetaskresult.py
similarity index 100%
rename from gnuviechadmin/osusers/migrations/0003_auto__add_grouptaskresult__add_usertaskresult__add_deletetaskresult.py
rename to gnuviechadmin/osusers/south_migrations/0003_auto__add_grouptaskresult__add_usertaskresult__add_deletetaskresult.py
diff --git a/gnuviechadmin/osusers/migrations/0004_auto__add_index_grouptaskresult_task_name__add_index_usertaskresult_ta.py b/gnuviechadmin/osusers/south_migrations/0004_auto__add_index_grouptaskresult_task_name__add_index_usertaskresult_ta.py
similarity index 100%
rename from gnuviechadmin/osusers/migrations/0004_auto__add_index_grouptaskresult_task_name__add_index_usertaskresult_ta.py
rename to gnuviechadmin/osusers/south_migrations/0004_auto__add_index_grouptaskresult_task_name__add_index_usertaskresult_ta.py
diff --git a/gnuviechadmin/osusers/migrations/__init__.py b/gnuviechadmin/osusers/south_migrations/__init__.py
similarity index 100%
rename from gnuviechadmin/osusers/migrations/__init__.py
rename to gnuviechadmin/osusers/south_migrations/__init__.py
diff --git a/requirements/base.txt b/requirements/base.txt
index f3b8dd8..a711eac 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -3,7 +3,7 @@ bpython==0.13
 django-braces==1.4.0
 django-model-utils==2.0.3
 logutils==0.3.3
-South==0.8.4
+South==1.0.1
 psycopg2==2.5.3
 passlib==1.6.2
 celery==3.1.11