diff --git a/dist/domtokenlist-umd.js b/dist/domtokenlist-umd.js
new file mode 100644
index 0000000..6f027ed
--- /dev/null
+++ b/dist/domtokenlist-umd.js
@@ -0,0 +1,138 @@
+/*! DOMTokenlist shim | Copyright 2016 Jonathan Wilsson and Bogdan Chadkin. */
+;(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    define([], factory);
+  } else if (typeof exports === 'object') {
+    module.exports = factory();
+  } else {
+    root.DOMTokenList = factory();
+  }
+}(this, function() {
+'use strict';
+
+var arr = [];
+
+var inArray = function (array, value) {
+    var i;
+
+    if (arr.indexOf) {
+        return arr.indexOf.call(array, value);
+    }
+
+    for (i = 0; i < array.length; i++) {
+        if (array[i] === value) {
+            return i;
+        }
+    }
+
+    return -1;
+};
+
+var validateToken = function (token) {
+    var whitespace = /[\u0009\u000A\u000C\u000D\u0020]/;
+
+    if (token === '' || whitespace.test(token)) {
+        throw new Error('Token must not be empty or contain whitespace.');
+    }
+};
+
+var DOMTokenList = function (element, prop) {
+    var inst = this;
+    var i;
+    var values = [];
+
+    if (element && prop) {
+        inst.element = element;
+        inst.prop = prop;
+
+        if (element[prop]) {
+            values = element[prop].replace(/^\s+|\s+$/g, '').split(/\s+/);
+
+            for (i = 0; i < values.length; i++) {
+                inst[i] = values[i];
+            }
+        }
+    }
+
+    inst.length = values.length;
+};
+
+DOMTokenList.prototype = {
+    add: function () {
+        var inst = this;
+        var i;
+        var tokens = arguments;
+
+        for (i = 0; i < tokens.length; i++) {
+            validateToken(tokens[i]);
+
+            if (!inst.contains(tokens[i])) {
+                arr.push.call(inst, tokens[i]);
+            }
+        }
+
+        if (inst.element) {
+            inst.element[inst.prop] = inst;
+        }
+    },
+
+    contains: function (token) {
+        validateToken(token);
+
+        return inArray(this, token) !== -1;
+    },
+
+    item: function (index) {
+        return this[index] || null;
+    },
+
+    remove: function () {
+        var tokens = arguments;
+        var inst = this;
+        var key;
+        var i;
+
+        for (i = 0; i < tokens.length; i++) {
+            validateToken(tokens[i]);
+
+            key = inArray(inst, tokens[i]);
+
+            if (key !== -1) {
+                arr.splice.call(inst, key, 1);
+            }
+        }
+
+        if (inst.element) {
+            inst.element[inst.prop] = inst;
+        }
+    },
+
+    toggle: function (token, force) {
+        var inst = this;
+
+        if (inst.contains(token)) {
+            if (force) {
+                return true;
+            }
+
+            inst.remove(token);
+
+            return false;
+        } else {
+            if (force === false) {
+                return false;
+            }
+
+            inst.add(token);
+
+            return true;
+        }
+    },
+
+    toString: function () {
+        return arr.join.call(this, ' ');
+    }
+};
+
+return DOMTokenList;
+}));
diff --git a/dist/domtokenlist-umd.min.js b/dist/domtokenlist-umd.min.js
new file mode 100644
index 0000000..26f80b9
--- /dev/null
+++ b/dist/domtokenlist-umd.min.js
@@ -0,0 +1,2 @@
+/*! DOMTokenlist shim | Copyright 2016 Jonathan Wilsson and Bogdan Chadkin. */
+!function(t,n){"function"==typeof define&&define.amd?define([],n):"object"==typeof exports?module.exports=n():t.DOMTokenList=n()}(this,function(){"use strict";var t=[],n=function(n,e){var r;if(t.indexOf)return t.indexOf.call(n,e);for(r=0;r<n.length;r++)if(n[r]===e)return r;return-1},e=function(t){var n=/[\u0009\u000A\u000C\u000D\u0020]/;if(""===t||n.test(t))throw new Error("Token must not be empty or contain whitespace.")},r=function(t,n){var e,r=this,o=[];if(t&&n&&(r.element=t,r.prop=n,t[n]))for(o=t[n].replace(/^\s+|\s+$/g,"").split(/\s+/),e=0;e<o.length;e++)r[e]=o[e];r.length=o.length};return r.prototype={add:function(){var n,r=this,o=arguments;for(n=0;n<o.length;n++)e(o[n]),r.contains(o[n])||t.push.call(r,o[n]);r.element&&(r.element[r.prop]=r)},contains:function(t){return e(t),-1!==n(this,t)},item:function(t){return this[t]||null},remove:function(){var r,o,i=arguments,u=this;for(o=0;o<i.length;o++)e(i[o]),r=n(u,i[o]),-1!==r&&t.splice.call(u,r,1);u.element&&(u.element[u.prop]=u)},toggle:function(t,n){var e=this;return e.contains(t)?n?!0:(e.remove(t),!1):n===!1?!1:(e.add(t),!0)},toString:function(){return t.join.call(this," ")}},r});
\ No newline at end of file
diff --git a/dist/domtokenlist.js b/dist/domtokenlist.js
index 66dcc30..7fa4c59 100644
--- a/dist/domtokenlist.js
+++ b/dist/domtokenlist.js
@@ -1,4 +1,4 @@
-/*! DOMTokenlist shim | Copyright 2015 Jonathan Wilsson and Bogdan Chadkin. */
+/*! DOMTokenlist shim | Copyright 2016 Jonathan Wilsson and Bogdan Chadkin. */
 ;typeof window !== 'undefined' && (function (window) {
     'use strict';
 
@@ -46,134 +46,133 @@
     }
 }(window));
 
-;typeof window !== 'undefined' && (function (window) {
-    'use strict';
+;typeof window !== 'undefined' && (function(window) {
+'use strict';
 
-    var arr = [];
+var arr = [];
 
-    var inArray = function (array, value) {
-        var i;
+var inArray = function (array, value) {
+    var i;
 
-        if (arr.indexOf) {
-            return arr.indexOf.call(array, value);
-        }
+    if (arr.indexOf) {
+        return arr.indexOf.call(array, value);
+    }
 
-        for (i = 0; i < array.length; i++) {
-            if (array[i] === value) {
-                return i;
-            }
+    for (i = 0; i < array.length; i++) {
+        if (array[i] === value) {
+            return i;
         }
+    }
 
-        return -1;
-    };
+    return -1;
+};
 
-    var validateToken = function (token) {
-        var whitespace = /[\u0009\u000A\u000C\u000D\u0020]/;
+var validateToken = function (token) {
+    var whitespace = /[\u0009\u000A\u000C\u000D\u0020]/;
 
-        if (token === '' || whitespace.test(token)) {
-            throw new Error('Token must not be empty or contain whitespace.');
-        }
-    };
+    if (token === '' || whitespace.test(token)) {
+        throw new Error('Token must not be empty or contain whitespace.');
+    }
+};
 
-    var DOMTokenList = function (element, prop) {
-        var inst = this;
-        var i;
-        var values = [];
+var DOMTokenList = function (element, prop) {
+    var inst = this;
+    var i;
+    var values = [];
 
-        if (element && prop) {
-            inst.element = element;
-            inst.prop = prop;
+    if (element && prop) {
+        inst.element = element;
+        inst.prop = prop;
 
-            if (element[prop]) {
-                values = element[prop].replace(/^\s+|\s+$/g, '').split(/\s+/);
+        if (element[prop]) {
+            values = element[prop].replace(/^\s+|\s+$/g, '').split(/\s+/);
 
-                for (i = 0; i < values.length; i++) {
-                    inst[i] = values[i];
-                }
+            for (i = 0; i < values.length; i++) {
+                inst[i] = values[i];
             }
         }
+    }
 
-        inst.length = values.length;
-    };
+    inst.length = values.length;
+};
 
-    DOMTokenList.prototype = {
-        add: function () {
-            var inst = this;
-            var i;
-            var tokens = arguments;
+DOMTokenList.prototype = {
+    add: function () {
+        var inst = this;
+        var i;
+        var tokens = arguments;
 
-            for (i = 0; i < tokens.length; i++) {
-                validateToken(tokens[i]);
+        for (i = 0; i < tokens.length; i++) {
+            validateToken(tokens[i]);
 
-                if (!inst.contains(tokens[i])) {
-                    arr.push.call(inst, tokens[i]);
-                }
+            if (!inst.contains(tokens[i])) {
+                arr.push.call(inst, tokens[i]);
             }
+        }
 
-            if (inst.element) {
-                inst.element[inst.prop] = inst;
-            }
-        },
+        if (inst.element) {
+            inst.element[inst.prop] = inst;
+        }
+    },
 
-        contains: function (token) {
-            validateToken(token);
+    contains: function (token) {
+        validateToken(token);
 
-            return inArray(this, token) !== -1;
-        },
+        return inArray(this, token) !== -1;
+    },
 
-        item: function (index) {
-            return this[index] || null;
-        },
+    item: function (index) {
+        return this[index] || null;
+    },
 
-        remove: function () {
-            var tokens = arguments;
-            var inst = this;
-            var key;
-            var i;
+    remove: function () {
+        var tokens = arguments;
+        var inst = this;
+        var key;
+        var i;
 
-            for (i = 0; i < tokens.length; i++) {
-                validateToken(tokens[i]);
+        for (i = 0; i < tokens.length; i++) {
+            validateToken(tokens[i]);
 
-                key = inArray(inst, tokens[i]);
+            key = inArray(inst, tokens[i]);
 
-                if (key !== -1) {
-                    arr.splice.call(inst, key, 1);
-                }
+            if (key !== -1) {
+                arr.splice.call(inst, key, 1);
             }
+        }
 
-            if (inst.element) {
-                inst.element[inst.prop] = inst;
-            }
-        },
+        if (inst.element) {
+            inst.element[inst.prop] = inst;
+        }
+    },
 
-        toggle: function (token, force) {
-            var inst = this;
+    toggle: function (token, force) {
+        var inst = this;
 
-            if (inst.contains(token)) {
-                if (force) {
-                    return true;
-                }
+        if (inst.contains(token)) {
+            if (force) {
+                return true;
+            }
 
-                inst.remove(token);
+            inst.remove(token);
 
+            return false;
+        } else {
+            if (force === false) {
                 return false;
-            } else {
-                if (force === false) {
-                    return false;
-                }
-
-                inst.add(token);
-
-                return true;
             }
-        },
 
-        toString: function () {
-            return arr.join.call(this, ' ');
+            inst.add(token);
+
+            return true;
         }
-    };
+    },
 
-    window.DOMTokenList = DOMTokenList;
+    toString: function () {
+        return arr.join.call(this, ' ');
+    }
+};
+window.DOMTokenList = DOMTokenList;
 }(window));
 
 ;typeof window !== 'undefined' && (function () {
diff --git a/dist/domtokenlist.min.js b/dist/domtokenlist.min.js
index 24dfbb7..2e36a44 100644
--- a/dist/domtokenlist.min.js
+++ b/dist/domtokenlist.min.js
@@ -1,2 +1,2 @@
-/*! DOMTokenlist shim | Copyright 2015 Jonathan Wilsson and Bogdan Chadkin. */
+/*! DOMTokenlist shim | Copyright 2016 Jonathan Wilsson and Bogdan Chadkin. */
 "undefined"!=typeof window&&function(t){"use strict";if(t.DOMTokenList){var e=document.createElement("a").classList,n=DOMTokenList.prototype,i=n.add,o=n.remove,r=n.toggle;e.add("c1","c2");var c=function(t){return function(){var e,n=arguments;for(e=0;e<n.length;e+=1)t.call(this,n[e])}};e.contains("c2")||(n.add=c(i),n.remove=c(o)),e.toggle("c1",!0)||(n.toggle=function(t,e){return void 0===e?r.call(this,t):((e?i:o).call(this,t),!!e)})}}(window),"undefined"!=typeof window&&function(t){"use strict";var e=[],n=function(t,n){var i;if(e.indexOf)return e.indexOf.call(t,n);for(i=0;i<t.length;i++)if(t[i]===n)return i;return-1},i=function(t){var e=/[\u0009\u000A\u000C\u000D\u0020]/;if(""===t||e.test(t))throw new Error("Token must not be empty or contain whitespace.")},o=function(t,e){var n,i=this,o=[];if(t&&e&&(i.element=t,i.prop=e,t[e]))for(o=t[e].replace(/^\s+|\s+$/g,"").split(/\s+/),n=0;n<o.length;n++)i[n]=o[n];i.length=o.length};o.prototype={add:function(){var t,n=this,o=arguments;for(t=0;t<o.length;t++)i(o[t]),n.contains(o[t])||e.push.call(n,o[t]);n.element&&(n.element[n.prop]=n)},contains:function(t){return i(t),-1!==n(this,t)},item:function(t){return this[t]||null},remove:function(){var t,o,r=arguments,c=this;for(o=0;o<r.length;o++)i(r[o]),t=n(c,r[o]),-1!==t&&e.splice.call(c,t,1);c.element&&(c.element[c.prop]=c)},toggle:function(t,e){var n=this;return n.contains(t)?e?!0:(n.remove(t),!1):e===!1?!1:(n.add(t),!0)},toString:function(){return e.join.call(this," ")}},t.DOMTokenList=o}(window),"undefined"!=typeof window&&function(){"use strict";"classList"in document.createElement("a")&&!window.QUnit||Object.defineProperty(Element.prototype,"classList",{get:function(){return new DOMTokenList(this,"className")}})}(),"undefined"!=typeof window&&function(){"use strict";if(!("relList"in document.createElement("a"))||window.QUnit){var t,e=[HTMLAnchorElement,HTMLAreaElement,HTMLLinkElement],n=function(){return new DOMTokenList(this,"rel")};for(t=0;t<e.length;t++)Object.defineProperty(e[t].prototype,"relList",{get:n})}}();
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index aa2c01a..c88ab39 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,39 +1,83 @@
 var gulp = require('gulp');
 var concat = require('gulp-concat');
+var filter = require('gulp-filter');
+var footer = require('gulp-footer');
 var header = require('gulp-header');
+var iife = require('gulp-iife');
 var jscs = require('gulp-jscs');
 var jshint = require('gulp-jshint');
 var rename = require('gulp-rename');
 var size = require('gulp-size');
 var uglify = require('gulp-uglify');
+var umd = require('gulp-umd');
 
+var copyright = '/*! DOMTokenlist shim | Copyright <%= new Date().getFullYear() %> Jonathan Wilsson and Bogdan Chadkin. */\n';
 var files = ['src/DOMTokenList-newest.js', 'src/DOMTokenList.js', 'src/classList.js', 'src/relList.js'];
 
-gulp.task('build', function () {
+gulp.task('lint', function () {
     return gulp.src(files)
         .pipe(jscs())
         .pipe(jshint())
         .pipe(jshint.reporter('default'))
+});
+
+gulp.task('build', ['lint'], function () {
+    var f = filter('DOMTokenList.js', {
+        restore: true,
+    });
+
+    return gulp.src(files)
+        .pipe(f)
+        .pipe(footer('window.DOMTokenList = DOMTokenList;'))
+        .pipe(iife({
+            params: ['window'],
+            prependSemicolon: false,
+            useStrict: false,
+        }))
+        .pipe(header(";typeof window !== 'undefined' && "))
+        .pipe(f.restore)
         .pipe(concat('domtokenlist.js'))
-        .pipe(header('/*! DOMTokenlist shim | Copyright <%= new Date().getFullYear() %> Jonathan Wilsson and Bogdan Chadkin. */\n'))
+        .pipe(header(copyright))
         .pipe(size({
-            showFiles: true
+            showFiles: true,
         }))
         .pipe(gulp.dest('dist'))
         .pipe(uglify({
-            preserveComments: 'some'
+            preserveComments: 'some',
         }))
         .pipe(rename({
-            suffix: '.min'
+            suffix: '.min',
         }))
         .pipe(size({
-            showFiles: true
+            showFiles: true,
+        }))
+        .pipe(gulp.dest('dist'));
+});
+
+gulp.task('build-umd', ['lint'], function () {
+    return gulp.src('src/DOMTokenList.js')
+        .pipe(concat('domtokenlist-umd.js'))
+        .pipe(umd({
+            exports: function(file) {
+                return 'DOMTokenList';
+            },
+            namespace: function(file) {
+                return 'DOMTokenList';
+            },
+        }))
+        .pipe(header(copyright))
+        .pipe(gulp.dest('dist'))
+        .pipe(uglify({
+            preserveComments: 'some',
+        }))
+        .pipe(rename({
+            suffix: '.min',
         }))
         .pipe(gulp.dest('dist'));
 });
 
-gulp.task('dev', ['build'], function () {
-    gulp.watch(files, ['build'])
+gulp.task('dev', ['build', 'build-umd'], function () {
+    gulp.watch(files, ['build', 'build-umd'])
 });
 
-gulp.task('default', ['build']);
+gulp.task('default', ['build', 'build-umd']);
diff --git a/package.json b/package.json
index f0c9a28..de2cd8c 100644
--- a/package.json
+++ b/package.json
@@ -17,13 +17,16 @@
     "browserstack-runner": "^0.3.5",
     "gulp": "^3.9.0",
     "gulp-concat": "^2.5.2",
+    "gulp-filter": "^3.0.1",
     "gulp-header": "^1.2.2",
+    "gulp-iife": "^0.2.4",
     "gulp-jscs": "^3.0.0",
     "gulp-jshint": "^2.0.0",
     "gulp-rename": "^1.2.2",
     "gulp-size": "^2.0.0",
     "gulp-uglify": "^1.2.0",
-    "jshint": "^2.9.1-rc2",
+    "gulp-umd": "^0.2.0",
+    "jshint": "^2.9.1-rc3",
     "qunitjs": "^1.18.0"
   },
   "author": "Jonathan Wilsson <jonathan.wilsson@gmail.com>",
diff --git a/src/DOMTokenList.js b/src/DOMTokenList.js
index 5a8fe51..3ac4c4f 100644
--- a/src/DOMTokenList.js
+++ b/src/DOMTokenList.js
@@ -1,129 +1,125 @@
-;typeof window !== 'undefined' && (function (window) {
-    'use strict';
+'use strict';
 
-    var arr = [];
+var arr = [];
 
-    var inArray = function (array, value) {
-        var i;
+var inArray = function (array, value) {
+    var i;
 
-        if (arr.indexOf) {
-            return arr.indexOf.call(array, value);
-        }
+    if (arr.indexOf) {
+        return arr.indexOf.call(array, value);
+    }
 
-        for (i = 0; i < array.length; i++) {
-            if (array[i] === value) {
-                return i;
-            }
+    for (i = 0; i < array.length; i++) {
+        if (array[i] === value) {
+            return i;
         }
+    }
 
-        return -1;
-    };
+    return -1;
+};
 
-    var validateToken = function (token) {
-        var whitespace = /[\u0009\u000A\u000C\u000D\u0020]/;
+var validateToken = function (token) {
+    var whitespace = /[\u0009\u000A\u000C\u000D\u0020]/;
 
-        if (token === '' || whitespace.test(token)) {
-            throw new Error('Token must not be empty or contain whitespace.');
-        }
-    };
+    if (token === '' || whitespace.test(token)) {
+        throw new Error('Token must not be empty or contain whitespace.');
+    }
+};
 
-    var DOMTokenList = function (element, prop) {
-        var inst = this;
-        var i;
-        var values = [];
+var DOMTokenList = function (element, prop) {
+    var inst = this;
+    var i;
+    var values = [];
 
-        if (element && prop) {
-            inst.element = element;
-            inst.prop = prop;
+    if (element && prop) {
+        inst.element = element;
+        inst.prop = prop;
 
-            if (element[prop]) {
-                values = element[prop].replace(/^\s+|\s+$/g, '').split(/\s+/);
+        if (element[prop]) {
+            values = element[prop].replace(/^\s+|\s+$/g, '').split(/\s+/);
 
-                for (i = 0; i < values.length; i++) {
-                    inst[i] = values[i];
-                }
+            for (i = 0; i < values.length; i++) {
+                inst[i] = values[i];
             }
         }
+    }
 
-        inst.length = values.length;
-    };
+    inst.length = values.length;
+};
 
-    DOMTokenList.prototype = {
-        add: function () {
-            var inst = this;
-            var i;
-            var tokens = arguments;
+DOMTokenList.prototype = {
+    add: function () {
+        var inst = this;
+        var i;
+        var tokens = arguments;
 
-            for (i = 0; i < tokens.length; i++) {
-                validateToken(tokens[i]);
+        for (i = 0; i < tokens.length; i++) {
+            validateToken(tokens[i]);
 
-                if (!inst.contains(tokens[i])) {
-                    arr.push.call(inst, tokens[i]);
-                }
+            if (!inst.contains(tokens[i])) {
+                arr.push.call(inst, tokens[i]);
             }
+        }
 
-            if (inst.element) {
-                inst.element[inst.prop] = inst;
-            }
-        },
+        if (inst.element) {
+            inst.element[inst.prop] = inst;
+        }
+    },
 
-        contains: function (token) {
-            validateToken(token);
+    contains: function (token) {
+        validateToken(token);
 
-            return inArray(this, token) !== -1;
-        },
+        return inArray(this, token) !== -1;
+    },
 
-        item: function (index) {
-            return this[index] || null;
-        },
+    item: function (index) {
+        return this[index] || null;
+    },
 
-        remove: function () {
-            var tokens = arguments;
-            var inst = this;
-            var key;
-            var i;
+    remove: function () {
+        var tokens = arguments;
+        var inst = this;
+        var key;
+        var i;
 
-            for (i = 0; i < tokens.length; i++) {
-                validateToken(tokens[i]);
+        for (i = 0; i < tokens.length; i++) {
+            validateToken(tokens[i]);
 
-                key = inArray(inst, tokens[i]);
+            key = inArray(inst, tokens[i]);
 
-                if (key !== -1) {
-                    arr.splice.call(inst, key, 1);
-                }
+            if (key !== -1) {
+                arr.splice.call(inst, key, 1);
             }
+        }
 
-            if (inst.element) {
-                inst.element[inst.prop] = inst;
-            }
-        },
+        if (inst.element) {
+            inst.element[inst.prop] = inst;
+        }
+    },
 
-        toggle: function (token, force) {
-            var inst = this;
+    toggle: function (token, force) {
+        var inst = this;
 
-            if (inst.contains(token)) {
-                if (force) {
-                    return true;
-                }
+        if (inst.contains(token)) {
+            if (force) {
+                return true;
+            }
 
-                inst.remove(token);
+            inst.remove(token);
 
+            return false;
+        } else {
+            if (force === false) {
                 return false;
-            } else {
-                if (force === false) {
-                    return false;
-                }
-
-                inst.add(token);
-
-                return true;
             }
-        },
 
-        toString: function () {
-            return arr.join.call(this, ' ');
+            inst.add(token);
+
+            return true;
         }
-    };
+    },
 
-    window.DOMTokenList = DOMTokenList;
-}(window));
+    toString: function () {
+        return arr.join.call(this, ' ');
+    }
+};