diff --git a/i/icc/icc-2017.1.132-GCC-6.3.0-2.27.eb b/i/icc/icc-2017.1.132-GCC-6.3.0-2.27.eb
index 8670c740..8ae7dc49 100644
--- a/i/icc/icc-2017.1.132-GCC-6.3.0-2.27.eb
+++ b/i/icc/icc-2017.1.132-GCC-6.3.0-2.27.eb
@@ -24,7 +24,7 @@ dependencies = [
 # list of regex for components to install
 # full list of components can be obtained from pset/mediaconfig.xml in unpacked sources
 # cfr. https://software.intel.com/en-us/articles/intel-composer-xe-2015-silent-installation-guide
-components = ['intel-comp', 'intel-ccomp', 'intel-icc', 'intel-openmp', 'intel-ipsc?_', 'intel-gdb(?!.*mic)']
+components = ['intel-comp', 'intel-ccomp', 'intel-icc', 'intel-openmp', 'intel-ipsc?_', 'intel-gdb']
 
 dontcreateinstalldir = 'True'
 
diff --git a/i/icc/icc-2017.4.196-GCC-7.1.0-2.28.eb b/i/icc/icc-2017.4.196-GCC-7.1.0-2.28.eb
index 84d09968..ad47e1fc 100644
--- a/i/icc/icc-2017.4.196-GCC-7.1.0-2.28.eb
+++ b/i/icc/icc-2017.4.196-GCC-7.1.0-2.28.eb
@@ -24,7 +24,8 @@ dependencies = [
 # list of regex for components to install
 # full list of components can be obtained from pset/mediaconfig.xml in unpacked sources
 # cfr. https://software.intel.com/en-us/articles/intel-composer-xe-2015-silent-installation-guide
-components = ['intel-comp', 'intel-ccomp', 'intel-icc', 'intel-openmp', 'intel-ipsc?_', 'intel-gdb(?!.*mic)']
+#components = ['intel-comp', 'intel-ccomp', 'intel-icc', 'intel-openmp', 'intel-ipsc?_', 'intel-gdb(?!.*mic)']
+components = ['intel-comp', 'intel-ccomp', 'intel-icc', 'intel-openmp', 'intel-ipsc?_', 'intel-gdb']
 
 dontcreateinstalldir = 'True'
 
diff --git a/s/Singularity/Singularity-2.3.1.eb b/s/Singularity/Singularity-2.3.1.eb
new file mode 100644
index 00000000..0e0299d2
--- /dev/null
+++ b/s/Singularity/Singularity-2.3.1.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'Singularity'
+version = '2.3.1'
+
+homepage = 'http://gmkurtzer.github.io/singularity'
+description = """Singularity is a portable application stack packaging and runtime utility."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://github.com/gmkurtzer/singularity/archive/']
+sources = ['%(version)s.tar.gz']
+
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = './autogen.sh && '
+
+modextravars = {'SINGULARITY_OVERLAYFS_ENABLED': '1'}
+
+moduleclass = 'tools'