diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
index ed83b1b15..c05b27c5c 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
@@ -110,7 +110,7 @@ POSSIBILITY OF SUCH DAMAGE.
             BootstrapDialog.show({
                 type:BootstrapDialog.TYPE_WARNING,
                 title: 'Reboot required',
-                message: 'This upgrade may require a reboot, when needed the firewall will automatically reboot!',
+                message: 'The firewall will be rebooted directly after this firmware update.',
                 buttons: [{
                     label: 'Ok',
                     action: function(dialogRef){
diff --git a/src/opnsense/scripts/pkg_updatecheck.sh b/src/opnsense/scripts/pkg_updatecheck.sh
index db068e061..635740313 100755
--- a/src/opnsense/scripts/pkg_updatecheck.sh
+++ b/src/opnsense/scripts/pkg_updatecheck.sh
@@ -118,7 +118,20 @@ if [ "$pkg_running" == "" ]; then
                 download_size="none"
               fi
 
-              upgrade_needs_reboot=`pkg upgrade -nq os-update | grep UPGRADED | wc -l | awk '{print $1;}'`
+              # XXX backwards compat
+              LOCAL=opnsense-update
+              if pkg query %n os-update > /dev/null; then
+                LOCAL=os-update
+              fi
+              REMOTE=opnsense-update
+              if pkg rquery %n os-update > /dev/null; then
+                REMOTE=os-update
+              fi
+
+              # only version change requires reboot
+              if [ "$(pkg query %v ${LOCAL})" != "$(pkg rquery %v ${REMOTE})" ]; then
+                upgrade_needs_reboot="1"
+              fi
 
               # First check if there are new packages that need to be installed
               for i in $(cat $tmp_pkg_output_file); do