diff --git a/pgcommitfest/commitfest/templates/base.html b/pgcommitfest/commitfest/templates/base.html
index 4a6ba990..382c43bc 100644
--- a/pgcommitfest/commitfest/templates/base.html
+++ b/pgcommitfest/commitfest/templates/base.html
@@ -6,7 +6,7 @@
   <link rel="stylesheet" href="/media/commitfest/css/jquery-ui.css" type="text/css">
   <link rel="stylesheet" href="/media/commitfest/css/bootstrap.css" />
   <link rel="stylesheet" href="/media/commitfest/css/bootstrap-theme.min.css" />
-  <link rel="stylesheet" href="/media/commitfest/css/commitfest.css" />
+  <link rel="stylesheet" href="/media/commitfest/css/commitfest.css?{% static_file_param %}" />
   <link rel="shortcut icon" href="/media/commitfest/favicon.ico" />
 {%block extrahead%}{%endblock%}
 {%if rss_alternate%}  <link rel="alternate" type="application/rss+xml" title="{{rss_alternate_title}}" href="{{rss_alternate}}" />{%endif%}
@@ -43,6 +43,6 @@ <h1>{{title}}</h1>
 <script src="/media/commitfest/js/jquery.js"></script>
 <script src="/media/commitfest/js/jquery-ui.js"></script>
 <script src="/media/commitfest/js/bootstrap.js"></script>
-<script src="/media/commitfest/js/commitfest.js"></script>
+<script src="/media/commitfest/js/commitfest.js?{% static_file_param %}"></script>
 {%block morescript%}{%endblock%}
 </html>
diff --git a/pgcommitfest/commitfest/templatetags/commitfest.py b/pgcommitfest/commitfest/templatetags/commitfest.py
index c51765d2..08ec00c0 100644
--- a/pgcommitfest/commitfest/templatetags/commitfest.py
+++ b/pgcommitfest/commitfest/templatetags/commitfest.py
@@ -1,5 +1,6 @@
 from django.template.defaultfilters import stringfilter
 from django import template
+from uuid import uuid4
 
 from pgcommitfest.commitfest.models import PatchOnCommitFest
 
@@ -43,6 +44,18 @@ def alertmap(value):
         return 'alert-info'
 
 
+# Generate a GET parameter that's unique per startup of the python process to
+# bust the cache of the client, so that it pulls in possibly updated JS/CSS
+# files.
+STATIC_FILE_PARAM = f"v={uuid4()}"
+
+
+# This GET parameter should be added to every one of our static files.
+@register.simple_tag
+def static_file_param():
+    return STATIC_FILE_PARAM
+
+
 @register.filter(name='hidemail')
 @stringfilter
 def hidemail(value):