diff --git a/package.json b/package.json
index 5f3a012..e99c04b 100644
--- a/package.json
+++ b/package.json
@@ -50,5 +50,8 @@
     "dist",
     "src"
   ],
-  "version": "2.0.2"
+  "version": "2.1.0",
+  "engines": {
+    "node": ">=6.0.0"
+  }
 }
diff --git a/src/index.js b/src/index.js
index f5ea9c4..56c74e2 100644
--- a/src/index.js
+++ b/src/index.js
@@ -47,21 +47,36 @@ export default function (CustomElement, opts) {
       this.componentWillReceiveProps(this.props);
     }
     componentWillReceiveProps(props) {
-      const node = ReactDOM.findDOMNode(this);
-      Object.keys(props).forEach(name => {
-        if (name === 'children' || name === 'style') {
-          return;
-        }
+        const node = ReactDOM.findDOMNode(this);
+        Object.keys(props).forEach(name => {
+            if (name === 'children' || name === 'style') {
+                return;
+            }
 
-        if (name.indexOf('on') === 0 && name[2] === name[2].toUpperCase()) {
-          syncEvent(node, name.substring(2), props[name]);
-        } else {
-          node[name] = props[name];
-        }
-      });
+            const value = props[name];
+
+            if (name.indexOf('on') === 0 && name[2] === name[2].toUpperCase()) {
+                syncEvent(node, name.substring(2), value);
+            } else if (name.indexOf('attrs') === 0 && value && typeof value === 'object') {
+              Object.keys(value).forEach(attrName => {
+                  const attrValue = value[attrName];
+
+                  node.setAttribute(attrName, attrValue);
+              })
+            } else {
+                node[name] = props[name];
+            }
+        });
     }
     render() {
-      return React.createElement(tagName, { style: this.props.style }, this.props.children);
+      return React.createElement(
+          tagName,
+          {
+            is: this.props.is,
+            style: this.props.style
+          },
+          this.props.children
+      );
     }
   }
 
diff --git a/test/unit.js b/test/unit.js
index da475f0..5da14c7 100644
--- a/test/unit.js
+++ b/test/unit.js
@@ -1,3 +1,4 @@
+import './unit/attrs';
 import './unit/children';
 import './unit/events';
 import './unit/display-name';
diff --git a/test/unit/attrs.js b/test/unit/attrs.js
new file mode 100644
index 0000000..470438a
--- /dev/null
+++ b/test/unit/attrs.js
@@ -0,0 +1,24 @@
+import reactify from '../../src/index';
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+let x = 0;
+
+function createComponent() {
+    const tagName = `x-attributes-${x++}`;
+
+    return document.registerElement(tagName, {
+        prototype: Object.create(HTMLElement.prototype),
+    })
+}
+
+describe('attrs', () => {
+    it('should pass on properties that start with "attr-" as attributes', () => {
+        const Comp = reactify(createComponent());
+        const attrs = {
+            'data-test': 'test-data'
+        };
+        const comp = ReactDOM.render(<Comp attrs={attrs}/>, window.fixture);
+        expect(ReactDOM.findDOMNode(comp).getAttribute('data-test')).to.equal('test-data');
+    });
+});