diff --git a/d/dos2unix/dos2unix-7.4.0.eb b/d/dos2unix/dos2unix-7.4.0.eb
new file mode 100644
index 00000000..18d28a03
--- /dev/null
+++ b/d/dos2unix/dos2unix-7.4.0.eb
@@ -0,0 +1,27 @@
+# IT4Innovations 2018
+easyblock = 'ConfigureMake'
+
+name = 'dos2unix'
+version = '7.4.0'
+
+homepage = 'https://sourceforge.net/projects/dos2unix'
+description = "dos2unix includes utilities to convert text files with DOS or MAC line breaks to Unix line breaks and vice versa. It also includes conversion of UTF-16 to UTF-8."
+
+toolchain = {'name': 'dummy', 'version': ''}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['https://datapacket.dl.sourceforge.net/project/dos2unix/dos2unix/%(version)s/']
+sources = ['dos2unix-%(version)s.tar.gz']
+
+skipsteps = ['configure']
+
+dependencies = [ ('gettext', '0.19.8.1', '', True) ]
+
+installopts = "prefix=%(installdir)s"
+
+sanity_check_paths = {
+    'files': ['bin/dos2unix', 'bin/unix2dos'],
+    'dirs': ['bin', 'share'],
+}
+
+moduleclass = 'tools'
diff --git a/f/fontconfig/fontconfig-2.13.0-libpng-1.6.34.eb b/f/fontconfig/fontconfig-2.13.0-libpng-1.6.34.eb
index 5c747fa2..3ff427e3 100644
--- a/f/fontconfig/fontconfig-2.13.0-libpng-1.6.34.eb
+++ b/f/fontconfig/fontconfig-2.13.0-libpng-1.6.34.eb
@@ -16,6 +16,7 @@ sources = [SOURCE_TAR_GZ]
 dependencies = [
     ('freetype', '2.9.1', versionsuffix),
     ('util-linux', '2.32'),
+    ('expat', '2.2.0'),
 ]
 
 builddependencies = [
diff --git a/g/gnuplot/gnuplot-5.2.4-GCC-6.3.0-2.27.eb b/g/gnuplot/gnuplot-5.2.4-GCC-6.3.0-2.27.eb
index 13fd0c95..6c833452 100644
--- a/g/gnuplot/gnuplot-5.2.4-GCC-6.3.0-2.27.eb
+++ b/g/gnuplot/gnuplot-5.2.4-GCC-6.3.0-2.27.eb
@@ -21,6 +21,7 @@ dependencies = [
     ('Pango', '1.42.1'),
     ('libcerf', '1.5', '', True),
     ('Qt', '4.8.7', '', True),
+    ('LibTIFF', '4.0.7', '', True),
 ]
 
 configopts = '--with-qt=qt4 '
diff --git a/h/HDF5/HDF5-1.8.17-intel-2017a.eb b/h/HDF5/HDF5-1.8.17-intel-2017a.eb
index 01d15bf2..9fc016da 100644
--- a/h/HDF5/HDF5-1.8.17-intel-2017a.eb
+++ b/h/HDF5/HDF5-1.8.17-intel-2017a.eb
@@ -8,8 +8,7 @@ description = """HDF5 is a unique technology suite that makes possible the manag
 toolchain = {'name': 'intel', 'version': '2017a'}
 toolchainopts = {'pic': True, 'usempi': True}
 
-source_urls = [
-    'http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+source_urls = ['https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.17/src/']
 sources = [SOURCELOWER_TAR_GZ]
 
 patches = [
diff --git a/o/OpenMPI/OpenMPI-3.0.0-GCC-6.3.0-2.27.eb b/o/OpenMPI/OpenMPI-3.0.0-GCC-6.3.0-2.27.eb
index 5d1c435e..9cdad4c6 100644
--- a/o/OpenMPI/OpenMPI-3.0.0-GCC-6.3.0-2.27.eb
+++ b/o/OpenMPI/OpenMPI-3.0.0-GCC-6.3.0-2.27.eb
@@ -39,7 +39,7 @@ preconfigopts = 'export LIBS="-ldl" && '
 # configopts += '--with-slurm --with-pmi=/usr/include/slurm --with-pmi-libdir=/usr'
 
 # needed for --with-verbs
-osdependencies = [('libibverbs-dev', 'libibverbs-devel')]
+osdependencies = [('libibverbs-dev', 'libibverbs-devel', 'rdma-core-devel')]
 
 libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
 sanity_check_paths = {
diff --git a/q/Qt/Qt-4.8.7.eb b/q/Qt/Qt-4.8.7.eb
index 68530afe..cd708a88 100644
--- a/q/Qt/Qt-4.8.7.eb
+++ b/q/Qt/Qt-4.8.7.eb
@@ -7,7 +7,7 @@ description = "Qt is a comprehensive cross-platform C++ application framework."
 toolchain = {'name': 'dummy', 'version': ''}
 
 source_urls = [
-    'http://origin.releases.qt-project.org/qt4/source/',
+    'http://download.qt.io/archive/qt/4.8/4.8.7/',
     'http://master.qt-project.org/archive/qt/%(version_major_minor)s/%(version)s/'
     'http://download.qt.io/official_releases/qt/%(version_major_minor)s/%(version)s//qt-everywhere-opensource-src-%(version)s/.tar.gz'
 ]
diff --git a/q/QuantumESPRESSO/QuantumESPRESSO-6.3-intel-2017a.eb b/q/QuantumESPRESSO/QuantumESPRESSO-6.3-intel-2017a.eb
new file mode 100644
index 00000000..6a2fa0db
--- /dev/null
+++ b/q/QuantumESPRESSO/QuantumESPRESSO-6.3-intel-2017a.eb
@@ -0,0 +1,41 @@
+# IT4Innovations
+
+name = 'QuantumESPRESSO'
+version = '6.3'
+
+homepage = 'http://www.pwscf.org/'
+description = """Quantum ESPRESSO  is an integrated suite of computer codes
+ for electronic-structure calculations and materials modeling at the nanoscale.
+ It is based on density-functional theory, plane waves, and pseudopotentials
+  (both norm-conserving and ultrasoft)."""
+
+toolchain = {'name': 'intel', 'version': '2017a'}
+toolchainopts = {'usempi': True, 'openmp': True}
+
+sources = [
+    'qe-%(version)s.tar.gz',
+    {'filename': 'qe-gipaw-%(version)s.tar.gz', 'download_filename': '%(version)s.tar.gz', 'source_urls': ['https://github.com/dceresoli/qe-gipaw/archive/']},
+    {'filename': 'wannier90-2.1.0.tar.gz', 'source_urls': ['http://www.wannier.org/code/']},
+]
+
+# The old qe-forge archive doesn't exist any longer.
+# This easyconfig is for those who have the old qe-forge tar file downloaded.
+# The qe tar file from github for 6.2 has a different top level directory name
+# than the old qe-forge tarfile did and the easyblock expects the old name.
+# Old download was
+# wget http://qe-forge.org/gf/download/frsrelease/244/1114/qe-6.2.tar.gz
+
+source_urls = [
+    'https://github.com/QEF/q-e/archive/',  # qe
+]
+
+patches = [
+    '%(name)s-%(version)s_drop_LIBS_before_configure_of_fox.patch',
+]
+
+buildopts = 'all w90 gipaw xspectra pwall ph epw'
+
+# parallel build tends to fail
+parallel = 1
+
+moduleclass = 'chem'
diff --git a/q/QuantumESPRESSO/QuantumESPRESSO-6.3_drop_LIBS_before_configure_of_fox.patch b/q/QuantumESPRESSO/QuantumESPRESSO-6.3_drop_LIBS_before_configure_of_fox.patch
new file mode 100644
index 00000000..ac0f3c0d
--- /dev/null
+++ b/q/QuantumESPRESSO/QuantumESPRESSO-6.3_drop_LIBS_before_configure_of_fox.patch
@@ -0,0 +1,11 @@
+--- q-e-qe-6.3/install/extlibs_makefile.orig	2018-12-12 10:34:41.129044224 +0100
++++ q-e-qe-6.3/install/extlibs_makefile	2018-12-12 10:35:34.600005304 +0100
+@@ -89,7 +89,7 @@
+         mkdir ../FoX; \
+ 	(gzip -dc ../archive/fox.tgz | (cd ../FoX; tar -xvf -)); \
+ 	cd ../FoX/fox/; export FC=$(F90); export FCFLAGS="$(FOX_FLAGS)"; \
+-	./configure --prefix=$(TOPDIR)/FoX ;\
++	unset LIBS; ./configure --prefix=$(TOPDIR)/FoX ;\
+ 	$(MAKE) install; cd ../; rm -fr fox;fi
+ # ELPA
+ libelpa : libelpa_$(ELPA_LIBS_SWITCH)
diff --git a/r/Ruby/Ruby-2.4.2.eb b/r/Ruby/Ruby-2.4.2.eb
index 4723584d..50fdb78c 100644
--- a/r/Ruby/Ruby-2.4.2.eb
+++ b/r/Ruby/Ruby-2.4.2.eb
@@ -48,7 +48,7 @@ exts_list = [
     ('rack', '1.6.5', ext_options),
     ('rack-protection', '1.5.3', ext_options),
     ('tilt', '2.0.5', ext_options),
-    ('sinatra', '1.4.7', ext_options),
+#    ('sinatra', '2.0.4', ext_options),
     ('rack-test', '0.6.3', ext_options),
     ('faraday', '0.12.0.1', ext_options),
 ]