diff --git a/.travis.yml b/.travis.yml
index 144303e6f94..132de715d82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,7 +79,7 @@ addons:
       - libqt5gui5
       - libqt5widgets5
       - libqt5xml5
-      - libqglviewer-dev
+      - qt5-qmake
       # Not allowed (yet) 
       # - geomview 
       # - libglew1.5-dev 
diff --git a/.travis/build_package.sh b/.travis/build_package.sh
index 0f5ecffea28..38937ccbd82 100755
--- a/.travis/build_package.sh
+++ b/.travis/build_package.sh
@@ -53,7 +53,7 @@ do
 	  cd build
 	  cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" ..
 	  make -j2
-  else
+  elif [ "$ARG" != Polyhedron_demo ]; then
     echo "No example found for $ARG"
 	fi
 
@@ -64,7 +64,7 @@ do
 	  cd build
 	  cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" ..
   	make -j2
-  else
+  elif [ "$ARG" != Polyhedron_demo ]; then
     echo "No test found for $ARG"
 	fi
 	
@@ -75,18 +75,27 @@ do
 	  cd build
 	  cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" ..
 	  make -j2
-  else
+  elif [ "$ARG" != Polyhedron_demo ]; then
     echo "No demo found for $ARG"
 	fi
 if [ "$ARG" == Polyhedron_demo ]; then
   cd "$ROOT/Polyhedron/demo/Polyhedron"
-  mkdir ./build
+  #install libqglviewer
+  git clone --depth=1 https://github.com/GillesDebunne/libQGLViewer.git ./qglviewer
+  cd ./qglviewer/QGLViewer
+  #use qt5 instead of qt4
+  export QT_SELECT=5
+  qmake NO_QT_VERSION_SUFFIX=yes
+  make -j2
+  if [ ! -f libQGLViewer.so ]; then
+    echo "libQGLViewer.so not made"
+    exit 1
+  fi
+#end install qglviewer
+  cd "$ROOT/Polyhedron/demo/Polyhedron"
+  mkdir -p ./build
   cd ./build
-  cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" ..
+  cmake -DCGAL_DIR="$ROOT/build" -DQGLVIEWER_INCLUDE_DIR="$ROOT/Polyhedron/demo/Polyhedron/qglviewer" -DQGLVIEWER_LIBRARIES="$ROOT/Polyhedron/demo/Polyhedron/qglviewer/QGLViewer/libQGLViewer.so" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" ..
   make -j2
 fi
 done
-
-# Local Variables:
-# tab-width: 2
-# End:
diff --git a/.travis/build_polyhedron_demo.sh b/.travis/build_polyhedron_demo.sh
deleted file mode 100644
index 0fcd07b4b80..00000000000
--- a/.travis/build_polyhedron_demo.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-cd ..
-ROOT="$PWD"
-cd ./Polyhedron/demo/Polyhedron
-mkdir ./build
-cd ./build
-cmake -DCGAL_DIR="$ROOT/build" -DCMAKE_CXX_FLAGS_RELEASE="-DCGAL_NDEBUG" ..
-make -j2
diff --git a/.travis/template.txt b/.travis/template.txt
index d2c23972be2..0803ab438e9 100644
--- a/.travis/template.txt
+++ b/.travis/template.txt
@@ -39,7 +39,7 @@ addons:
       - libqt5gui5
       - libqt5widgets5
       - libqt5xml5
-      - libqglviewer-dev
+      - qt5-qmake
       # Not allowed (yet) 
       # - geomview 
       # - libglew1.5-dev