2 files changed, 8 insertions, 8 deletions

diff --git a/ui-repolist.c b/ui-repolist.c
index c774632..36c067a 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -104,7 +104,7 @@ void print_sort_header(const char *title, const char *sort)
 {
         htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
         if (ctx.qry.search) {
-                html("&q=");
+                html("&amp;q=");
                 html_url_arg(ctx.qry.search);
         }
         htmlf("'>%s</a></th>", title);
diff --git a/ui-shared.c b/ui-shared.c
index 43166af..d9d5da7 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -83,7 +83,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
         } else {
                 tmp = fmt("?url=%s/%s/%s", reponame, pagename,
                           (filename ? filename : ""));
-                delim = "&";
+                delim = "&amp;";
         }
         if (query)
                 tmp = fmt("%s%s%s", tmp, delim, query);
@@ -146,19 +146,19 @@ static void site_url(const char *page, const char *search, const char *sort, int
 
         if (page) {
                 htmlf("?p=%s", page);
-                delim = "&";
+                delim = "&amp;";
         }
         if (search) {
                 html(delim);
                 html("q=");
                 html_attr(search);
-                delim = "&";
+                delim = "&amp;";
         }
         if (sort) {
                 html(delim);
                 html("s=");
                 html_attr(sort);
-                delim = "&";
+                delim = "&amp;";
         }
         if (ofs) {
                 html(delim);
@@ -298,13 +298,13 @@ void cgit_log_link(const char *name, const char *title, const char *class,
                 html(delim);
                 html("id=");
                 html_url_arg(rev);
-                delim = "&";
+                delim = "&amp;";
         }
         if (grep && pattern) {
                 html(delim);
                 html("qt=");
                 html_url_arg(grep);
-                delim = "&";
+                delim = "&amp;";
                 html(delim);
                 html("q=");
                 html_url_arg(pattern);
@@ -313,7 +313,7 @@ void cgit_log_link(const char *name, const char *title, const char *class,
                 html(delim);
                 html("ofs=");
                 htmlf("%d", ofs);
-                delim = "&";
+                delim = "&amp;";
         }
         if (showmsg) {
                 html(delim);