diff --git a/modules/dice.js b/modules/dice.js
new file mode 100644
index 0000000..922baf4
--- /dev/null
+++ b/modules/dice.js
@@ -0,0 +1,66 @@
+var parseDiceSpec = function (specString) {
+    var rawSpec = specString.valMatch(/^([0-9]*)d(%|[0-9]*)$/i, 3);
+    if (rawSpec !== false) {
+        if (rawSpec[2] === "%") {
+            rawSpec[2] = 100;
+        }
+        return {
+            "count": parseInt(rawSpec[1] || 1),
+            "sides": parseInt(rawSpec[2] || 6)
+        };
+    } else {
+        return false;
+    }
+};
+
+var normalizeDiceSpec = function (specString) {
+    var diceSpec = parseDiceSpec(specString);
+    return (diceSpec["count"] > 1 ? diceSpec["count"] : "") + "d" + (diceSpec["sides"] === 100 ? "%" : diceSpec["sides"]);
+};
+
+var dice = function(dbot) {
+    var commands = {
+        '~roll': function (data, params) {
+            var rolls = [];
+
+            if (params.length === 1) {
+                params.push("d6");
+            }
+
+            for (var i = 1; i < params.length; i++) {
+                var diceSpec = parseDiceSpec(params[i]);
+                if (diceSpec === false) {
+                    rolls.push([params[i], false]);
+                } else {
+                    rolls.push([normalizeDiceSpec(params[i]), []]);
+                    for (var j = 0; j < diceSpec["count"] ; j++) {
+                        rolls[rolls.length-1][1].push(Math.ceil(Math.random() * diceSpec["sides"]));
+                    }
+                }
+            }
+
+            for (var i = 0; i < rolls.length; i++) {
+                if (rolls[i][1] === false) {
+                    dbot.say(data.channel, rolls[i][0] + ": invalid dice spec");
+                } else {
+                    if (rolls[i][1].length > 1) {
+                        var total = " (total " + rolls[i][1].sum() + ")";
+                    } else {
+                        var total = "";
+                    }
+                    dbot.say(data.channel, rolls[i][0] + ": " + rolls[i][1].join(" ") + total);
+                }
+            }
+        }
+    };
+
+    return {
+        'onLoad': function() {
+            return commands;
+        }
+    };
+}
+
+exports.fetch = function(dbot) {
+    return dice(dbot);
+};