diff --git a/index.js b/index.js
index a3e2541..bd1b263 100644
--- a/index.js
+++ b/index.js
@@ -106,6 +106,8 @@ function context () {
           }
           else if (k.substr(0, 5) === "data-") {
             e.setAttribute(k, l[k])
+          } else if (k === 'class') {
+            l[k].split(/\s+/).forEach(klass => ClassList(e).add(klass))
           } else {
             e[k] = l[k]
           }
diff --git a/test/index.js b/test/index.js
index c007cc5..ee6178e 100644
--- a/test/index.js
+++ b/test/index.js
@@ -159,3 +159,10 @@ test('unicode selectors', function (t) {
   t.equal(h('span#⛄').outerHTML, '<span id="⛄"></span>')
   t.end()
 })
+
+test('classes from tag and attrs are merged', t => {
+  t.equal(h('.c1', {class: 'c2'}).outerHTML, '<div class="c1 c2"></div>')
+  t.equal(h('.c1.c2', {class: 'c3 c4'}).outerHTML, '<div class="c1 c2 c3 c4"></div>')
+  t.equal(h('.c1.c2', {class: 'c2 c3'}).outerHTML, '<div class="c1 c2 c3"></div>')
+  t.end()
+})