diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 6229e01bbef..c697bf64521 100755
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -22,6 +22,7 @@ load(
 )
 load("//third_party/aws:workspace.bzl", aws = "repo")
 load("//third_party/flatbuffers:workspace.bzl", flatbuffers = "repo")
+load("//third_party/highwayhash:workspace.bzl", highwayhash = "repo")
 load("//third_party/icu:workspace.bzl", icu = "repo")
 load("//third_party/jpeg:workspace.bzl", jpeg = "repo")
 load("//third_party/nasm:workspace.bzl", nasm = "repo")
@@ -30,6 +31,7 @@ def initialize_third_party():
     """ Load third party repositories.  See above load() statements. """
     aws()
     flatbuffers()
+    highwayhash()
     icu()
     jpeg()
     nasm()
@@ -229,17 +231,6 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""):
         ],
     )
 
-    tf_http_archive(
-        name = "highwayhash",
-        build_file = clean_dep("//third_party:highwayhash.BUILD"),
-        sha256 = "9c3e0e87d581feeb0c18d814d98f170ff23e62967a2bd6855847f0b2fe598a37",
-        strip_prefix = "highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968",
-        urls = [
-            "http://mirror.bazel.build/github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz",
-            "https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz",
-        ],
-    )
-
     tf_http_archive(
         name = "png_archive",
         build_file = clean_dep("//third_party:png.BUILD"),
diff --git a/third_party/highwayhash/BUILD b/third_party/highwayhash/BUILD
new file mode 100644
index 00000000000..2f5d02becb9
--- /dev/null
+++ b/third_party/highwayhash/BUILD
@@ -0,0 +1 @@
+# Dummy BUILD file to make this directory a package.
diff --git a/third_party/highwayhash.BUILD b/third_party/highwayhash/BUILD.bazel
similarity index 100%
rename from third_party/highwayhash.BUILD
rename to third_party/highwayhash/BUILD.bazel
index 08cb84ea2c8..39b148bc000 100644
--- a/third_party/highwayhash.BUILD
+++ b/third_party/highwayhash/BUILD.bazel
@@ -9,8 +9,8 @@ cc_library(
     name = "sip_hash",
     srcs = ["highwayhash/sip_hash.cc"],
     hdrs = [
-        "highwayhash/sip_hash.h",
         "highwayhash/endianess.h",
+        "highwayhash/sip_hash.h",
         "highwayhash/state_helpers.h",
     ],
     visibility = ["//visibility:public"],
diff --git a/third_party/highwayhash/workspace.bzl b/third_party/highwayhash/workspace.bzl
new file mode 100644
index 00000000000..793297b9ba0
--- /dev/null
+++ b/third_party/highwayhash/workspace.bzl
@@ -0,0 +1,15 @@
+"""loads the highwayhash library, used by TF."""
+
+load("//third_party:repo.bzl", "third_party_http_archive")
+
+def repo():
+    third_party_http_archive(
+        name = "highwayhash",
+        urls = [
+            "http://mirror.bazel.build/github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz",
+            "https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz",
+        ],
+        sha256 = "9c3e0e87d581feeb0c18d814d98f170ff23e62967a2bd6855847f0b2fe598a37",
+        strip_prefix = "highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968",
+        build_file = "//third_party/highwayhash:BUILD.bazel",
+    )