diff --git a/Makefile.am b/Makefile.am
index f37ae9fdae912..178c124b5e27a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1424,8 +1424,10 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)   \
   examples/list_people.py                \
   examples/list_people_test.go           \
   examples/pubspec.yaml                  \
+  maven_install.json                     \
   protobuf.bzl                           \
   protobuf_deps.bzl                      \
+  protobuf_version.bzl                   \
   third_party/zlib.BUILD                 \
   util/python/BUILD                      \
   internal.bzl
diff --git a/kokoro/linux/bazel/build.sh b/kokoro/linux/bazel/build.sh
index 5ec92ce7e5b48..d0d4b3ef4d942 100755
--- a/kokoro/linux/bazel/build.sh
+++ b/kokoro/linux/bazel/build.sh
@@ -35,5 +35,13 @@ bazel test -k --copt=-Werror --host_copt=-Werror \
   @com_google_protobuf//:cc_proto_blacklist_test
 trap - EXIT
 
-cd examples
+pushd examples
 bazel build //...
+popd
+
+# Verify that we can build successfully from generated tar files.
+./autogen.sh && ./configure && make -j$(nproc) dist
+DIST=`ls *.tar.gz`
+tar -xf $DIST
+cd ${DIST//.tar.gz}
+bazel build //:protobuf //:protobuf_java