diff --git a/utils/git-notify b/utils/git-notify
index 7cdad441..7ecc4b40 100755
--- a/utils/git-notify
+++ b/utils/git-notify
@@ -260,7 +260,7 @@ sub send_commit_notice($$)
         "Module: $repos_name",
         "Branch: $ref",
         "Tag:    $obj",
-        $gitweb_url ? "URL:    $gitweb_url/?a=tag;h=$obj\n" : "",
+        $gitweb_url ? "URL:    $gitweb_url;a=tag;h=$obj\n" : "",
         "Tagger: " . $info{"tagger"},
         "Date:   " . format_date($info{"tagger_date"},$info{"tagger_tz"}),
         "",
@@ -273,7 +273,7 @@ sub send_commit_notice($$)
         "Module: $repos_name",
         "Branch: $ref",
         "Commit: $obj",
-        $gitweb_url ? "URL:    $gitweb_url/?a=commit;h=$obj\n" : "",
+        $gitweb_url ? "URL:    $gitweb_url;a=commit;h=$obj\n" : "",
         "Author: " . $info{"author"},
         "Date:   " . format_date($info{"author_date"},$info{"author_tz"}),
         "",
@@ -296,7 +296,7 @@ sub send_commit_notice($$)
         }
         else
         {
-            push @notice, "Diff:   $gitweb_url/?a=commitdiff;h=$obj" if $gitweb_url;
+            push @notice, "Diff:   $gitweb_url;a=commitdiff;h=$obj" if $gitweb_url;
         }
 
         $subject = "Git commit ($repos_name): " . ${$info{"log"}}[0];
@@ -352,7 +352,7 @@ sub send_cia_notice($$)
 
     push @cia_text,
         "      </files>",
-        $gitweb_url ? "      <url>" . xml_escape("$gitweb_url/?a=commit;h=$commit") . "</url>" : "",
+        $gitweb_url ? "      <url>" . xml_escape("$gitweb_url;a=commit;h=$commit") . "</url>" : "",
         "    </commit>",
         "  </body>",
         "  <timestamp>" . $info{"author_date"} . "</timestamp>",
@@ -372,7 +372,7 @@ sub send_global_notice($$$)
     while (<LIST>)
     {
         chomp;
-        s/^commit /URL:    $gitweb_url\/?a=commit;h=/ if $gitweb_url;
+        s/^commit /URL:    $gitweb_url;a=commit;h=/ if $gitweb_url;
         push @notice, $_;
     }
     close LIST;
@@ -422,7 +422,7 @@ sub send_all_notices($$$)
 parse_options();
 
 # append repository path to URL
-$gitweb_url .= "/$repos_name.git" if $gitweb_url;
+$gitweb_url .= "?p=$repos_name.git" if $gitweb_url;
 
 if (@ARGV)
 {