diff --git a/.travis.yml b/.travis.yml
index e89e7d0f..fe1b7d50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,18 @@
 language: c
-script:
-  - echo "yes" | sudo add-apt-repository ppa:avsm/ocaml42+opam12
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq opam ocaml-native-compilers
-  - export OPAMYES=1
-  - opam init
-  - eval `opam config env`
-  - opam pin add -n ppx_tools git://github.com/alainfrisch/ppx_tools#4.02
-  - opam pin add -n -k path ppx_deriving .
-  - opam install --deps-only -d -t ppx_deriving
-  - opam install -d -t -v ppx_deriving
+sudo: false
+services:
+  - docker
+install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-docker.sh
+script: bash -ex ./.travis-docker.sh
+env:
+  global:
+  - PACKAGE="ppx_deriving"
+  - TESTS="true"
+  matrix:
+  - DISTRO="alpine" OCAML_VERSION="4.05.0"
+  - DISTRO="alpine" OCAML_VERSION="4.04.2"
+  - DISTRO="alpine" OCAML_VERSION="4.04.1"
+  - DISTRO="alpine" OCAML_VERSION="4.04.0"
+  - DISTRO="debian-stable" OCAML_VERSION="4.03.0"
+  - DISTRO="ubuntu-16.04" OCAML_VERSION="4.02.3"
+  - DISTRO="alpine" OCAML_VERSION="4.06.0"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bba6447..427ed548 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,23 @@
 Changelog
 =========
 
+4.2
+---
+
+  * Add support for OCaml 4.05.0.
+  * Use the `ocaml-migrate-parsetree` library to support multiple
+    versions of OCaml.
+  * Fix comparison order of fields in records (#136).
+  * Silence an `unused rec flag` warning in generated code (#137).
+  * Monomorphize comparison function for builtin types (#115)
+  * Raise an error when `type nonrec` is encountered (#116).
+  * Display an error message when dynamic package loading fails.
+  * Add a `with_path` option to `@@deriving` to skip the module path
+    in generated code (#120).
+
+The homepage for the project has now moved to:
+<https://github.com/ocaml-ppx/ppx_deriving>
+
 4.1
 ---