diff --git a/homeassistant/components/lifx/__init__.py b/homeassistant/components/lifx/__init__.py
index f2713197ed1..a2ae6266a8d 100644
--- a/homeassistant/components/lifx/__init__.py
+++ b/homeassistant/components/lifx/__init__.py
@@ -3,6 +3,7 @@ import voluptuous as vol
 import homeassistant.helpers.config_validation as cv
 
 from homeassistant import config_entries
+from homeassistant.const import CONF_PORT
 from homeassistant.helpers import config_entry_flow
 from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
 
@@ -15,6 +16,7 @@ CONF_BROADCAST = 'broadcast'
 
 INTERFACE_SCHEMA = vol.Schema({
     vol.Optional(CONF_SERVER): cv.string,
+    vol.Optional(CONF_PORT): cv.port,
     vol.Optional(CONF_BROADCAST): cv.string,
 })
 
diff --git a/homeassistant/components/light/lifx.py b/homeassistant/components/light/lifx.py
index 8951b2876a2..f448d61ee04 100644
--- a/homeassistant/components/light/lifx.py
+++ b/homeassistant/components/light/lifx.py
@@ -22,7 +22,8 @@ from homeassistant.components.light import (
     SUPPORT_TRANSITION, VALID_BRIGHTNESS, VALID_BRIGHTNESS_PCT, Light,
     preprocess_turn_on_alternatives)
 from homeassistant.components.lifx import (
-    DOMAIN as LIFX_DOMAIN, DATA_LIFX_MANAGER, CONF_SERVER, CONF_BROADCAST)
+    DOMAIN as LIFX_DOMAIN, DATA_LIFX_MANAGER, CONF_SERVER, CONF_PORT,
+    CONF_BROADCAST)
 from homeassistant.const import ATTR_ENTITY_ID, EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
@@ -230,6 +231,9 @@ class LIFXManager:
         listen_ip = interface.get(CONF_SERVER)
         if listen_ip:
             kwargs['listen_ip'] = listen_ip
+        listen_port = interface.get(CONF_PORT)
+        if listen_port:
+            kwargs['listen_port'] = listen_port
         lifx_discovery.start(**kwargs)
 
         self.discoveries.append(lifx_discovery)