diff --git a/io/emoncms/88-emoncms.html b/io/emoncms/88-emoncms.html
new file mode 100644
index 00000000..ff71828b
--- /dev/null
+++ b/io/emoncms/88-emoncms.html
@@ -0,0 +1,94 @@
+<!--
+  Copyright 2013 Henrik Olsson henols@gmail.com
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<script type="text/x-red" data-template-name="emoncms">
+    <div class="form-row">
+        <label for="node-input-emonServer"><i class="icon-globe"></i> Emoncms server</label>
+        <input type="text" id="node-input-emonServer">
+    </div>
+    <div class="form-row">
+        <label for="node-input-topic"><i class="icon-tasks"></i> Topic</label>
+        <input type="text" id="node-input-topic" placeholder="">
+    </div>
+    <div class="form-row">
+        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Emoncms">
+    </div>
+    <div class="form-row">
+        <label for="node-input-nodegroup"><i class="icon-tag"></i> Node</label>
+        <input type="text" id="node-input-nodegroup" placeholder="">
+    </div>
+    <div class="form-tips">If Topic is left blank the output Topic is the same as the input Topic.</div>
+</script>
+
+<script type="text/x-red" data-help-name="emoncms">
+	<p>Performs post to Emoncms.</p>
+	<p>The Topic is not mandatory, if Topic is left blank <b>msg.topic</b> will used.</p>
+	<p>The Node is not mandatory, (numberic)</p>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('emoncms',{
+        category: 'output',
+        color:"rgb(91, 192, 222)",
+         defaults: {
+            name: {value:"Emoncms"},
+            emonServer: {type:"emoncms-server", required:true},
+            topic: {value:""},
+            nodegroup: {value:""}
+        },
+        inputs:1,
+        outputs:0,
+        icon: "emoncms-logo.png",
+        align: "right",
+        label: function() {
+            return this.name||this.baseurl;
+        },
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        }
+    });
+</script>
+
+<script type="text/x-red" data-template-name="emoncms-server">
+    <div class="form-row">
+        <label for="node-config-input-server"><i class="icon-globe"></i> Base URL</label>
+        <input type="text" id="node-config-input-server">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-apikey"><i class="icon-tasks"></i> API key</label>
+        <input type="text" id="node-config-input-apikey">
+    </div>
+    <div class="form-row">
+        <label for="node-config-input-name"><i class="icon-tag"></i> Name</label>
+        <input type="text" id="node-config-input-name">
+    </div>
+<div class="form-tips">The <b>Base URL</b> is the URL to the Emoncms root directory.</div>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('emoncms-server',{
+        category: 'config',
+        defaults: {
+            server: {value:"http://localhost",required:true},
+            apikey: {value:"",required:true},
+            name: {value:""}
+        },
+        label: function() {
+            return this.name||this.server;
+        }
+    });
+</script>
diff --git a/io/emoncms/88-emoncms.js b/io/emoncms/88-emoncms.js
new file mode 100644
index 00000000..a40ee9a5
--- /dev/null
+++ b/io/emoncms/88-emoncms.js
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2013 Henrik Olsson henols@gmail.com
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+var RED = require(process.env.NODE_RED_HOME+"/red/red");
+//The Server Definition - this opens (and closes) the connection
+function EmoncmsServerNode(n) {
+    RED.nodes.createNode(this,n);
+    this.server = n.server;
+    this.apikey = n.apikey;
+    this.name = n.name;
+}
+RED.nodes.registerType("emoncms-server",EmoncmsServerNode);
+
+function Emoncms(n) {
+	RED.nodes.createNode(this,n);
+    this.emonServer = n.emonServer;
+    var sc = RED.nodes.getNode(this.emonServer);
+
+	this.baseurl = sc.server;
+	this.apikey = sc.apikey;
+
+	this.topic = n.topic ||"";
+	this.nodegroup = n.nodegroup || "";
+	var node = this;
+	if (this.baseurl.substring(0,5) === "https") { var http = require("https"); }
+	else { var http = require("http"); }
+	this.on("input", function(msg) {
+		
+		var topic = this.topic || msg.topic;
+		this.url = this.baseurl + '/input/post.json?json={' + topic + ':' + msg.payload+'}&apikey='+this.apikey;
+		if(this.nodegroup != ""){
+			this.url += '&node='+this.nodegroup;
+		}
+		node.log("[emoncms] "+this.url);
+		http.get(this.url, function(res) {
+			node.log("Http response: " + res.statusCode);
+ 			msg.rc = res.statusCode;
+			msg.payload = "";
+			if ((msg.rc != 200) && (msg.rc != 404)) {
+				node.send(msg);
+			}
+			res.setEncoding('utf8');
+			res.on('data', function(chunk) {
+				msg.payload += chunk;
+			});
+			res.on('end', function() {
+				node.send(msg);
+			});
+		}).on('error', function(e) {
+			// node.error(e);
+			msg.rc = 503;
+			msg.payload = e;
+			node.send(msg);
+		});
+	});
+}
+
+RED.nodes.registerType("emoncms",Emoncms);
diff --git a/io/emoncms/icons/emoncms-logo.png b/io/emoncms/icons/emoncms-logo.png
new file mode 100644
index 00000000..8cde7871
Binary files /dev/null and b/io/emoncms/icons/emoncms-logo.png differ