diff --git a/ietf/__init__.py b/ietf/__init__.py
index 69d0844c1..24ef6bb94 100644
--- a/ietf/__init__.py
+++ b/ietf/__init__.py
@@ -16,9 +16,3 @@ __release_branch__ = ''
 
 # set this to ".p1", ".p2", etc. after patching
 __patch__   = ""
-
-__date__    = "$Date$"
-
-__rev__     = "$Rev$ (dev) Latest release: Rev. 19974 "
-
-__id__      = "$Id$"
diff --git a/ietf/context_processors.py b/ietf/context_processors.py
index e797d2bd8..618a896ac 100644
--- a/ietf/context_processors.py
+++ b/ietf/context_processors.py
@@ -3,7 +3,7 @@
 import sys
 import django
 from django.conf import settings
-from ietf import __date__, __rev__, __version__, __patch__, __id__
+from ietf import __version__, __patch__, __release_branch__, __release_hash__
 
 def server_mode(request):
     return {'server_mode': settings.SERVER_MODE}
@@ -17,11 +17,10 @@ def python_version():
 
 def revision_info(request):
     return {
-        'revision_time': __date__[7:32],
-        'revision_date': __date__[7:17],
-        'revision_num': __rev__[6:-2],
-        'revision_id': __id__[5:-2],
-        'version_num': __version__+__patch__,
+        'version_num': __version__,
+        'patch' : __patch__,
+        'branch' : __release_branch__,
+        'git_hash' : __release_hash__,
         'django_version': django.get_version(),
         'python_version': python_version(),
         'bugreport_email': settings.BUG_REPORT_EMAIL,
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index 3eb5c4295..bf2da8440 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -118,10 +118,14 @@
                     <a href="https://www.ietf.org/privacy-statement/" class="p-3">Privacy&nbsp;Statement</a>
                     <div class="small text-muted p-3">
                         {% if version_num %}
-		                        <a href="/release/about">About</a>
+                            <a href="/release/about">About</a>
                             <a href="https://github.com/ietf-tools/datatracker/">IETF Datatracker</a>
-	                          <a href="/release/{{ version_num }}/">Version {{ version_num }}</a>
-                	          {{ revision_date }}
+                            {% if server_mode and server_mode == "production" %}
+                                <a href="https://github.com/ietf-tools/datatracker/releases/tag/{{version_num}}">Version {{ version_num }}{% if patch %}{{patch}}{% endif %}</a>
+                            {% else %}
+                                Version {{ version_num }}{% if patch %}{{patch}}{% endif %}
+                            {% endif %}
+                            {% if branch %}({{ branch }} - {{ git_hash|slice:":8" }}){% endif %}
                         {% endif %}
                         Report a bug:
                         <a href="https://github.com/ietf-tools/datatracker/issues/new/choose">