diff --git a/machines/forms.py b/machines/forms.py
index f663f5a9..3f6a3864 100644
--- a/machines/forms.py
+++ b/machines/forms.py
@@ -212,6 +212,11 @@ class MachineTypeForm(FormRevMixin, ModelForm):
     class Meta:
         model = MachineType
         fields = ["name", "ip_type"]
+        widgets = {
+            "ip_type": AutocompleteModelMixin(
+                url="/machines/iptype-autocomplete",
+            ),
+        }
 
     def __init__(self, *args, **kwargs):
         prefix = kwargs.pop("prefix", self.Meta.model.__name__)
diff --git a/machines/templates/machines/machine.html b/machines/templates/machines/machine.html
index 2cd97097..bc1cdbeb 100644
--- a/machines/templates/machines/machine.html
+++ b/machines/templates/machines/machine.html
@@ -47,6 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
     {% endif %}
     {% if machinetypeform %}
         {% bootstrap_form_errors machinetypeform %}
+	{{ machinetypeform.media }}
     {% endif %}
     {% if extensionform %}
         {% bootstrap_form_errors extensionform %}
diff --git a/machines/urls.py b/machines/urls.py
index 387bdae1..98a6695f 100644
--- a/machines/urls.py
+++ b/machines/urls.py
@@ -159,6 +159,7 @@ urlpatterns = [
     url(r'^interface-autocomplete/$', views_autocomplete.InterfaceAutocomplete.as_view(), name='interface-autocomplete',),
     url(r'^machine-autocomplete/$', views_autocomplete.MachineAutocomplete.as_view(), name='machine-autocomplete',),
     url(r'^machinetype-autocomplete/$', views_autocomplete.MachineTypeAutocomplete.as_view(), name='machinetype-autocomplete',),
+    url(r'^iptype-autocomplete/$', views_autocomplete.IpTypeAutocomplete.as_view(), name='iptype-autocomplete',),
     url(r'^extension-autocomplete/$', views_autocomplete.ExtensionAutocomplete.as_view(), name='extension-autocomplete',),
     url(r'^domain-autocomplete/$', views_autocomplete.DomainAutocomplete.as_view(), name='domain-autocomplete',),
     url(r'^ouvertureportlist-autocomplete/$', views_autocomplete.OuverturePortListAutocomplete.as_view(), name='ouvertureportlist-autocomplete',),
diff --git a/machines/views_autocomplete.py b/machines/views_autocomplete.py
index a79fd276..e68a11c9 100644
--- a/machines/views_autocomplete.py
+++ b/machines/views_autocomplete.py
@@ -39,6 +39,7 @@ from .models import (
     Machine,
     Vlan,
     MachineType,
+    IpType,
     Extension,
     Domain,
     OuverturePortList,
@@ -64,6 +65,10 @@ class MachineTypeAutocomplete(AutocompleteViewMixin):
     obj_type = MachineType
 
 
+class IpTypeAutocomplete(AutocompleteViewMixin):
+    obj_type = IpType
+
+
 class ExtensionAutocomplete(AutocompleteViewMixin):
     obj_type = Extension