diff --git a/p/ParaView/ParaView-5.4.0-intel-2017a-OSPRay-test.eb b/p/ParaView/ParaView-5.4.0-intel-2017a-OSPRay-test.eb
index 8fa97cbc..320bb480 100644
--- a/p/ParaView/ParaView-5.4.0-intel-2017a-OSPRay-test.eb
+++ b/p/ParaView/ParaView-5.4.0-intel-2017a-OSPRay-test.eb
@@ -18,14 +18,14 @@ dependencies = [
     ('X11', '20170314', '', True),
     ('Mesa', '17.0.2'),
     ('libGLU', '9.0.0', '', True),
-    ('Qt5', '5.8.0', '', ('GCC', '6.3.0-2.27')),
+    ('Qt5', '5.8.0'),
     ('zlib', '1.2.11', '', True),
     ('HDF5', '1.8.17'),
     ('Python', '2.7.13', '', True),
     ('OSPRay', '1.3.0')
 ]
 
-builddependencies = [('CMake', '3.8.1', '', True)]
+builddependencies = [('CMake', '3.9.0', '', True)]
 
 separate_build_dir = True
 
diff --git a/q/Qt5/Qt5-5.8.0-intel-2017a.eb b/q/Qt5/Qt5-5.8.0-intel-2017a.eb
new file mode 100644
index 00000000..934caad0
--- /dev/null
+++ b/q/Qt5/Qt5-5.8.0-intel-2017a.eb
@@ -0,0 +1,33 @@
+easyblock = 'EB_Qt'
+
+name = 'Qt5'
+version = '5.8.0'
+
+homepage = 'http://qt.io/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'intel', 'version': '2017a'}
+
+source_urls = [
+    'http://download.qt.io/official_releases/qt/%(version_major_minor)s/%(version)s/single/',
+    'http://download.qt.io/archive/qt/%(version_major_minor)s/%(version)s/single/'
+]
+sources = ['qt-everywhere-opensource-src-%(version)s.tar.xz']
+
+patches = ['Qt5-5.7.1_fix-nan-inf.patch']
+
+builddependencies = [
+    ('pkg-config', '0.29.1', '', True),
+]
+
+# qtgamepad needs recent kernel/libevdev (fails on RHEL 6.x)
+configopts = '-skip qtgamepad'
+
+dependencies = [
+    ('GLib', '2.52.0', '', True),
+    ('libpng', '1.6.29', '', True),
+    ('X11', '20170314', '', True),
+    ('libGLU', '9.0.0', '', True),
+]
+
+moduleclass = 'devel'