diff --git a/www/kojiweb/buildinfo.chtml b/www/kojiweb/buildinfo.chtml
index e7a45e8a..a721325b 100644
--- a/www/kojiweb/buildinfo.chtml
+++ b/www/kojiweb/buildinfo.chtml
@@ -45,6 +45,23 @@
       <th>Maven&nbsp;version</th><td>$typeinfo.maven.version</td>
     </tr>
     #end if
+    #if 'module' in $typeinfo
+    #if $module_id
+    <tr>
+      <th>Module&nbsp;ID</th>
+    #if $mbs_web_url
+      <td><a href="$mbs_web_url/module/$module_id">$module_id</a></td>
+    #else
+      <td>$module_id</td>
+    #end if
+    </tr>
+    #end if
+    #if $module_tag
+    <tr>
+      <th>Module&nbsp;Tag</th><td><a href="taginfo?tagID=$module_tag.id">$module_tag.name</a></td>
+    </tr>
+    #end if
+    #end if
     #if $summary
     <tr>
       <th>Summary</th><td class="rpmheader">$util.escapeHTML($summary)</td>
diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py
index af56d898..c4c6aec1 100644
--- a/www/kojiweb/index.py
+++ b/www/kojiweb/index.py
@@ -1363,6 +1363,14 @@ def buildinfo(environ, buildID):
     if 'maven' in typeinfo or 'win' in typeinfo:
         if task:
             values['start_ts'] = task['start_ts']
+    if 'module' in typeinfo:
+        module_tag = None
+        module_tag_name = typeinfo['module'].get('content_koji_tag')
+        if module_tag_name:
+            module_tag = server.getTag(module_tag_name, event='auto')
+        values['module_tag'] = module_tag
+        values['module_id'] = typeinfo['module'].get('module_build_service_id')
+        values['mbs_web_url'] = environ['koji.options']['MBS_WEB_URL']
     if build['state'] == koji.BUILD_STATES['BUILDING']:
         avgDuration = server.getAverageBuildDuration(build['package_id'])
         if avgDuration is not None:
diff --git a/www/kojiweb/wsgi_publisher.py b/www/kojiweb/wsgi_publisher.py
index 2316f96c..8f5de4b3 100644
--- a/www/kojiweb/wsgi_publisher.py
+++ b/www/kojiweb/wsgi_publisher.py
@@ -102,6 +102,8 @@ class Dispatcher(object):
         ['ToplevelTasks', 'list', []],
         ['ParentTasks', 'list', []],
 
+        ['MBS_WEB_URL', 'string', None],
+
         ['RLIMIT_AS', 'string', None],
         ['RLIMIT_CORE', 'string', None],
         ['RLIMIT_CPU', 'string', None],