From d4190f08d698c08c5e9aafdf2ae5d93490953a42 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 25 Jul 2018 20:03:52 +0200
Subject: [PATCH] firmware: almost time for 18.7

---
 src/opnsense/firmware-message | 6 ++++--
 src/opnsense/firmware-upgrade | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/firmware-message b/src/opnsense/firmware-message
index f95248089..65d2cef4f 100644
--- a/src/opnsense/firmware-message
+++ b/src/opnsense/firmware-message
@@ -1,11 +1,13 @@
-<p>OPNsense 18.1 "<em>Groovy Gecko</em>" is almost end of life. As such
+<p>OPNsense 18.1 "<em>Groovy Gecko</em>" has reached its end of life. As such
 it will not receive any more updates, but the upgrade to the new 18.7 series is
 seamless and can be performed right here from the GUI by unlocking it below.</p>
 <p> Another method is to import and reinstall using a new installation image,
 which will retain your settings (selecting "Import Configuration"), then
 reformat the disk and apply a clean system (selecting "Guided Installation").</p>
 <p>You can also upgrade via console / SSH by using option 12 from the menu by
-typing "18.7.r1" when prompted.</p>
+typing "18.7" when prompted.</p>
+<p>Make sure to read the migration notes and adjust for possible minor breaking
+changes.</p>
 <p>Please backup your configuration, preview the new version via live image or
 in a virtual machine. Create snapshots. If all else fails, report back
 <a href="https://forum.opnsense.org/" target="_blank">in the forums</a> for
diff --git a/src/opnsense/firmware-upgrade b/src/opnsense/firmware-upgrade
index 1ee7d8153..5d374376e 100644
--- a/src/opnsense/firmware-upgrade
+++ b/src/opnsense/firmware-upgrade
@@ -1 +1 @@
-18.7.r1
+18.7