diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..c1383a886d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,30 @@
+language: cpp
+compiler:
+  - clang
+  - gcc
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - bison
+      - cmake
+      - flex
+      - libpcap-dev
+      - libssl-dev
+      - python-dev
+      - swig
+      - zlib1g-dev
+
+install: ./configure && make -j 4
+
+script:
+  - make -C testing/btest btest-verbose
+  - make -C testing/external init && make -C testing/external
+
+after_failure:
+  # Output each diag.log that contains failed test results.
+  - for i in testing/btest/diag.log testing/external/bro-testing/diag.log; do
+    grep -qs '... failed$' $i && cat $i ;
+    done
diff --git a/CHANGES b/CHANGES
index df3cec3aa6..40d756e4e3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.5-424 | 2018-02-05 15:07:20 -0800
+
+  * Add a .travis.yml. file (Daniel Thayer)
+
 2.5-422 | 2018-02-05 16:28:25 -0600
 
   * fix setup field handling in smb1_com_transaction_request messages
diff --git a/VERSION b/VERSION
index 01c4a73e12..f7457e39a0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-422
+2.5-424