diff --git a/ArduPlane/release-notes.txt b/ArduPlane/release-notes.txt
index a5cc6d4fef..adb8c8a0b8 100644
--- a/ArduPlane/release-notes.txt
+++ b/ArduPlane/release-notes.txt
@@ -1,39 +1,28 @@
-Release 3.8.5beta3, 14th April 2018
------------------------------------
+Release 3.8.5, 25th April 2018
+------------------------------
 
-This is a safety release, fixing an issue where the external safety
-button can activate in flight on some boards, causing them to crash. A
-new parameter BRD_SAFETYOPTION is added which controls the behaviour
-of the safety button. The default is to de-activate the safety button
-when armed.
+This release includes small bug fixes and one safety fix. The changes
+are:
 
+ - fixed an issue where the external safety button can activate in
+   flight on some boards, causing them to crash. A new parameter
+   BRD_SAFETYOPTION is added which controls the behaviour of the
+   safety button. The default is to de-activate the safety button when
+   armed.
 
-Release 3.8.5beta2, 28th March 2018
-------------------------------------
+ - fixed default orientation of ICM-20948 compass for Here GPS
 
-This is a minor release with three new features, all related to
-airspeed.
+ - added support for dual airspeed sensors
 
-The first is to support the MS5525 sensor on multiple I2C
-addresses. Two new values of the ARSDP_TYPE are introduced (4 and 5)
-for specific I2C addresses. This allows you to deconflict the MS5525
-from a MS5611 barometer on the same bus.
+ - added support for the SDP33 airspeed sensor. This is still
+   considered experimental. There are reports of it underestimating
+   the aircrafts speed at higher altitudes.
 
-The second is the addition of a driver for the SDP33 airspeed
-sensor. This is an interesting sensor sold by Drotek that doesn't need
-zero offset calibration for each flight. It is still considered
-experimental.
+ - add support for the MS5525 airspeed sensor on multiple I2C
+   addresses. Two new values of the ARSDP_TYPE are introduced (4 and
+   5) for specific I2C addresses. This allows you to deconflict the
+   MS5525 from a MS5611 barometer on the same bus.
 
-The third new feature is dual airspeed sensor support, which allows
-you to have two independent airspeed sensors. At the moment the
-failover between the sensors is very simple (it will only failover if
-the primary stops communicating). More sophisticated failover methods
-will be introduced in the future. To enable a 2nd airspeed sensor set
-the ARSPD2_TYPE parameter to the type of the 2nd sensor. You can
-combine any types of sensor.
-
-The beta2 release also corrects the orientation of the Here GPS 20948
-compass.
 
 
 Release 3.8.4, 9th January 2018
diff --git a/ArduPlane/version.h b/ArduPlane/version.h
index dbc64aacfb..e49477ae4c 100644
--- a/ArduPlane/version.h
+++ b/ArduPlane/version.h
@@ -2,8 +2,8 @@
 
 #include "ap_version.h"
 
-#define THISFIRMWARE "ArduPlane V3.8.5beta3"
-#define FIRMWARE_VERSION 3,8,5,FIRMWARE_VERSION_TYPE_BETA+2
+#define THISFIRMWARE "ArduPlane V3.8.5"
+#define FIRMWARE_VERSION 3,8,5,FIRMWARE_VERSION_TYPE_OFFICIAL
 
 #ifndef GIT_VERSION
 #define FIRMWARE_STRING THISFIRMWARE