diff --git a/.travis.yml b/.travis.yml
index 17418fb5c..bdf00d32d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,6 @@ addons:
 env:
   global:
     - RISCV="/home/travis/riscv_install"
-    - MAKEFLAGS="-j2"
     - PATH="/home/travis/riscv_install/bin:$PATH"
 
 branches:
@@ -38,11 +37,11 @@ branches:
 before_install:
   - export CXX=g++-4.8 CC=gcc-4.8
   - ci/make-tmp.sh
+  - ci/build-riscv-gcc.sh
   - ci/install-verilator.sh
-  # - ci/co-riscv-env.sh
   - ci/install-fesvr.sh
   - ci/build-riscv-tests.sh
-
+  - export VERILATOR_ROOT=$TRAVIS_BUILD_DIR/tmp/verilator-3.918/
 script:
   - make run-asm-tests-verilator verilator=$TRAVIS_BUILD_DIR/tmp/bin/verilator
 
diff --git a/README.md b/README.md
index 78731bfde..c373b20f3 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,8 @@ Build the Verilator model of Ariane by using the Makefile:
 ```
 make verilate
 ```
+
+This will create a C++ model of the core including a SystemVerilog wrapper and link it against a C++ testbench (in the `tb` subfolder).
 <!--
 Start the simulation using Modelsim:
 ```
diff --git a/ci/build-riscv-gcc.sh b/ci/build-riscv-gcc.sh
new file mode 100755
index 000000000..564383a74
--- /dev/null
+++ b/ci/build-riscv-gcc.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
+cd $ROOT/tmp
+
+[ -d $ROOT/tmp/riscv-gnu-toolchain ] || git clone https://github.com/riscv/riscv-gnu-toolchain.git
+cd riscv-gnu-toolchain
+git checkout 691e4e826251c7ec59f883cab18440c87baf45e7
+git submodule update --init --recursive
+
+mkdir -p $RISCV
+
+./configure --prefix=$RISCV
+make -j2