diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl
index a0f24bf6a..e97cc3c3a 100644
--- a/webmin/webmin-lib.pl
+++ b/webmin/webmin-lib.pl
@@ -1135,12 +1135,19 @@ if (&foreign_available($module_name) && !$noupdates) {
 		}
 	if ($config{'last_version_number'} > &get_webmin_version()) {
 		# New version is out there .. offer to upgrade
-		$mode = &get_install_type();
+		local $mode = &get_install_type();
+		local $checksig = 0;
+		if ((!$mode || $mode eq "rpm") && &foreign_check("proc")) {
+			local ($ec, $emsg) = &gnupg_setup();
+			if (!$ec) {
+				$checksig = 1;
+				}
+			}
 		push(@notifs,
 		     &ui_form_start("$gconfig{'webprefix'}/webmin/upgrade.cgi",
 				    "form-data").
 		     &ui_hidden("source", 2).
-		     &ui_hidden("sig", $mode ? 0 : 1).
+		     &ui_hidden("sig", $checksig).
 		     &ui_hidden("mode", $mode).
 		     &text('notif_upgrade', $config{'last_version_number'},
 			   &get_webmin_version())."<p>\n".