diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml
index 22a5246642..a1ad1ac295 100644
--- a/Android/AndroidManifest.xml
+++ b/Android/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
           package="org.droidplanner"
-          android:versionCode="86"
+          android:versionCode="87"
           android:versionName="please run version.sh to get the version name">
 
     <uses-sdk
diff --git a/Android/src/org/droidplanner/android/activities/FlightActivity.java b/Android/src/org/droidplanner/android/activities/FlightActivity.java
index 0458ab0d85..2ca61a1554 100644
--- a/Android/src/org/droidplanner/android/activities/FlightActivity.java
+++ b/Android/src/org/droidplanner/android/activities/FlightActivity.java
@@ -332,7 +332,7 @@ public void onDroneEvent(DroneEventsType event, Drone drone) {
 		super.onDroneEvent(event, drone);
 		switch (event) {
 		case FAILSAFE:
-			//failsafeTextView.setVisibility(View.VISIBLE); // TODO re-enable after #677 is fixed
+			onFailsafeChanged(drone);
 			break;
 
 		default:
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index c173e32ea9..c672739fc6 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,6 +1,12 @@
 # Releases Notes
 These notes document what was removed from a Release Candidate (RC), which is build from a corresponding version of the program. These are not comulative between program versions (they can be between RCs), and express the diff from the master branch.
 
+## Droidplanner v2.6.1 RC1
+* On the DroneSetup pane removed the Tuning and Calibration Fragments
+* Removed unfinished/untested missionItems (Only Waypoint, Takeoff, ROI, RTL, Circle and Land are allowed)
+* Removed distance/time view at the editor screen
+* Removed un-finished buttons on the Circle mode fragment
+
 ## Droidplanner v2.6.0 RC2
 * Fix small layout issue