diff --git a/eav/models.py b/eav/models.py
index 1544567..71c5c63 100644
--- a/eav/models.py
+++ b/eav/models.py
@@ -39,7 +39,7 @@ from django.db import models
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes import fields as generic
 from django.contrib.sites.models import Site
 from django.contrib.sites.managers import CurrentSiteManager
 from django.conf import settings
diff --git a/eav/registry.py b/eav/registry.py
index 82ed5b7..84646aa 100644
--- a/eav/registry.py
+++ b/eav/registry.py
@@ -29,7 +29,7 @@ Classes
 
 from django.db.utils import DatabaseError
 from django.db.models.signals import pre_init, post_init, pre_save, post_save
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes import fields as generic
 
 from .managers import EntityManager
 from .models import Entity, Attribute, Value