diff --git a/package.json b/package.json
index 9b2c523..c5edaff 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "html-entities": "^1.2.0",
     "jszip": "^3.0.0",
     "mithril": "github:lhorie/mithril.js#rewrite",
+    "mithril-node-render": "github:stephanhoyer/mithril-node-render#rewrite",
     "pretty-data": "^0.40.0",
     "tidy-html5": "^0.1.1",
     "zero-fill": "^2.2.3"
diff --git a/src/cleanMarkup.js b/src/cleanMarkup.js
index 3db9f4a..4733acf 100644
--- a/src/cleanMarkup.js
+++ b/src/cleanMarkup.js
@@ -1,6 +1,6 @@
 
 import hyperscript from 'mithril/render/hyperscript'
-import render from './lib/mithril-node-render'
+import render from 'mithril-node-render'
 import isNode from 'detect-node'
 
 const m = hyperscript
diff --git a/src/lib/mithril-node-render.js b/src/lib/mithril-node-render.js
deleted file mode 100644
index 8a2e0c6..0000000
--- a/src/lib/mithril-node-render.js
+++ /dev/null
@@ -1,150 +0,0 @@
-'use strict'
-
-var VOID_TAGS = ['area', 'base', 'br', 'col', 'command', 'embed', 'hr',
-  'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track',
-  'wbr', '!doctype']
-
-function isArray (thing) {
-  return Object.prototype.toString.call(thing) === '[object Array]'
-}
-
-function camelToDash (str) {
-  return str.replace(/\W+/g, '-')
-    .replace(/([a-z\d])([A-Z])/g, '$1-$2')
-}
-
-function removeEmpties (n) {
-  return n !== ''
-}
-
-// shameless stolen from https://github.com/punkave/sanitize-html
-function escapeHtml (s, replaceDoubleQuote) {
-  if (s === 'undefined') {
-    s = ''
-  }
-  if (typeof (s) !== 'string') {
-    s = s + ''
-  }
-  s = s.replace(/\&/g, '&amp;').replace(/</g, '&lt;').replace(/\>/g, '&gt;')
-  if (replaceDoubleQuote) {
-    return s.replace(/\"/g, '&quot;')
-  }
-  return s
-}
-
-function createAttrString (view, escapeAttributeValue) {
-  var attrs = view.attrs
-
-  if (!attrs || !Object.keys(attrs).length) {
-    return ''
-  }
-
-  return Object.keys(attrs).map(function (name) {
-    var value = attrs[name]
-    if (typeof value === 'undefined' || value === null || typeof value === 'function') {
-      return
-    }
-    if (typeof value === 'boolean') {
-      return value ? ' ' + name : ''
-    }
-    if (name === 'style') {
-      if (!value) {
-        return
-      }
-      var styles = attrs.style
-      if (typeof styles === 'object') {
-        styles = Object.keys(styles).map(function (property) {
-          return styles[property] !== '' ? [camelToDash(property).toLowerCase(), styles[property]].join(':') : ''
-        }).filter(removeEmpties).join(';')
-      }
-      return styles !== '' ? ' style="' + escapeAttributeValue(styles, true) + '"' : ''
-    }
-
-    // Handle SVG <use> tags specially
-    if (name === 'href' && view.tag === 'use') {
-      return ' xlink:href="' + escapeAttributeValue(value, true) + '"'
-    }
-
-    return ' ' + (name === 'className' ? 'class' : name) + '="' + escapeAttributeValue(value, true) + '"'
-  }).join('')
-}
-
-function createChildrenContent (view, options) {
-  if (view.text != null) {
-    return options.escapeString(view.text)
-  }
-  if (isArray(view.children) && !view.children.length) {
-    return ''
-  }
-
-  return render(view.children, options)
-}
-
-function render (view, options) {
-  options = options || {}
-
-  var defaultOptions = {
-    escapeAttributeValue: escapeHtml,
-    escapeString: escapeHtml,
-    strict: false
-  }
-
-  Object.keys(defaultOptions).forEach(function (key) {
-    if (!options.hasOwnProperty(key)) options[key] = defaultOptions[key]
-  })
-
-  var type = typeof view
-
-  if (type === 'string') {
-    return options.escapeString(view)
-  }
-
-  if (type === 'number' || type === 'boolean') {
-    return view
-  }
-
-  if (!view) {
-    return ''
-  }
-
-  if (isArray(view)) {
-    return view.map(function (view) { return render(view, options) }).join('')
-  }
-
-  // compontent
-  if (typeof view.tag === 'object' && view.tag.view) {
-    var compontent = view.tag
-    var node = view
-    if (compontent.oninit) {
-      compontent.oninit(node)
-    }
-    var result = render(compontent.view(node), options)
-    if (compontent.onremove) {
-      compontent.onremove(node)
-    }
-    return result
-  }
-
-  if (view.tag === '<') {
-    return '' + view.children
-  }
-  var children = createChildrenContent(view, options)
-  if (view.tag === '#') {
-    return options.escapeString(children)
-  }
-  if (view.tag === '[') {
-    return '' + children
-  }
-  if (!children && (options.strict || VOID_TAGS.indexOf(view.tag.toLowerCase()) >= 0)) {
-    return '<' + view.tag + createAttrString(view, options.escapeAttributeValue) + (options.strict ? '/' : '') + '>'
-  }
-  return [
-    '<', view.tag, createAttrString(view, options.escapeAttributeValue), '>',
-    children,
-    '</', view.tag, '>'
-  ].join('')
-}
-
-render.escapeHtml = escapeHtml
-
-module.exports = render
diff --git a/src/templates.js b/src/templates.js
index 9d0dc4d..ddd75a5 100644
--- a/src/templates.js
+++ b/src/templates.js
@@ -1,7 +1,7 @@
 
 import hyperscript from 'mithril/render/hyperscript'
 import trust from 'mithril/render/trust'
-import render from './lib/mithril-node-render'
+import render from 'mithril-node-render'
 import { pd as pretty } from 'pretty-data'
 import zeroFill from 'zero-fill'