diff --git a/web/src/actions/build.js b/web/src/actions/build.js
index afb8813778..6898f84d82 100644
--- a/web/src/actions/build.js
+++ b/web/src/actions/build.js
@@ -235,7 +235,8 @@ const receiveBuildManifest = (buildId, manifest) => {
   return {
     type: BUILD_MANIFEST_SUCCESS,
     buildId: buildId,
-    manifest: {tree: manifest.tree, index: index},
+    manifest: {tree: manifest.tree, index: index,
+               index_links: manifest.index_links},
     receivedAt: Date.now()
   }
 }
diff --git a/web/src/containers/build/Manifest.jsx b/web/src/containers/build/Manifest.jsx
index f922bdeb18..701e7dd09f 100644
--- a/web/src/containers/build/Manifest.jsx
+++ b/web/src/containers/build/Manifest.jsx
@@ -31,6 +31,11 @@ class Manifest extends React.Component {
   render() {
     const { tenant, build } = this.props
 
+    const raw_suffix = (obj) => {
+      return (obj.mimetype === 'application/directory' &&
+              build.manifest.index_links) ? 'index.html' : ''
+    }
+
     const nodes = build.manifest.tree.map(
       n => renderTree(
         tenant, build, '/', n,
@@ -40,13 +45,13 @@ class Manifest extends React.Component {
               to={tenant.linkPrefix + '/build/' + build.uuid + '/log' + path + name}>
               {obj.name}
             </Link>
-            &nbsp;&nbsp;(<a href={log_url + path + name}>raw</a>
+            &nbsp;&nbsp;(<a href={log_url + path + name + raw_suffix(obj)}>raw</a>
             &nbsp;<span className="fa fa-external-link"/>)
           </span>),
         (log_url, path, name, obj) => (
           <span>
             {obj.name}
-            &nbsp;&nbsp;(<a href={log_url + path + name}>raw</a>
+            &nbsp;&nbsp;(<a href={log_url + path + name + raw_suffix(obj)}>raw</a>
             &nbsp;<span className="fa fa-external-link"/>)
           </span>
         )))
diff --git a/web/src/containers/build/Summary.jsx b/web/src/containers/build/Summary.jsx
index 805c5d3d0a..c03f24c3c6 100644
--- a/web/src/containers/build/Summary.jsx
+++ b/web/src/containers/build/Summary.jsx
@@ -84,9 +84,15 @@ class Summary extends React.Component {
       }
       if (column === 'log_url') {
         label = 'log url'
+        if (build.manifest && build.manifest.index_links) {
+          value = <a href={value + 'index.html'}>{value}</a>
+        } else {
+          value = <a href={value}>{value}</a>
+        }
       }
       if (column === 'ref_url') {
         label = 'ref url'
+        value = <a href={value}>{value}</a>
       }
       if (column === 'event_id') {
         label = 'event id'