diff --git a/.travis.yml b/.travis.yml
index e9464ae..d4472f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,11 +69,9 @@
     # Lua is not installed on Travis OSX
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi
 
-# Start virtual framebuffer to be able to test the GUI.
+# Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
 before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start && sleep 3; fi
 
 script:
   - NPROC=$(getconf _NPROCESSORS_ONLN)
diff --git a/src/version.c b/src/version.c
index 88adc6d..d4b84c5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    80,
+/**/
     79,
 /**/
     78,