diff --git a/.travis.yml b/.travis.yml
index 0db8a06259e..815b1485da8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ branches:
     - /^\d+\.\d+(\.\d+)?(-\S*)?$/
 
 env:
-  - BAZEL=0.9.0 TF=NIGHTLY
+  - BAZEL=0.9.0 TF=1.6.0rc0
 
 cache:
   directories:
diff --git a/RELEASE.md b/RELEASE.md
index a54d315e8b0..0e9ac2bfc8f 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,3 +1,8 @@
+# Release 1.6.0
+
+The 1.6 minor series tracks TensorFlow 1.6. Release notes upcoming.
+
+
 # Release 1.5.0
 
 The 1.5 minor series tracks TensorFlow 1.5.
diff --git a/tensorboard/pip_package/README.rst b/tensorboard/pip_package/README.rst
index 4b419b005e8..9db2b45b6bd 100644
--- a/tensorboard/pip_package/README.rst
+++ b/tensorboard/pip_package/README.rst
@@ -1,2 +1,5 @@
 TensorBoard is a suite of web applications for inspecting and understanding
 your TensorFlow runs and graphs.
+
+Releases prior to 1.6.0 were published under the ``tensorflow-tensorboard`` name
+and may be found at https://pypi.python.org/pypi/tensorflow-tensorboard.
diff --git a/tensorboard/pip_package/pip_smoke_test.sh b/tensorboard/pip_package/pip_smoke_test.sh
index 67f5cfee2d3..9b1bd394a93 100755
--- a/tensorboard/pip_package/pip_smoke_test.sh
+++ b/tensorboard/pip_package/pip_smoke_test.sh
@@ -115,9 +115,9 @@ echo "Installing the just-built tensorboard pip package"
 echo
 
 if [[ "${PY_VERSION}" == 2 ]]; then
-  pip install "${PIP_TMP_DIR}"/tensorflow_tensorboard*-py2-*.whl
+  pip install "${PIP_TMP_DIR}"/tensorboard*-py2-*.whl
 elif [[ "${PY_VERSION}" == 3 ]]; then
-  pip install "${PIP_TMP_DIR}"/tensorflow_tensorboard*-py3-*.whl
+  pip install "${PIP_TMP_DIR}"/tensorboard*-py3-*.whl
 fi
 
 echo
diff --git a/tensorboard/pip_package/setup.py b/tensorboard/pip_package/setup.py
index 1a467cc6fe2..be26aadb439 100644
--- a/tensorboard/pip_package/setup.py
+++ b/tensorboard/pip_package/setup.py
@@ -48,7 +48,7 @@ def get_readme():
     return f.read()
 
 setup(
-    name='tensorflow-tensorboard',
+    name='tensorboard',
     version=tensorboard.version.VERSION.replace('-', ''),
     description='TensorBoard lets you watch Tensors Flow',
     long_description=get_readme(),
diff --git a/tensorboard/version.py b/tensorboard/version.py
index d71f704ce27..32393345e0a 100644
--- a/tensorboard/version.py
+++ b/tensorboard/version.py
@@ -15,4 +15,4 @@
 
 """Contains the version string."""
 
-VERSION = '1.6.0a0'
+VERSION = '1.6.0-rc0'