diff --git a/jedi/plugins/django.py b/jedi/plugins/django.py
index 6d50153c..3ec807e0 100644
--- a/jedi/plugins/django.py
+++ b/jedi/plugins/django.py
@@ -18,6 +18,7 @@ mapping = {
     'CharField': (None, 'str'),
     'TextField': (None, 'str'),
     'EmailField': (None, 'str'),
+    'GenericIPAddressField': (None, 'str'),
     'FloatField': (None, 'float'),
     'BinaryField': (None, 'bytes'),
     'BooleanField': (None, 'bool'),
diff --git a/test/completion/django.py b/test/completion/django.py
index 295908d7..353c992d 100644
--- a/test/completion/django.py
+++ b/test/completion/django.py
@@ -27,6 +27,7 @@ class BusinessModel(models.Model):
     char_field = models.CharField()
     text_field = models.TextField()
     email_field = models.EmailField()
+    ip_address_field = models.GenericIPAddressField()
     float_field = models.FloatField()
     binary_field = models.BinaryField()
     boolean_field = models.BooleanField()
@@ -59,6 +60,8 @@ model_instance.char_field
 model_instance.text_field
 #? str()
 model_instance.email_field
+#? str()
+model_instance.ip_address_field
 #? float()
 model_instance.float_field
 #? bytes()