diff --git a/cli/BUILD b/cli/BUILD
index f731ba30..419aa9ed 100644
--- a/cli/BUILD
+++ b/cli/BUILD
@@ -168,7 +168,7 @@ filegroup(
 
 cc_library(
     name = "dat2json_cli_lib",
-    defines = ["CLI_ONLY=1", "BAZEL_BUILD=1"] + select({
+    defines = ["CLI_ONLY=1", "HAVE_TOMMATH=1", "BAZEL_BUILD=1"] + select({
         "//conditions:default": [],
         "//:windows": ["WIN32=1",],
         "//:windows_msys": ["WIN32=1",],
@@ -178,7 +178,8 @@ cc_library(
         "creatureui.cpp", "//:creatureui.h",
         "thingui.cpp", "//:thingui.h",
         "effectui.cpp", "//:effectui.h",
-        "objects.cpp", "//:objects.h",
+        #"objects.cpp",
+        "//:objects.h",
         "distanceui.cpp", "//:distanceui.h",
         "itemui.cpp", "//:itemui.h",
         "notifications.cpp", "//:notifications.h",
@@ -218,15 +219,23 @@ cc_library(
         "//net:protocolgame.h",
         "//net:protocollogin.h",
         "//net:protocollogin.cpp",
-        #"//net:rsa.h",
-        #"//net:rsa.cpp",
+        "//net:rsa.h",
+        "//net:rsa.cpp",
 
         "//:util.cpp",
         "//:util.h",
         "//:product.h",
         "//:macutil.h",
 
+        "//gamecontent:item.cpp",
+        "//gamecontent:viplist.cpp",
+        "//:objects.cpp",
+        "//:options.cpp", "//:options.h", "//:confighandler.h", "//:confighandler.cpp",
+        "//:bigint.h",
+        "//:bigint.cpp",
+
         ":protocolgamehdrs",
+	":protocolgamesrcs", # why?
         "dat2json_cli.cpp",
     ],
     deps = [
@@ -255,6 +264,8 @@ cc_library(
     }),
     data = [
         "@tibia854//:Tibia.dat",
+        "@tibia854//:Tibia.spr",
+        "@tibia854//:Tibia.pic",
     ],
     copts = select({
         "//conditions:default": ["-isystem external/tommath"],
diff --git a/cli/README.md b/cli/README.md
index 14e9c65e..732a4aa2 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -13,3 +13,23 @@ not been eliminated.
 
 The client is just for experimentation, and thus no care was taken to make it
 autoconf'igurable.
+
+It can be build with either `make` or:
+
+```
+bazel build --define LOGIN_ONLY=1 :yatc_cli
+```
+
+`LOGIN_ONLY` is required at this time. Gameworld connections are not supported
+at this time.
+
+## dat2json
+
+This is also the directory where, at this time, it made the most sense to place
+dat2json. It can be built with either `make` or:
+
+```
+bazel build --define LOGIN_ONLY=1 //cli:dat2json_cli
+```
+
+`LOGIN_ONLY` is required at this time.