diff --git a/.coveragerc b/.coveragerc
index c76edce73fb..caadb341b59 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -149,6 +149,7 @@ omit =
     homeassistant/components/device_tracker/volvooncall.py
     homeassistant/components/discovery.py
     homeassistant/components/downloader.py
+    homeassistant/components/emoncms_history.py
     homeassistant/components/fan/mqtt.py
     homeassistant/components/feedreader.py
     homeassistant/components/foursquare.py
diff --git a/homeassistant/components/emoncms_history.py b/homeassistant/components/emoncms_history.py
new file mode 100644
index 00000000000..4e07447b027
--- /dev/null
+++ b/homeassistant/components/emoncms_history.py
@@ -0,0 +1,95 @@
+"""
+A component which allows you to send data to Emoncms.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/emoncms_history/
+"""
+import logging
+from datetime import timedelta
+
+import voluptuous as vol
+import requests
+
+from homeassistant.const import (
+    CONF_API_KEY, CONF_WHITELIST,
+    CONF_URL, STATE_UNKNOWN,
+    STATE_UNAVAILABLE,
+    CONF_SCAN_INTERVAL)
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import state as state_helper
+from homeassistant.helpers.event import track_point_in_time
+from homeassistant.util import dt as dt_util
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = "emoncms_history"
+CONF_INPUTNODE = "inputnode"
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_API_KEY): cv.string,
+        vol.Required(CONF_URL): cv.string,
+        vol.Required(CONF_INPUTNODE): cv.positive_int,
+        vol.Required(CONF_WHITELIST): cv.entity_ids,
+        vol.Optional(CONF_SCAN_INTERVAL, default=30): cv.positive_int,
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+
+def setup(hass, config):
+    """Setup the emoncms_history component."""
+    conf = config[DOMAIN]
+    whitelist = conf.get(CONF_WHITELIST)
+
+    def send_data(url, apikey, node, payload):
+        """Send payload data to emoncms."""
+        try:
+            fullurl = "{}/input/post.json".format(url)
+            req = requests.post(fullurl,
+                                params={"node": node},
+                                data={"apikey": apikey,
+                                      "data": payload},
+                                allow_redirects=True,
+                                timeout=5)
+
+        except requests.exceptions.RequestException:
+            _LOGGER.error("Error saving data '%s' to '%s'",
+                          payload, fullurl)
+
+        else:
+            if req.status_code != 200:
+                _LOGGER.error("Error saving data '%s' to '%s'" +
+                              "(http status code = %d)", payload,
+                              fullurl, req.status_code)
+
+    def update_emoncms(time):
+        """Send whitelisted entities states reguarly to emoncms."""
+        payload_dict = {}
+
+        for entity_id in whitelist:
+            state = hass.states.get(entity_id)
+
+            if state is None or state.state in (
+                    STATE_UNKNOWN, "", STATE_UNAVAILABLE):
+                continue
+
+            try:
+                payload_dict[entity_id] = state_helper.state_as_number(
+                    state)
+            except ValueError:
+                continue
+
+        if len(payload_dict) > 0:
+            payload = "{%s}" % ",".join("{}:{}".format(key, val)
+                                        for key, val in
+                                        payload_dict.items())
+
+            send_data(conf.get(CONF_URL), conf.get(CONF_API_KEY),
+                      str(conf.get(CONF_INPUTNODE)), payload)
+
+        track_point_in_time(hass, update_emoncms, time +
+                            timedelta(seconds=conf.get(
+                                CONF_SCAN_INTERVAL)))
+
+    update_emoncms(dt_util.utcnow())
+    return True