diff --git a/ArduPlane/setup.pde b/ArduPlane/setup.pde
index 134cc516f0..3b46f10af6 100644
--- a/ArduPlane/setup.pde
+++ b/ArduPlane/setup.pde
@@ -301,8 +301,11 @@ setup_compass(uint8_t argc, const Menu::arg *argv)
 	} else if (!strcmp_P(argv[1].str, PSTR("off"))) {
 		g.compass_enabled = false;
 
+	} else if (!strcmp_P(argv[1].str, PSTR("reset"))) {
+		compass.set_offsets(0,0,0);
+
 	} else {
-		Serial.printf_P(PSTR("\nOptions:[on,off]\n"));
+		Serial.printf_P(PSTR("\nOptions:[on,off,reset]\n"));
 		report_compass();
 		return 0;
 	}
diff --git a/libraries/AP_Compass/Compass.h b/libraries/AP_Compass/Compass.h
index 33f5ccafbb..67a533fb02 100644
--- a/libraries/AP_Compass/Compass.h
+++ b/libraries/AP_Compass/Compass.h
@@ -102,8 +102,6 @@ public:
 
 	/// Program new offset values.
 	///
-	/// XXX DEPRECATED
-	///
 	/// @param  x                   Offset to the raw mag_x value.
 	/// @param  y                   Offset to the raw mag_y value.
 	/// @param  z                   Offset to the raw mag_z value.