diff --git a/django_elasticsearch_dsl/documents.py b/django_elasticsearch_dsl/documents.py
index 719ec9c1..ec7d37ee 100644
--- a/django_elasticsearch_dsl/documents.py
+++ b/django_elasticsearch_dsl/documents.py
@@ -22,7 +22,7 @@
     LongField,
     ShortField,
     TextField,
-)
+    ObjectField)
 from .search import Search
 
 model_field_class_to_field_class = {
@@ -49,8 +49,16 @@
     models.URLField: TextField,
 }
 
+try:
+    from django.contrib.postgres.fields import JSONField
+    model_field_class_to_field_class[JSONField] = ObjectField
+except ImportError:
+    pass
+
+
 class DocType(DSLDocument):
     _prepared_fields = []
+
     def __init__(self, related_instance_to_ignore=None, **kwargs):
         super(DocType, self).__init__(**kwargs)
         self._related_instance_to_ignore = related_instance_to_ignore
diff --git a/requirements.txt b/requirements.txt
index cb1678c7..77ddcb3f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,2 @@
 django>=1.9.6
 elasticsearch-dsl>=7.0.0,<8.0.0
-