diff --git a/apps/compass/ChangeLog b/apps/compass/ChangeLog
index 4bb7838ac..d1adafc4c 100644
--- a/apps/compass/ChangeLog
+++ b/apps/compass/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Eliminate flickering
 0.04: Fix for Bangle.js 2 and themes
 0.05: Fix bearing not clearing correctly (visible in single or double digit bearings)
+0.06: Add button for force compass calibration
diff --git a/apps/compass/compass.js b/apps/compass/compass.js
index 65ad83c4f..ee0d3d8ba 100644
--- a/apps/compass/compass.js
+++ b/apps/compass/compass.js
@@ -64,7 +64,12 @@ Bangle.on('mag', function(m) {
   oldHeading = m.heading;
 });
 
-g.clear();
+g.clear(1);
+g.setFont("6x8").setFontAlign(0,0,3).drawString("RESET", g.getWidth()-5, g.getHeight()/2);
+setWatch(function() {
+  Bangle.resetCompass();
+}, (process.env.HWVERSION==2) ? BTN1 : BTN2, {repeat:true});
+
 Bangle.loadWidgets();
 Bangle.drawWidgets();
 Bangle.setCompassPower(1);
diff --git a/apps/compass/metadata.json b/apps/compass/metadata.json
index 318d90c86..e24ca4adc 100644
--- a/apps/compass/metadata.json
+++ b/apps/compass/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "compass",
   "name": "Compass",
-  "version": "0.05",
+  "version": "0.06",
   "description": "Simple compass that points North",
   "icon": "compass.png",
   "screenshots": [{"url":"screenshot_compass.png"}],