diff --git a/usermin/update.pl b/usermin/update.pl
index eed9c76dd..f5e5a0ab2 100755
--- a/usermin/update.pl
+++ b/usermin/update.pl
@@ -93,6 +93,7 @@ foreach $u (@updates) {
 		else {
 			$irv = &install_usermin_module($mtemp, 1, 0);
 			if (!ref($irv)) {
+				$irv =~ s/<[^>]*>//g;
 				$irv .= &text('update_failed', $irv)."\n\n";
 				}
 			else {
diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 681348d97..34f7339ed 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -2932,6 +2932,8 @@ else {
 }
 
 # text(message, [substitute]+)
+# Returns a translated message from %text, but with $1, $2, etc.. replaced with the
+# substitute parameters.
 sub text
 {
 local $rv = $text{$_[0]};
diff --git a/webmin/update.pl b/webmin/update.pl
index 16950ada5..23366c5b5 100755
--- a/webmin/update.pl
+++ b/webmin/update.pl
@@ -55,7 +55,7 @@ foreach $url (@urls) {
 			       $u->[4]."\n\n";
 			}
 		else {
-			# Actually do the update .. XXX remove html from comments
+			# Actually do the update ..
 			local (@mdescs, @mdirs, @msizes);
 			$rv .= &text('update_mok', $u->[0], $u->[1])."\n".
 			       ($info{'longdesc'} ? "$text{'update_fixes'} : " : "").
@@ -75,6 +75,7 @@ foreach $url (@urls) {
 				$irv = &install_webmin_module($mtemp, 1, 0,
 							      [ "admin", "root" ]);
 				if (!ref($irv)) {
+					$irv =~ s/<[^>]*>//g;
 					$rv .= &text('update_failed', $irv)."\n\n";
 					}
 				else {