diff --git a/tensorboard/BUILD b/tensorboard/BUILD
index cc5e45282f9..179a69c5f7a 100644
--- a/tensorboard/BUILD
+++ b/tensorboard/BUILD
@@ -82,7 +82,7 @@ py_library(
     ],
 )
 
-py_binary(
+py_library(
     name = "version",
     srcs = ["version.py"],
     srcs_version = "PY2AND3",
diff --git a/tensorboard/components/tf_imports/d3.html b/tensorboard/components/tf_imports/d3.html
index 76ca302709a..02be0c20bb9 100644
--- a/tensorboard/components/tf_imports/d3.html
+++ b/tensorboard/components/tf_imports/d3.html
@@ -1,20 +1,3 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
 <!--
 @license
 d3
diff --git a/tensorboard/components/tf_imports/dagre.html b/tensorboard/components/tf_imports/dagre.html
index dd0cf01a698..4c53bd543c8 100644
--- a/tensorboard/components/tf_imports/dagre.html
+++ b/tensorboard/components/tf_imports/dagre.html
@@ -1,20 +1,3 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
 <!--
 @license
 Dagre
diff --git a/tensorboard/components/tf_imports/graphlib.html b/tensorboard/components/tf_imports/graphlib.html
index aa868b00b40..478ff2fe4cf 100644
--- a/tensorboard/components/tf_imports/graphlib.html
+++ b/tensorboard/components/tf_imports/graphlib.html
@@ -1,18 +1,25 @@
 <!--
 @license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
+Graphlib
+Copyright (c) 2012-2014 Chris Pettitt
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-    http://www.apache.org/licenses/LICENSE-2.0
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 -->
 
 <link rel="import" href="lodash.html">
diff --git a/tensorboard/components/tf_imports/lodash.html b/tensorboard/components/tf_imports/lodash.html
index 192e61cc99f..33ab668a63b 100644
--- a/tensorboard/components/tf_imports/lodash.html
+++ b/tensorboard/components/tf_imports/lodash.html
@@ -1,18 +1 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
 <script jscomp-minify src="../lodash/lodash.js"></script>
diff --git a/tensorboard/components/tf_imports/numericjs.html b/tensorboard/components/tf_imports/numericjs.html
index 69e948eb99e..b7656dd2a3d 100644
--- a/tensorboard/components/tf_imports/numericjs.html
+++ b/tensorboard/components/tf_imports/numericjs.html
@@ -1,20 +1,3 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
 <!--
 @license
 Numeric Javascript
diff --git a/tensorboard/components/tf_imports/plottable.html b/tensorboard/components/tf_imports/plottable.html
index 77ad544d5a0..fa0e0e8c600 100644
--- a/tensorboard/components/tf_imports/plottable.html
+++ b/tensorboard/components/tf_imports/plottable.html
@@ -1,20 +1,3 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
 <!--
 @license
 Plottable.js
diff --git a/tensorboard/components/tf_imports/threejs.html b/tensorboard/components/tf_imports/threejs.html
index 7f4233b5713..8a1ef9ba08d 100644
--- a/tensorboard/components/tf_imports/threejs.html
+++ b/tensorboard/components/tf_imports/threejs.html
@@ -1,20 +1,3 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
 <!--
 @license
 three.js
diff --git a/tensorboard/components/tf_imports/weblas.html b/tensorboard/components/tf_imports/weblas.html
index c07020598fc..b745cbbe6d0 100644
--- a/tensorboard/components/tf_imports/weblas.html
+++ b/tensorboard/components/tf_imports/weblas.html
@@ -1,20 +1,3 @@
-<!--
-@license
-Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
 <!--
 @license
 weblas
diff --git a/tensorboard/pip_package/BUILD b/tensorboard/pip_package/BUILD
index ee38d966e8b..95fbcbe8c06 100644
--- a/tensorboard/pip_package/BUILD
+++ b/tensorboard/pip_package/BUILD
@@ -5,6 +5,9 @@ package(default_visibility = ["//visibility:private"])
 
 licenses(["notice"])  # Apache 2.0
 
+# rm -rf /tmp/tensorboard
+# bazel run //tensorboard/pip_package:build_pip_package
+# pip install -U /tmp/tensorboard/*py2*.pip
 sh_binary(
     name = "build_pip_package",
     srcs = ["build_pip_package.sh"],
@@ -20,4 +23,54 @@ sh_binary(
         "//tensorboard/plugins/beholder",  # User-facing beholder API
         "//tensorboard/plugins/projector",  # User-facing projector API
     ],
+    tags = [
+        "local",
+        "manual",
+    ],
+)
+
+genrule(
+    name = "license",
+    srcs = [
+        "LICENSE.tensorflow",
+        "@org_polymer//:LICENSE.txt",
+        "@com_palantir_plottable//:package/LICENSE",
+        "@org_d3js//:LICENSE",
+        "@org_chromium_catapult_vulcanized_trace_viewer//:LICENSE",
+        "@io_github_cpettitt_dagre//:LICENSE",
+        "@io_github_cpettitt_graphlib//:LICENSE",
+        "@io_github_waylonflinn_weblas//:LICENSE",
+        "@com_numericjs//:license.txt",
+        "@org_threejs//:LICENSE",
+        "@com_lodash//:LICENSE",
+        "@com_google_fonts_roboto//:LICENSE",
+        "@org_mozilla_bleach//:LICENSE",
+        "@org_html5lib//:LICENSE",
+    ],
+    outs = ["LICENSE"],
+    cmd = "\n".join([
+        "(",
+        "  echo '#' TensorBoard License",
+        "  echo",
+        "  echo TensorBoard is licensed Apache 2.0 and distributed with",
+        "  echo vendored content licensed Apache 2.0, MIT, and BSD-3.",
+        "  echo",
+        "  echo '##' Table of Contents",
+        "  echo",
+        "  for src in $(SRCS); do",
+        "    echo '-' $$src",
+        "  done",
+        "  echo",
+        "  echo '##' Licenses",
+        "  for src in $(SRCS); do",
+        "    echo",
+        "    echo",
+        "    echo",
+        "    echo '###' $$src",
+        "    echo",
+        "    cat $$src",
+        "  done",
+        "",
+        ") >$@",
+    ]),
 )
diff --git a/tensorboard/pip_package/LICENSE b/tensorboard/pip_package/LICENSE.tensorflow
similarity index 100%
rename from tensorboard/pip_package/LICENSE
rename to tensorboard/pip_package/LICENSE.tensorflow
diff --git a/tensorboard/pip_package/MANIFEST.in b/tensorboard/pip_package/MANIFEST.in
index a5c1b8d786c..d3041d753e5 100644
--- a/tensorboard/pip_package/MANIFEST.in
+++ b/tensorboard/pip_package/MANIFEST.in
@@ -1 +1,3 @@
-recursive-include tensorboard *
+include LICENSE
+include README.rst
+graft tensorboard
diff --git a/tensorboard/pip_package/build_pip_package.sh b/tensorboard/pip_package/build_pip_package.sh
index 477e91cf036..e0610611dc7 100755
--- a/tensorboard/pip_package/build_pip_package.sh
+++ b/tensorboard/pip_package/build_pip_package.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # Copyright 2015 The TensorFlow Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,66 +12,92 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ==============================================================================
-
-
 set -e
+if [ -z "${RUNFILES}" ]; then
+  RUNFILES="$(CDPATH= cd -- "$0.runfiles" && pwd)"
+fi
 
-die() {
-  printf >&2 '%s\n' "$1"
-  exit 1
+if [ "$(uname)" = "Darwin" ]; then
+  sedi="sed -i ''"
+else
+  sedi="sed -i"
+fi
+
+smoke() {
+  virtualenv -qp python$1 venv$1
+  cd venv$1
+  . bin/activate
+  pip install -qU pip
+  pip install -qU tf-nightly
+  pip install -qU ../dist/*py$1*.whl >/dev/null
+  mkdir logs
+  mkfifo pipe
+  tensorboard --port=0 --logdir=logs 2>pipe &
+  perl -ne 'print STDERR;/http:.*:(\d+)/ and print $1.v10 and exit 0' <pipe >port
+  curl -fs http://localhost:$(cat port) >index.html
+  grep '<tf-tensorboard' index.html
+  kill $!
+  deactivate
+  cd ..
+  rm -rf venv$1
 }
 
-function main() {
-  if [ $# -lt 1 ] ; then
-    die "ERROR: no destination dir provided"
-  fi
+set -x
+command -v curl >/dev/null
+command -v perl >/dev/null
+command -v python2 >/dev/null
+command -v python3 >/dev/null
+command -v virtualenv >/dev/null
+[ -d "${RUNFILES}" ]
 
-  DEST=$1
-  TMPDIR=$(mktemp -d -t --suffix _tensorboard_pip_pkg)
-  TMPVENVDIR="${TMPDIR}/venv"
-  RUNFILES="bazel-bin/tensorboard/pip_package/build_pip_package.runfiles/org_tensorflow_tensorboard"
+dest=/tmp/tensorboard
+if [ ! -e $dest ]; then
+  mkdir $dest
+else
+  dest="$(mktemp -d -p /tmp -t tensorboard-pip.XXXXXXXXXX)"
+fi
+cd "${dest}"
 
-  # Check that virtualenv is installed.
-  if [[ -z "$(which virtualenv)" ]]; then
-    die "ERROR: virtualenv is required, but does not appear to be installed."
-  fi
+cp -LR "${RUNFILES}/org_tensorflow_tensorboard/tensorboard" .
+mv -f "tensorboard/pip_package/LICENSE" .
+mv -f "tensorboard/pip_package/MANIFEST.in" .
+mv -f "tensorboard/pip_package/README.rst" .
+mv -f "tensorboard/pip_package/setup.cfg" .
+mv -f "tensorboard/pip_package/setup.py" .
+rm -rf tensorboard/pip_package
 
-  echo $(date) : "=== Using tmpdir: ${TMPDIR}"
+rm -f tensorboard/tensorboard              # bazel py_binary sh wrapper
+chmod -x LICENSE                           # bazel symlinks confuse cp
+find . -name __init__.py | xargs chmod -x  # which goes for all genfiles
 
-  bazel build //tensorboard/pip_package:build_pip_package
+mkdir -p tensorboard/_vendor
+touch tensorboard/_vendor/__init__.py
+cp -LR "${RUNFILES}/org_html5lib/html5lib" tensorboard/_vendor
+cp -LR "${RUNFILES}/org_mozilla_bleach/bleach" tensorboard/_vendor
 
-  if [ ! -d bazel-bin/tensorboard ]; then
-    die "ERROR: Could not find bazel-bin.  Did you run from the build root?"
-  fi
+chmod -R u+w,go+r .
 
-  cp "${RUNFILES}/tensorboard/pip_package/setup.py" "${TMPDIR}"
-  cp "${RUNFILES}/tensorboard/pip_package/setup.cfg" "${TMPDIR}"
-  cp "${RUNFILES}/tensorboard/pip_package/MANIFEST.in" "${TMPDIR}"
-  cp -R "${RUNFILES}/tensorboard" "${TMPDIR}"
+find tensorboard -name \*.py |
+  xargs $sedi -e '
+    s/^import html5lib$/from tensorboard._vendor import html5lib/
+    s/^from html5lib/from tensorboard._vendor.html5lib/
+    s/^import bleach$/from tensorboard._vendor import bleach/
+    s/^from bleach/from tensorboard._vendor.bleach/
+  '
 
-  pushd ${TMPDIR} >/dev/null
-  rm -f MANIFEST
+virtualenv venv
+export VIRTUAL_ENV=venv
+export PATH="$PWD/venv/bin:${PATH}"
+unset PYTHON_HOME
 
-  echo $(date) : "=== Activating virtualev ==="
-  virtualenv "${TMPVENVDIR}"
-  export VIRTUAL_ENV="${TMPVENVDIR}"
-  export PATH="${TMPVENVDIR}/bin:${PATH}"
-  unset PYTHON_HOME
+# Require wheel for bdist_wheel command, and setuptools 36.2.0+ so that
+# env markers are handled (https://github.com/pypa/setuptools/pull/1081)
+pip install -qU wheel 'setuptools>=36.2.0'
 
-  # Require wheel for bdist_wheel command, and setuptools 36.2.0+ so that
-  # env markers are handled (https://github.com/pypa/setuptools/pull/1081)
-  pip install -U wheel setuptools>=36.2.0
+python setup.py bdist_wheel --python-tag py2 >/dev/null
+python setup.py bdist_wheel --python-tag py3 >/dev/null
 
-  echo $(date) : "=== Building python2 wheel in $PWD"
-  python setup.py bdist_wheel --python-tag py2 >/dev/null
-  echo $(date) : "=== Building python3 wheel in $PWD"
-  python setup.py bdist_wheel --python-tag py3 >/dev/null
-  mkdir -p ${DEST}
-  cp dist/* ${DEST}
-  popd >/dev/null
-  rm -rf ${TMPDIR}
-  echo $(date) : "=== Output wheel files are in: ${DEST}"
-}
+smoke 2
+smoke 3
 
-main "$@"
+ls -hal "$PWD/dist"
diff --git a/tensorboard/pip_package/setup.cfg b/tensorboard/pip_package/setup.cfg
index a688f966c66..d47f3a41f36 100644
--- a/tensorboard/pip_package/setup.cfg
+++ b/tensorboard/pip_package/setup.cfg
@@ -1,3 +1,3 @@
 [metadata]
-description-file = tensorboard/pip_package/README.rst
-license_file = tensorboard/pip_package/LICENSE
+description-file = README.rst
+license_file = LICENSE
diff --git a/tensorboard/pip_package/setup.py b/tensorboard/pip_package/setup.py
index 10c067e542f..64842f8650a 100644
--- a/tensorboard/pip_package/setup.py
+++ b/tensorboard/pip_package/setup.py
@@ -27,9 +27,7 @@
     'six >= 1.10.0',
     'protobuf >= 3.4.0',
     'werkzeug >= 0.11.10',
-    'html5lib == 0.9999999',  # identical to 1.0b8
     'markdown >= 2.6.8',
-    'bleach == 1.5.0',
 
     # futures is a backport of the python 3.2+ concurrent.futures module
     'futures >= 3.1.1; python_version < "3"',
@@ -44,7 +42,7 @@
 ]
 
 def get_readme():
-  with open('tensorboard/pip_package/README.rst') as f:
+  with open('README.rst') as f:
     return f.read()
 
 setup(
diff --git a/third_party/bleach.BUILD b/third_party/bleach.BUILD
index 1bf75b84a76..01b58df2f62 100644
--- a/third_party/bleach.BUILD
+++ b/third_party/bleach.BUILD
@@ -16,5 +16,8 @@ py_library(
         "bleach/version.py",
     ],
     srcs_version = "PY2AND3",
-    deps = ["@org_html5lib"],
+    deps = [
+        "@org_html5lib",
+        "@org_pythonhosted_six",
+    ],
 )
diff --git a/third_party/fonts.bzl b/third_party/fonts.bzl
index 1e36ffd67b4..52ffac77bff 100644
--- a/third_party/fonts.bzl
+++ b/third_party/fonts.bzl
@@ -23,6 +23,10 @@ def tensorboard_fonts_workspace():
       name = "com_google_fonts_roboto",
       licenses = ["notice"],  # Apache 2.0
       sha256_urls = {
+          "c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4": [
+              "https://mirror.bazel.build/raw.githubusercontent.com/google/roboto/ba03b84b90b50afd99f9688059447bc545e5c0e1/LICENSE",
+              "https://raw.githubusercontent.com/google/roboto/ba03b84b90b50afd99f9688059447bc545e5c0e1/LICENSE",
+          ],
           # Roboto (cyrillic)
           "41720926981ffb6dc229f06fc0bbf0f43e45ba032d126726ebee481c2a6559e2": [
               "https://mirror.bazel.build/fonts.gstatic.com/s/roboto/v18/uYECMKoHcO9x1wdmbyHIm3-_kf6ByYO6CLYdB4HQE-Y.woff2",
@@ -378,6 +382,10 @@ def tensorboard_fonts_workspace():
       extra_build_file_content = "\n".join([
           'load("@io_bazel_rules_closure//closure:defs.bzl", "web_library")',
           '',
+          'licenses(["notice"])  # Apache 2.0',
+          '',
+          'exports_files(["LICENSE"])  # Apache 2.0',
+          '',
           'web_library(',
           '    name = "com_google_fonts_roboto",',
           '    path = "/font-roboto",',
diff --git a/third_party/html5lib.BUILD b/third_party/html5lib.BUILD
index dece3863a3c..6fd6bed4d34 100644
--- a/third_party/html5lib.BUILD
+++ b/third_party/html5lib.BUILD
@@ -1,5 +1,5 @@
 # Description:
-# Import of html5lib library.
+#   Import of html5lib library.
 
 package(default_visibility = ["//visibility:public"])
 
@@ -9,9 +9,44 @@ exports_files(["LICENSE"])
 
 py_library(
     name = "org_html5lib",
-    srcs = glob(["html5lib/**/*.py"]),
-    srcs_version = "PY2AND3",
-    deps = [
-        "@org_pythonhosted_six",
+    srcs = [
+        "html5lib/__init__.py",
+        "html5lib/constants.py",
+        "html5lib/filters/__init__.py",
+        "html5lib/filters/_base.py",
+        "html5lib/filters/alphabeticalattributes.py",
+        "html5lib/filters/inject_meta_charset.py",
+        "html5lib/filters/lint.py",
+        "html5lib/filters/optionaltags.py",
+        "html5lib/filters/sanitizer.py",
+        "html5lib/filters/whitespace.py",
+        "html5lib/html5parser.py",
+        "html5lib/ihatexml.py",
+        "html5lib/inputstream.py",
+        "html5lib/sanitizer.py",
+        "html5lib/serializer/__init__.py",
+        "html5lib/serializer/htmlserializer.py",
+        "html5lib/tokenizer.py",
+        "html5lib/treeadapters/__init__.py",
+        "html5lib/treeadapters/sax.py",
+        "html5lib/treebuilders/__init__.py",
+        "html5lib/treebuilders/_base.py",
+        "html5lib/treebuilders/dom.py",
+        "html5lib/treebuilders/etree.py",
+        "html5lib/treebuilders/etree_lxml.py",
+        "html5lib/treewalkers/__init__.py",
+        "html5lib/treewalkers/_base.py",
+        "html5lib/treewalkers/dom.py",
+        "html5lib/treewalkers/etree.py",
+        "html5lib/treewalkers/genshistream.py",
+        "html5lib/treewalkers/lxmletree.py",
+        "html5lib/treewalkers/pulldom.py",
+        "html5lib/trie/__init__.py",
+        "html5lib/trie/_base.py",
+        "html5lib/trie/datrie.py",
+        "html5lib/trie/py.py",
+        "html5lib/utils.py",
     ],
+    srcs_version = "PY2AND3",
+    deps = ["@org_pythonhosted_six"],
 )
diff --git a/third_party/js.bzl b/third_party/js.bzl
index bf2a47e8525..3b5f15a66c9 100644
--- a/third_party/js.bzl
+++ b/third_party/js.bzl
@@ -152,6 +152,10 @@ def tensorboard_js_workspace():
       # no @license header
       licenses = ["notice"],  # MIT
       sha256_urls = {
+          "5eb9be209f84c4588f573b9abd8e13c04ce187ad6f40e8b12993d00b1428de54": [
+              "https://mirror.bazel.build/raw.githubusercontent.com/mrdoob/three.js/r77/LICENSE",
+              "https://raw.githubusercontent.com/mrdoob/three.js/r77/LICENSE",
+          ],
           "881cc79c84c34a1f61f8c8af0ee3f237d83a2eda3868720fdcb47bcacf8da44a": [
               "https://mirror.bazel.build/raw.githubusercontent.com/mrdoob/three.js/r77/build/three.js",
               "https://raw.githubusercontent.com/mrdoob/three.js/r77/build/three.js",
@@ -177,6 +181,7 @@ def tensorboard_js_workspace():
       strip_prefix = "lodash-3.10.1",
       path = "/lodash",
       srcs = ["lodash.js"],
+      extra_build_file_content = "exports_files([\"LICENSE\"])",
   )
 
   filegroup_external(
diff --git a/third_party/polymer.bzl b/third_party/polymer.bzl
index 68f1737df61..19766cf3503 100644
--- a/third_party/polymer.bzl
+++ b/third_party/polymer.bzl
@@ -28,6 +28,7 @@ def tensorboard_polymer_workspace():
       ],
       path = "/polymer",
       srcs = [
+          "LICENSE.txt",
           "polymer.html",
           "polymer-micro.html",
           "polymer-mini.html",