diff --git a/software/install_pack.cgi b/software/install_pack.cgi
index 249668991..82771ac5e 100755
--- a/software/install_pack.cgi
+++ b/software/install_pack.cgi
@@ -76,7 +76,7 @@ elsif ($in{source} == 2) {
 			      \&progress_callback);
 		}
 	else {
-		&install_error(&text('install_eurl', $in{'url'}));
+		&install_error(&text('install_eurl', &html_escape($in{'url'})));
 		}
 	&install_error(&html_escape($error)) if ($error);
 	$source = $in{'url'};
diff --git a/software/search.cgi b/software/search.cgi
index b267aa704..73c5505b3 100755
--- a/software/search.cgi
+++ b/software/search.cgi
@@ -71,7 +71,7 @@ if (@match) {
 	print &ui_form_end([ [ undef, $text{'search_delete'} ] ]);
 	}
 else {
-	print "<b>",&text('search_nomatch', "<tt>$s</tt>"),"</b><p>\n";
+	print "<b>",&text('search_nomatch', "<tt>@{[&html_escape($s)]}</tt>"),"</b><p>\n";
 	}
 
 &ui_print_footer("", $text{'index_return'});