diff --git a/doc/ref/modules/all/index.rst b/doc/ref/modules/all/index.rst
index 5b200ad147..86c260226e 100644
--- a/doc/ref/modules/all/index.rst
+++ b/doc/ref/modules/all/index.rst
@@ -41,7 +41,7 @@ Full list of builtin execution modules
     debian_service
     dig
     disk
-    django
+    djangomod
     dnsmasq
     dnsutil
     dpkg
diff --git a/doc/ref/modules/all/salt.modules.django.rst b/doc/ref/modules/all/salt.modules.django.rst
deleted file mode 100644
index d2f10d460d..0000000000
--- a/doc/ref/modules/all/salt.modules.django.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-===================
-salt.modules.django
-===================
-
-.. automodule:: salt.modules.django
-    :members:
diff --git a/doc/ref/modules/all/salt.modules.djangomod.rst b/doc/ref/modules/all/salt.modules.djangomod.rst
index 1b5a3721f4..f10b759509 100644
--- a/doc/ref/modules/all/salt.modules.djangomod.rst
+++ b/doc/ref/modules/all/salt.modules.djangomod.rst
@@ -1 +1,6 @@
-Please see :doc:`salt.modules.django`.
+======================
+salt.modules.djangomod
+======================
+
+.. automodule:: salt.modules.djangomod
+    :members:
\ No newline at end of file
diff --git a/salt/modules/django.py b/salt/modules/djangomod.py
similarity index 98%
rename from salt/modules/django.py
rename to salt/modules/djangomod.py
index a24c24204a..2a69090dfb 100644
--- a/salt/modules/django.py
+++ b/salt/modules/djangomod.py
@@ -3,12 +3,11 @@ Manage Django sites
 '''
 
 # Import python libs
-from __future__ import absolute_import
 import os
 
 
 def __virtual__():
-    return True
+    return 'django'
 
 
 def _get_django_admin(bin_env):
@@ -84,7 +83,7 @@ def syncdb(settings_module,
         args.append('noinput')
 
     return command(settings_module,
-                   'syncdb',
+                  'syncdb',
                    bin_env,
                    pythonpath,
                    env,
diff --git a/tests/integration/modules/django.py b/tests/integration/modules/django.py
index 398661bd2a..55868bc713 100644
--- a/tests/integration/modules/django.py
+++ b/tests/integration/modules/django.py
@@ -8,7 +8,7 @@ ensure_in_syspath('../../')
 
 # Import salt libs
 import integration
-from salt.modules import django
+from salt.modules import djangomod as django
 
 try:
     from mock import MagicMock, patch