diff --git a/APMrover2/release-notes.txt b/APMrover2/release-notes.txt
index cb013cec26..675fb371fb 100644
--- a/APMrover2/release-notes.txt
+++ b/APMrover2/release-notes.txt
@@ -1,3 +1,12 @@
+Release 3.1.2, 15 March 2017
+============================
+Minor bugfix release.
+
+- Crashing detection is off by default
+- DISARMing of a rover via the transmitter stick works again
+- If a user was driving in reverse in Manual and went into an AUTO
+mode the rover would do the mission in reverse.  This is fixed.
+
 Release 3.1.1, 31 January 2017
 ==============================
 
diff --git a/APMrover2/version.h b/APMrover2/version.h
index 6c12599de1..fdf9112180 100644
--- a/APMrover2/version.h
+++ b/APMrover2/version.h
@@ -2,8 +2,8 @@
 
 #include "ap_version.h"
 
-#define THISFIRMWARE "APM:Rover v3.1.1"
-#define FIRMWARE_VERSION 3,1,1,FIRMWARE_VERSION_TYPE_OFFICIAL
+#define THISFIRMWARE "APM:Rover v3.1.2"
+#define FIRMWARE_VERSION 3,1,2,FIRMWARE_VERSION_TYPE_OFFICIAL
 
 #ifndef GIT_VERSION
 #define FIRMWARE_STRING THISFIRMWARE