diff --git a/django/contrib/gis/db/models/__init__.py b/django/contrib/gis/db/models/__init__.py
index e69de29bb2..cffa6e9b61 100644
--- a/django/contrib/gis/db/models/__init__.py
+++ b/django/contrib/gis/db/models/__init__.py
@@ -0,0 +1,12 @@
+# Want to get everything from the 'normal' models package.
+from django.db.models import *
+
+# The GeoManager class.
+from django.contrib.gis.db.models.manager import GeoManager
+
+# The various PostGIS/OpenGIS enabled fields.
+from django.contrib.gis.db.models.fields import \
+     GeometryField, PointField, LineString, PolygonField, \
+     MultiPointField, MultiLineStringField, MultiPolygonField, \
+     GeometryCollectionField
+
diff --git a/django/contrib/gis/manager.py b/django/contrib/gis/db/models/manager.py
similarity index 100%
rename from django/contrib/gis/manager.py
rename to django/contrib/gis/db/models/manager.py
diff --git a/django/contrib/gis/postgis.py b/django/contrib/gis/db/models/postgis.py
similarity index 100%
rename from django/contrib/gis/postgis.py
rename to django/contrib/gis/db/models/postgis.py
diff --git a/django/contrib/gis/query.py b/django/contrib/gis/db/models/query.py
similarity index 100%
rename from django/contrib/gis/query.py
rename to django/contrib/gis/db/models/query.py