diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py
index 2af5384e..87f8b89f 100755
--- a/aurweb/scripts/rendercomment.py
+++ b/aurweb/scripts/rendercomment.py
@@ -2,6 +2,7 @@
 
 import sys
 
+from urllib.parse import quote_plus
 from xml.etree.ElementTree import Element
 
 import bleach
@@ -72,13 +73,16 @@ class GitCommitsInlineProcessor(markdown.inlinepatterns.InlineProcessor):
     def handleMatch(self, m, data):
         oid = m.group(1)
         if oid not in self._repo:
-            # Unkwown OID; preserve the orginal text.
+            # Unknown OID; preserve the orginal text.
             return (None, None, None)
 
         el = Element('a')
         commit_uri = aurweb.config.get("options", "commit_uri")
         prefixlen = util.git_search(self._repo, oid)
-        el.set('href', commit_uri % (self._head, oid[:prefixlen]))
+        el.set('href', commit_uri % (
+            quote_plus(self._head),
+            quote_plus(oid[:prefixlen])
+        ))
         el.text = markdown.util.AtomicString(oid[:prefixlen])
         return (el, m.start(0), m.end(0))
 
diff --git a/templates/partials/packages/actions.html b/templates/partials/packages/actions.html
index 8d024506..88420222 100644
--- a/templates/partials/packages/actions.html
+++ b/templates/partials/packages/actions.html
@@ -6,21 +6,21 @@
         <h4>{{ "Package Actions" | tr }}</h4>
         <ul class="small">
             <li>
-                <a href="/cgit/aur.git/tree/PKGBUILD?h={{ pkgbase.Name }}">
+                <a href="{{ config.get('options', 'source_file_uri') | format("PKGBUILD", pkgbase.Name | quote_plus) }}">
                     {{ "View PKGBUILD" | tr }}
                 </a>
                 /
-                <a href="/cgit/aur.git/log/?h={{ pkgbase.Name }}">
+                <a href="{{ config.get('options', 'log_uri') | format(pkgbase.Name | quote_plus) }}">
                     {{ "View Changes" | tr }}
                 </a>
             </li>
             <li>
-                <a href="/cgit/aur.git/snapshot/{{ pkgbase.Name }}.tar.gz">
+                <a href="{{ config.get('options', 'snapshot_uri') | format(pkgbase.Name | quote_plus) }}">
                     {{ "Download snapshot" | tr }}
                 </a>
             </li>
             <li>
-                <a href="https://wiki.archlinux.org/title/Special:Search?search={{ pkgbase.Name }}">
+                <a href="https://wiki.archlinux.org/title/Special:Search?{{ { 'search': pkgbase.Name } | urlencode }}">
                     {{ "Search wiki" | tr }}
                 </a>
             </li>