diff --git a/.gitmodules b/.gitmodules
index 696fdff396539bdb0b215a8ca0a96521e3e24caf..af32ea618cf72247fef175a05383300037a534d4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,3 +5,7 @@
 [submodule "pyca.cryptography"]
 	path = pyca-cryptography
 	url = https://github.com/pyca/cryptography.git
+
+[submodule "krb5"]
+	path = krb5
+	url = https://github.com/krb5/krb5
diff --git a/.travis.yml b/.travis.yml
index cb08e40d42e63414ed78aabb36d76fa66d09fda0..61a9acc3b3add1c3e3021f990a964d5fc248a080 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -196,6 +196,9 @@ script:
               sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine;
               export EXE_SHELL="wine" WINEPREFIX=`pwd`;
           fi;
+          if [ -e krb5/src ]; then
+              sudo apt-get -yq install bison dejagnu gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python-cjson python-paste python-pyrad slapd tcl-dev tcsh;
+          fi;
           HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test;
       else
           $make build_tests;
diff --git a/krb5 b/krb5
new file mode 160000
index 0000000000000000000000000000000000000000..b9ad6c49505c96a088326b62a52568e3484f2168
--- /dev/null
+++ b/krb5
@@ -0,0 +1 @@
+Subproject commit b9ad6c49505c96a088326b62a52568e3484f2168