diff --git a/.ci/linux.sh b/.ci/linux.sh
new file mode 100755
index 00000000..84b54ebc
--- /dev/null
+++ b/.ci/linux.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+sudo add-apt-repository -y ppa:beineri/opt-qt562-trusty
+sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
+sudo apt-get update -qq
+sudo apt-get install -qq -y gcc-6 g++-6 clang qt56base cmake
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..04921694
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,25 @@
+language: cpp
+sudo: required
+dist: trusty
+
+matrix:
+    include:
+        - os: osx
+          osx_image: xcode7
+          compiler: clang
+        - os: osx
+          osx_image: xcode8
+          compiler: clang
+        - os: linux
+          compiler: gcc
+        - os: linux
+          compiler: clang
+install:
+    - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install qt5; fi
+    - if [ $TRAVIS_OS_NAME == osx ]; then export CMAKE_PREFIX_PATH=/usr/local/opt/qt5; fi
+    - if [ $TRAVIS_OS_NAME == linux ]; then ./.ci/linux.sh ; fi
+before_script:
+    - if [ $TRAVIS_OS_NAME == linux ]; then source /opt/qt56/bin/qt56-env.sh; fi
+    - cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release
+script:
+    - make -C build -j2
diff --git a/README.md b/README.md
index 42b33dc9..1d0299c6 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,32 @@
 nheko
 ----
+[![Build Status](https://travis-ci.org/mujx/nheko.svg?branch=master)](https://travis-ci.org/mujx/nheko)
 
 The motivation behind the project is to provide a native desktop app for [Matrix] that
 feels more like a mainstream chat app ([Riot], Telegram etc) and less like an IRC client.
 
-#### Features
+### Features
 
 Most of the features you'd expect from a chat application are missing right now
 but you can of course receive and send messages in the rooms that you are a member of.
 
-#### Requirements
+### Requirements
 
 Building instructions for OSX and Windows will be added.
 
-##### Linux
+#### Linux
 
 - Qt5
 - CMake v3.1 or greater
 - GCC that supports C++11.
 
-###### Arch Linux
+##### Arch Linux
 
 ```bash
 $ sudo pacman -S qt5-base cmake gcc
 ```
 
-#### Building
+### Building
 
 Run
 
@@ -36,19 +37,19 @@ make -C build
 
 The `nheko` binary will be located in the `build` directory.
 
-#### Contributing
+### Contributing
 
 Any kind of contribution to the project is greatly appreciated. You are also
 encouraged to open feature request issues.
 
-#### Screens
+### Screens
 
 Here is a screen shot to get a feel for the UI, but things will probably change.
 
 ![nheko](https://dl.dropboxusercontent.com/s/u6rsx8rsp1u2sko/screen.png)
 
 
-#### License
+### License
 
 [GPLv3]
 
diff --git a/src/RoomInfoListItem.cc b/src/RoomInfoListItem.cc
index dedae3fd..25daad63 100644
--- a/src/RoomInfoListItem.cc
+++ b/src/RoomInfoListItem.cc
@@ -16,6 +16,7 @@
  */
 
 #include <QDebug>
+#include <QMouseEvent>
 
 #include "Ripple.h"
 #include "RoomInfo.h"
diff --git a/src/ui/TextField.cc b/src/ui/TextField.cc
index 3b701549..a93d801d 100644
--- a/src/ui/TextField.cc
+++ b/src/ui/TextField.cc
@@ -190,7 +190,7 @@ void TextField::paintEvent(QPaintEvent *event)
 	pen.setColor(underlineColor());
 	painter.setPen(pen);
 	painter.setOpacity(1);
-	painter.drawLine(2.5, y, wd, y);
+	painter.drawLine(2, y, wd, y);
 
 	QBrush brush;
 	brush.setStyle(Qt::SolidPattern);