diff --git a/BUILD b/BUILD
index a060f06e25..bce030a761 100644
--- a/BUILD
+++ b/BUILD
@@ -147,7 +147,7 @@ cc_proto_library(
     srcs = ["src/" + s for s in WELL_KNOWN_PROTOS],
     internal_bootstrap_hack = 1,
     prefix = "src",
-    deps = ":protobuf",
+    cc_libs = [":protobuf"],
 )
 
 ################################################################################
@@ -341,7 +341,7 @@ cc_proto_library(
     name = "cc_test_protos",
     srcs = ["src/" + s for s in (LITE_TEST_PROTOS + TEST_PROTOS)],
     prefix = "src",
-    proto_deps = [":cc_wkt_protos"],
+    deps = [":cc_wkt_protos"],
 )
 
 COMMON_TEST_SRCS = [
diff --git a/protobuf.bzl b/protobuf.bzl
index a745998c8b..c6685d3017 100644
--- a/protobuf.bzl
+++ b/protobuf.bzl
@@ -71,8 +71,8 @@ def cc_proto_library(
         protoc=":protoc",
         internal_bootstrap_hack=False,
         prefix="",
-        proto_deps=[],
         deps=[],
+        cc_libs=[],
         **kargs):
 
   if internal_bootstrap_hack:
@@ -81,22 +81,21 @@ def cc_proto_library(
     _proto_gen(
         name=name + "_genproto",
         srcs=srcs,
-        deps=[s + "_genproto" for s in proto_deps],
+        deps=[s + "_genproto" for s in deps],
         prefix=prefix,
         protoc=protoc,
     )
     # An empty cc_library to make rule dependency consistent.
     native.cc_library(
         name=name,
-        **kargs,
-    )
+        **kargs)
     return
 
   outs = _cc_outs(srcs)
   _proto_gen(
       name=name + "_genproto",
       srcs=srcs,
-      deps=[s + "_genproto" for s in proto_deps],
+      deps=[s + "_genproto" for s in deps],
       prefix=prefix,
       protoc=protoc,
       gen_cc=1,
@@ -106,7 +105,6 @@ def cc_proto_library(
   native.cc_library(
       name=name,
       srcs=outs,
-      deps=deps + proto_deps,
+      deps=cc_libs + deps,
       includes=[prefix],
-      **kargs,
-  )
+      **kargs)