diff --git a/apps/diceroll/ChangeLog b/apps/diceroll/ChangeLog
new file mode 100644
index 000000000..89dff4011
--- /dev/null
+++ b/apps/diceroll/ChangeLog
@@ -0,0 +1 @@
+0.01: App created
\ No newline at end of file
diff --git a/apps/diceroll/app-icon.js b/apps/diceroll/app-icon.js
new file mode 100644
index 000000000..4d6e7da16
--- /dev/null
+++ b/apps/diceroll/app-icon.js
@@ -0,0 +1 @@
+E.toArrayBuffer(atob("ICABAAAAAAAAAAAAAAAAAAHAAAAP8AAAfn4AA/APwA+DwfAPg8HwD+AH8Az4HzAMPnwwDAfgMAwBgDAMCYAwDA2YMAwhmDAMIZAwDCGDMA2BgzAMgYAwDAGAMA8BgPADwYPAAPGPgAB9ngAAH/gAAAfgAAABgAAAAAAAAAAAAAAAAAA="))
diff --git a/apps/diceroll/app.js b/apps/diceroll/app.js
new file mode 100644
index 000000000..d514ce92f
--- /dev/null
+++ b/apps/diceroll/app.js
@@ -0,0 +1,108 @@
+var init_message = true;
+var acc_data;
+var die_roll = 1;
+var selected_die = 0;
+var roll = 0;
+const dices = [4, 6, 10, 12, 20];
+
+g.setFontAlign(0,0);
+
+Bangle.on('touch', function(button, xy) {
+  // Change die if not rolling
+  if(roll < 1){
+    if(selected_die <= 3){
+      selected_die++;
+    }else{
+      selected_die = 0;
+    }
+  }
+  //Disable initial message
+  init_message = false;
+});
+
+function rect(){
+  x1 = g.getWidth()/2 - 35;
+  x2 = g.getWidth()/2 + 35;
+  y1 = g.getHeight()/2 - 35;
+  y2 = g.getHeight()/2 + 35;
+  g.drawRect(x1, y1, x2, y2);
+}
+
+function pentagon(){
+  x1 = g.getWidth()/2;
+  y1 = g.getHeight()/2 - 50;
+  x2 = g.getWidth()/2 - 50;
+  y2 = g.getHeight()/2 - 10;
+  x3 = g.getWidth()/2 - 30;
+  y3 = g.getHeight()/2 + 30;
+  x4 = g.getWidth()/2 + 30;
+  y4 = g.getHeight()/2 + 30;
+  x5 = g.getWidth()/2 + 50;
+  y5 = g.getHeight()/2 - 10;
+  g.drawPoly([x1, y1, x2, y2, x3, y3, x4, y4, x5, y5], true);
+}
+
+function triangle(){
+  x1 = g.getWidth()/2;
+  y1 = g.getHeight()/2 - 57;
+  x2 = g.getWidth()/2 - 50;
+  y2 = g.getHeight()/2 + 23;
+  x3 = g.getWidth()/2 + 50;
+  y3 = g.getHeight()/2 + 23;
+  g.drawPoly([x1, y1, x2, y2, x3, y3], true);
+}
+
+function drawDie(variant) {
+  if(variant == 1){
+    //Rect, 6
+    rect();
+  }else if(variant == 3){
+    //Pentagon, 12
+    pentagon();
+  }else{
+    //Triangle, 4, 10, 20
+    triangle();
+  }
+}
+
+function initMessage(){
+    g.setFont("6x8", 2);
+    g.drawString("Dice-n-Roll", g.getWidth()/2, 20);
+    g.drawString("Shake to roll", g.getWidth()/2, 60);
+    g.drawString("Tap to change", g.getWidth()/2, 80);
+    g.drawString("Tap to start", g.getWidth()/2, 150);
+}
+
+function rollDie(){
+    acc_data = Bangle.getAccel();
+    if(acc_data.diff > 0.3){
+      roll = 3;
+    }
+    //Mange the die "roll" by chaning the number a few times
+    if(roll > 0){
+      g.drawString("Rolling!", g.getWidth()/2, 150);
+      die_roll = Math.abs(E.hwRand()) % dices[selected_die] + 1;
+      roll--;
+    }
+    //Draw dice graphics
+    drawDie(selected_die);
+    //Draw dice number
+    g.setFontAlign(0,0);
+    g.setFont("Vector", 45);
+    g.drawString(die_roll, g.getWidth()/2, g.getHeight()/2);
+    //Draw selected die in right corner
+    g.setFont("6x8", 2);
+    g.drawString(dices[selected_die], g.getWidth()-15, 15);
+}
+
+function main() {
+  g.clear();
+  if(init_message){
+    initMessage();
+  }else{
+    rollDie();
+  }
+  Bangle.setLCDPower(1);
+}
+
+var interval = setInterval(main, 300);
\ No newline at end of file
diff --git a/apps/diceroll/app.png b/apps/diceroll/app.png
new file mode 100644
index 000000000..b695b7080
Binary files /dev/null and b/apps/diceroll/app.png differ
diff --git a/apps/diceroll/diceroll_screenshot.png b/apps/diceroll/diceroll_screenshot.png
new file mode 100644
index 000000000..71024edbb
Binary files /dev/null and b/apps/diceroll/diceroll_screenshot.png differ
diff --git a/apps/diceroll/metadata.json b/apps/diceroll/metadata.json
new file mode 100644
index 000000000..81a2f8bfd
--- /dev/null
+++ b/apps/diceroll/metadata.json
@@ -0,0 +1,14 @@
+{ "id": "diceroll",
+    "name": "Dice-n-Roll",
+    "shortName":"Dice-n-Roll",
+    "icon": "app.png",
+    "version":"0.01",
+    "description": "A dice app with a few different dice.",
+    "screenshots": [{"url":"diceroll_screenshot.png"}],
+    "tags": "game",
+    "supports": ["BANGLEJS2"],
+    "storage": [
+      {"name":"diceroll.app.js","url":"app.js"},
+      {"name":"diceroll.img","url":"app-icon.js","evaluate":true}
+    ]
+  }
\ No newline at end of file