diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..127edacd18f78a497ee4043a8a596b93812079ad
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,38 @@
+language: python
+python: 2.6
+env:
+  matrix:
+    - ENV_MOD_VERSION=3.2.10
+    - LMOD_VERSION=5.6.3 EASYBUILD_MODULES_TOOL=Lmod
+    - LMOD_VERSION=6.3.1 EASYBUILD_MODULES_TOOL=Lmod EASYBUILD_MODULE_SYNTAX=Lua
+matrix:
+  # mark build as finished as soon as job has failed
+  fast_finish: true
+  include:
+    # also test default configuration with Python 2.7
+    - python: 2.7
+      env: ENV_MOD_VERSION=3.2.10
+addons:
+  apt:
+    packages:
+      - tcl8.5
+install:
+    # required for test_dep_graph
+    - pip install python-graph-core python-graph-dot
+    # install easybuild-framework/easybuild-easyblocks (and dependencies)
+    # use 'develop' branch of framework/easyblocks, except when testing 'master'
+    - if [ "x$TRAVIS_BRANCH" = 'xmaster' ]; then BRANCH=master; else BRANCH=develop; fi
+    - cd $HOME
+    - git clone -b $BRANCH --depth 10 --single-branch https://github.com/hpcugent/easybuild-framework.git
+    - cd easybuild-framework; git log -n 1; cd -
+    - easy_install $PWD/easybuild-framework
+    - git clone -b $BRANCH --depth 10 --single-branch https://github.com/hpcugent/easybuild-easyblocks.git
+    - cd easybuild-easyblocks; git log -n 1; cd -
+    - easy_install $PWD/easybuild-easyblocks
+    # install environment modules tool using 'install_eb_dep.sh' script provided by easybuild-framework
+    - if [ ! -z $ENV_MOD_VERSION ]; then source $(which install_eb_dep.sh) modules-${ENV_MOD_VERSION} $HOME; fi
+    - if [ ! -z $LMOD_VERSION ]; then source $(which install_eb_dep.sh) lua-5.1.4.8 $HOME; fi
+    - if [ ! -z $LMOD_VERSION ]; then source $(which install_eb_dep.sh) Lmod-${LMOD_VERSION} $HOME; fi
+script:
+    - export PYTHONPATH=$TRAVIS_BUILD_DIR
+    - python -O -m test.easyconfigs.suite
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index a3e8287af779d16f6c0066e1899df60f66e863d6..b5c225454e3fd529cccc356c15a7db34c82a0d7a 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -3,9 +3,80 @@ For more detailed information, please see the git log.
 
 These release notes can also be consulted at http://easybuild.readthedocs.org/en/latest/Release_notes.html.
 
-The latest version of easybuild-easyconfig provides 5,093 easyconfig files, for 799 different software packages,
+The latest version of easybuild-easyconfig provides 5,580 easyconfig files, for 862 different software packages,
 34 different (compiler) toolchains, 12 software bundles and 1 meta-package.
 
+v2.7.0 (March 20th 2016)
+------------------------
+
+feature + bugfix release
+- added example easyconfig files for 63 new software packages:
+    ATSAS (#616, #2587), astropy (#2724, #2727), attr (#2706), BamUtil (#2654), BBMap (#2322), BH (#2508),
+    CheMPS2 (#2445), CosmoloPy (#2723, #2727), csvkit (#2639), Firefox (#2648), FreeXL (#2422), GL2PS (#2667),
+    Glade (#2631), htop (#2538), IGV (#2019), IGVTools (#2019), ImageMagick (#2438), jModelTest (#2529),
+    KEALib (#2420), libcerf (#2656), libgcrypt (#2201), libglade (#2631), libgpg-error (#2201), libspatialite (#2431),
+    LittleCMS (#2438), MAST (#2542), MLC (#2577), MPJ-Express (#2529), mutil (#2201), neon (#758), NextClip (#2544),
+    npstat (#2686, #2703), Octopus (#2643), QuickFF (#2721), p4vasp (#2328), PCMSolver (#2445), PFFT (#2643),
+    PHYLIP (#2694), pkgconfig (#2475, #2476), Platypus (#2618), pplacer (#1056), PRINSEQ (#2437, #2444, #2585),
+    PyFFmpeg (#2501, #2519), PyGObject (#2443), PyGTK (#2443), PyOpenGL (#2628), pyringe (#2533), qrupdate (#2675),
+    rgeos (#2635), rpmrebuild (#2402), shift (#2201), SNAPE-pooled (#2688), SNPhylo (#2701), sratoolkit (#2715),
+    STAR-Fusion (#2463), statsmodels (#2719), StringTie (#2527), synchronicity (#2508), testpath (#2461),
+    USEARCH (#2537), VarScan (#2464), vsc-install (#2165), Whoosh (#2725), xprop (#2645)
+- added new easyconfigs for existing toolchains:
+    intel/2016.02-GCC-4.9 (#2620), gmpolf/2016a & gmvolf/2016a (#2589)
+- stable Cray-specific easyconfigs
+    - delete deprecated Cray toolchains and easyconfig files (#2400)
+    - don't hardcode PrgEnv version, remove craype and fftw components in Cray toolchains (#2554)
+    - remove -XC versionsuffix for stable definitions for Cray* toolchains (#2714)
+    - support for various software packages with CrayGNU and CrayIntel toolchains: CP2K, GROMACS, WRF
+- added additional easyconfigs for various supported software packages: version updates, different toolchains, ...
+    including BWA 0.7.13, CMake 3.4.3, GATE 7.2, GROMACS 5.1.2, Mesa 11.1.2, netCDF 4.4.0, Perl 5.22.1, Python 3.5.1,
+              R 3.2.3, R-bundle-Bioconductor 3.2, scipy 0.17.0, SuiteSparse 4.5.1
+- various other enhancements, including:
+    - copy contrib dir in Velvet easyconfigs so scripts are also available (#2456)
+    - redefine matplotlib 1.5.1 easyconfig as a bundle, also include cycler extension (dep for matplotlib) (#2470)
+    - add bitstring extension to Python 2.7.11 easyconfigs (#2471)
+    - enable building of MetaVelvet in Velvet 1.2.10 easyconfigs (#2473)
+    - add custom sanity check for libjpeg-turbo (#2480)
+    - add Velvet easyconfigs that include BioPerl dependency, so VelvetOptimizer can use it (#2495, #2729, #2733)
+    - add source URL in RAxML 7.2.6 easyconfigs (#2536)
+    - update MPICH easyconfigs to use new MPICH easyblock (#2589)
+    - free libX11 & co from unneeded Python dependency/versionsuffix (#2549, #2563, #2605, #2664)
+    - add '--enable-utf --enable-unicode-properties' configure options in PCRE easyconfigs (#2561)
+        - required for latest R versions
+    - add HCsnip, metagenomeSeq in Bioconductor 3.1 bundles (#2553, #2578)
+    - add additional extensions in R 3.2.x easyconfigs that are required for extra Bioconductor extensions (#2547, #2556)
+    - update psmpi easyconfig files to use the new psmpi easyblock (#2619)
+    - add easyconfig for Python 2.7.11 on top of X11-enabled Tk (#2614, #2621)
+    - add virtualenv as extension in Python 2.7.11 easyconfigs (#2660)
+- various bug fixes, including:
+    - fix software name for GTK+ (was 'gtk+'), PyCairo (was 'pycairo') and Gdk-Pixbuf (was 'gdk-pixbuf') (#2468)
+    - don't hardcode CC/CXX in OpenMPI easyconfigs (#2472)
+    - remove Google Code source URL for mpi4py (#2474)
+    - rename ffmpeg to FFmpeg (#2425, #2481)
+    - use available easyblock for flex (#2486)
+    - fix determining list of easyconfigs in unit test suite, don't assume locations are correct (#2530)
+    - fix specifying DB dependency in DB_File easyconfigs (#2539)
+    - remove hard-coded -xSSE4.2 for numpy/scipy with Intel compilers (#2546)
+    - fix license headers: Hercules foundation is now FWO (#2550)
+    - add --with-zlib configure argument in libxml easyconfigs (#2555)
+    - don't hardcode optarch=True in xextproto/xtrans easyconfigs (#2601)
+    - change toolchain version to '' in easyconfigs that use dummy toolchain and include dependencies (#2612)
+    - GLib doesn't require libxml2 with Python bindings (#2632)
+    - add patch file to imkl 10.2.6.038 32-bit easyconfig to fix installer not being able to deal with '--' in build path (#2634)
+    - add missing 'pkgconfig' dependency for h5py (#2476, #2650)
+    - correct software name in FastQC easyconfigs (was 'fastqc'), use 'dummy' toolchain for all FastQC version (#2657, #2666)
+    - add missing libxml2 dependencies in GLib easyconfigs (#2658)
+    - fix Xerces-C++ download location (#2668)
+    - enable XML::Bare extension in all Perl easyconfigs (#2672)
+    - update dead link for SuiteSparse (#2679)
+    - remove custom exts_filter in easyconfigs used PythonPackage easyblock (#2683, #2685)
+    - add M4 as build dep for binutils & flex (#2681)
+    - add missing dependencies in Python 3.5.x easyconfigs: SQLite, Tk, GMP (#2704)
+    - fix (OS) deps, add checksums, remove parameter definition with default values in MVAPICH2 easyconfigs (#2707)
+- style cleanup in various easyconfigs (#2378, #2387, #2395, #2396, #2488-#2493, #2496-#2500, #2502-#2504, #2602)
+    - working towards automated style review of pull requests
+
 v2.6.0 (January 26th 2016)
 --------------------------
 
diff --git a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.7-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.7-intel-2015a-Python-2.7.9.eb
index 20c30c8e6291466a063743c95a346c88a54af5b8..6b5c1c6d525616ee6854448663e4077c8042721d 100644
--- a/easybuild/easyconfigs/a/ABySS/ABySS-1.3.7-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/a/ABySS/ABySS-1.3.7-intel-2015a-Python-2.7.9.eb
@@ -31,7 +31,7 @@ dependencies = [
     ('Boost', '1.58.0', versionsuffix),
 ]
 
-preconfigopts = 'CPPFLAGS=-I$EBROOTSPARSEHASH/include'
+preconfigopts = 'env CPPFLAGS=-I$EBROOTSPARSEHASH/include'
 
 sanity_check_paths = {
     'files': ["bin/ABYSS", "bin/ABYSS-P"],
diff --git a/easybuild/easyconfigs/a/ABySS/ABySS-1.9.0-foss-2016a.eb b/easybuild/easyconfigs/a/ABySS/ABySS-1.9.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..aa09a6e789d150412b669eeede3fcf142adbe66d
--- /dev/null
+++ b/easybuild/easyconfigs/a/ABySS/ABySS-1.9.0-foss-2016a.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Maxime Schmitt <maxime.schmitt@telecom-bretagne.eu>, Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'ABySS'
+version = '1.9.0'
+
+homepage = 'http://www.bcgsc.ca/platform/bioinfo/software/abyss'
+description = """Assembly By Short Sequences - a de novo, parallel, paired-end sequence assembler"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['https://github.com/bcgsc/abyss/releases/download/%(version)s/']
+
+dependencies = [
+    ('Boost', '1.60.0'),
+    ('sparsehash', '2.0.2'),
+    ('SQLite', '3.9.2'),
+]
+
+sanity_check_paths = {
+    'files': ["bin/ABYSS", "bin/ABYSS-P"],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/a/ADF/ADF-2016.101.eb b/easybuild/easyconfigs/a/ADF/ADF-2016.101.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5fe5e14c146083d6f013deb7017b3af4199b8707
--- /dev/null
+++ b/easybuild/easyconfigs/a/ADF/ADF-2016.101.eb
@@ -0,0 +1,31 @@
+easyblock = 'Tarball'
+
+name = 'ADF'
+version = '2016.101'
+
+homepage = 'http://www.scm.com/ADF/'
+description = """ADF is an accurate, parallelized, powerful computational chemistry program to understand and
+ predict chemical structure and reactivity with density functional theory (DFT)."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['adf%(version)s.pc64_linux.intelmpi.tgz']
+
+keepsymlinks = True
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['atomicdata', 'bin', 'examples'],
+}
+
+modextravars = {
+    'ADFHOME': '%(installdir)s',
+    'ADFBIN': '%(installdir)s/bin',
+    'ADFRESOURCES': '%(installdir)s/atomicdata',
+}
+
+modloadmsg = "These environment variables need to be defined before using ADF:\n"
+modloadmsg += "  * $SCMLICENSE: path to ADF license file\n"
+modloadmsg += "  * $SCM_TMPDIR: path to user scratch directory"
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/a/ALPS/ALPS-2.2.b4-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/a/ALPS/ALPS-2.2.b4-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..74ee42be3ad41f0b23d37952c1422e7f681e2808
--- /dev/null
+++ b/easybuild/easyconfigs/a/ALPS/ALPS-2.2.b4-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,39 @@
+easyblock = 'CMakeMake'
+
+name = 'ALPS'
+version = '2.2.b4'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.example.com'
+description = """ The ALPS project (Algorithms and Libraries for Physics Simulations) is an open source effort
+aiming at providing high-end simulation codes for strongly correlated quantum mechanical systems as well as C++
+libraries for simplifying the development of such code."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = ['%(namelower)s-%(version)s-src.tar.gz']
+source_urls = ['http://alps.comp-phys.org/static/software/releases']
+
+patches = ['ALPS-%(version)s-python-embedding.patch']
+
+builddependencies = [('CMake', '3.4.3')]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+    ('Python', '2.7.11'),
+    ('Boost', '1.58.0', versionsuffix),
+    ('HDF5', '1.8.16'),
+    ('matplotlib', '1.5.1', versionsuffix),
+]
+
+configopts = '-DFFTW_LIBRARIES=$FFTW_LIB_DIR -DFFTW_INCLUDE_DIR=$FFTW_INC_DIR'
+
+separate_build_dir = True
+
+sanity_check_paths = {
+    'files': ['bin/alpspython', 'lib/libalps.%s' % SHLIB_EXT],
+    'dirs': ['include/alps', 'lib/python']
+}
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/a/ALPS/ALPS-2.2.b4-python-embedding.patch b/easybuild/easyconfigs/a/ALPS/ALPS-2.2.b4-python-embedding.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5927e2e7847e78efa9fafdc6bf23efe27faf9a2b
--- /dev/null
+++ b/easybuild/easyconfigs/a/ALPS/ALPS-2.2.b4-python-embedding.patch
@@ -0,0 +1,14 @@
+# To embed python, it must return a list of needed libraries with `;` instead of whitespace
+# Ward Poelmans <ward.poelmans@ugent.be>
+diff -ur alps-2.2.b4-src.orig/alps/config/FindPython.cmake alps-2.2.b4-src/alps/config/FindPython.cmake
+--- alps-2.2.b4-src.orig/alps/config/FindPython.cmake	2015-09-20 21:21:42.000000000 +0200
++++ alps-2.2.b4-src/alps/config/FindPython.cmake	2016-04-20 11:28:18.828407677 +0200
+@@ -160,7 +160,7 @@
+       #
+       # libraries which must be linked in when embedding
+       #
+-      EXEC_PYTHON_SCRIPT ("from distutils.sysconfig import * ;print (str(get_config_var('LOCALMODLIBS')) + ' ' + str(get_config_var('LIBS'))).strip()"
++      EXEC_PYTHON_SCRIPT ("from distutils.sysconfig import * ;print (str(get_config_var('LOCALMODLIBS')) + ' ' + str(get_config_var('LIBS'))).strip().replace(' ', ';')"
+                   PYTHON_EXTRA_LIBS)
+       MESSAGE(STATUS "PYTHON_EXTRA_LIBS =${PYTHON_EXTRA_LIBS}" )
+       mark_as_advanced(PYTHON_EXTRA_LIBS)
diff --git a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ddbfe7c0922a88321be2052c0e0095df494923ac
--- /dev/null
+++ b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'ANTLR'
+version = "2.7.7"
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.antlr2.org/'
+description = """ANTLR, ANother Tool for Language Recognition, (formerly PCCTS)
+ is a language tool that provides a framework for constructing recognizers,
+ compilers, and translators from grammatical descriptions containing
+ Java, C#, C++, or Python actions."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.antlr2.org/download/']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['%(name)s-%(version)s_includes.patch']
+
+dependencies = [
+    ('Java', '1.8.0_74', '', True),
+    ('Python', '2.7.11'),
+]
+
+configopts = '--disable-examples --disable-csharp '
+
+sanity_check_paths = {
+    'files': ['bin/antlr', 'bin/antlr-config'],
+    'dirs': ['include'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/a/APR-util/APR-util-1.5.3-goolf-1.4.10.eb b/easybuild/easyconfigs/a/APR-util/APR-util-1.5.3-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1a3a23018b80cc6918a37497a96d992598a6a6bd
--- /dev/null
+++ b/easybuild/easyconfigs/a/APR-util/APR-util-1.5.3-goolf-1.4.10.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'APR-util'
+version = '1.5.3'
+
+homepage = 'http://apr.apache.org/'
+description = "Apache Portable Runtime (APR) util libraries."
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://archive.apache.org/dist/apr/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('APR', '1.5.0')]
+
+configopts = "--with-apr=$EBROOTAPR/bin/apr-1-config"
+
+sanity_check_paths = {
+    'files': ["bin/apu-1-config", "lib/libaprutil-1.so", "lib/libaprutil-1.a"],
+    'dirs': ["include/apr-1"],
+}
+
+parallel = 1
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/a/APR/APR-1.5.0-goolf-1.4.10.eb b/easybuild/easyconfigs/a/APR/APR-1.5.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bbe4a3f6c2ecebaa3cadb649796b52c5a8635d09
--- /dev/null
+++ b/easybuild/easyconfigs/a/APR/APR-1.5.0-goolf-1.4.10.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'APR'
+version = '1.5.0'
+
+homepage = 'http://apr.apache.org/'
+description = "Apache Portable Runtime (APR) libraries."
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://archive.apache.org/dist/apr/']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ["bin/apr-1-config", "lib/libapr-1.so", "lib/libapr-1.a"],
+    'dirs': ["include/apr-1"],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/a/ASE/ASE-3.10.0-intel-2016.02-GCC-4.9-Python-2.7.11.eb b/easybuild/easyconfigs/a/ASE/ASE-3.10.0-intel-2016.02-GCC-4.9-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a8183634de3fccf5e81ba18107e3bfb35e35490d
--- /dev/null
+++ b/easybuild/easyconfigs/a/ASE/ASE-3.10.0-intel-2016.02-GCC-4.9-Python-2.7.11.eb
@@ -0,0 +1,25 @@
+easyblock = 'PythonPackage'
+
+name = 'ASE'
+version = '3.10.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://wiki.fysik.dtu.dk/ase'
+description = """ASE is a python package providing an open source Atomic Simulation Environment
+ in the Python scripting language."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/ase-build', 'bin/ase-db', 'bin/ase-gui', 'bin/ase-info', 'bin/ase-run'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(namelower)s'],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/a/ATK/ATK-2.20.0-intel-2016a.eb b/easybuild/easyconfigs/a/ATK/ATK-2.20.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2c8911864b07d3faaad3700b8db2b80efc349c6f
--- /dev/null
+++ b/easybuild/easyconfigs/a/ATK/ATK-2.20.0-intel-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'ATK'
+version = '2.20.0'
+
+homepage = 'https://developer.gnome.org/ATK/stable/'
+description = """
+ ATK provides the set of accessibility interfaces that are implemented by other
+ toolkits and applications. Using the ATK interfaces, accessibility tools have
+ full access to view and control running applications.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.48.0'),
+    ('GObject-Introspection', '1.48.0')
+]
+
+configopts = "--enable-introspection=yes"
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['lib/libatk-1.0.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e627b672b4451bad6041a56059c51a52bba44605
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autoconf/Autoconf-2.69-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'Autoconf'
+version = '2.69'
+
+homepage = 'http://www.gnu.org/software/autoconf/'
+description = """Autoconf is an extensible package of M4 macros that produce shell scripts
+ to automatically configure software source code packages. These scripts can adapt the
+ packages to many kinds of UNIX-like systems without manual user intervention. Autoconf
+ creates a configuration script for a package from a template file that lists the
+ operating system features that the package can use, in the form of M4 macro calls."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('M4', '1.4.17')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["autoconf", "autoheader", "autom4te", "autoreconf", "autoscan",
+                                     "autoupdate", "ifnames"]],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Automake/Automake-1.15-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/a/Automake/Automake-1.15-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..84750fffa92820d228e1f43b4f9dfbc5cb4fc9c4
--- /dev/null
+++ b/easybuild/easyconfigs/a/Automake/Automake-1.15-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Automake'
+version = "1.15"
+
+homepage = 'http://www.gnu.org/software/automake/automake.html'
+description = "Automake: GNU Standards-compliant Makefile generator"
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('Autoconf', '2.69')]
+
+sanity_check_paths = {
+    'files': ['bin/automake', 'bin/aclocal'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..65fd1e93a3296a9428c993408ca51828287febc8
--- /dev/null
+++ b/easybuild/easyconfigs/a/Autotools/Autotools-20150215-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,17 @@
+easyblock = 'Bundle'
+
+name = 'Autotools'
+version = '20150215'  # date of the most recent change
+
+homepage = 'http://autotools.io'
+description = """This bundle collect the standard GNU build tools: Autoconf, Automake and libtool"""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+dependencies = [
+    ('Autoconf', '2.69'),  # 20120424
+    ('Automake', '1.15'),  # 20150105
+    ('libtool', '2.4.6'),  # 20150215
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb
index 13ae69456f14f9b397dee2e18014a038485d63fc..916fcd7e489fe5b0f1ca868922f66c92f0eca2c2 100644
--- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goalf-1.1.0-no-OFED.eb
@@ -25,7 +25,7 @@ dependencies = [
     ('gperf', '3.0.4'),
 ]
 
-preconfigopts = 'EMACS=no'
+preconfigopts = 'env EMACS=no'
 configopts = '--with-gnu-gettext'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb
index 5144a9afc901faa64dee9d0f7f8b97e9d19d113a..97e5c8330bb93f9f763c58fa72f552580a4ca366 100644
--- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-goolf-1.4.10.eb
@@ -25,7 +25,7 @@ dependencies = [
     ('gperf', '3.0.4'),
 ]
 
-preconfigopts = 'EMACS=no'
+preconfigopts = 'env EMACS=no'
 configopts = '--with-gnu-gettext'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb
index 3b963e0d7e42a1d6dd9636c168d29da03b83a077..74f9dffca6ad13347f80125b7c61acc369eb7231 100644
--- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-4.0.6.eb
@@ -25,7 +25,7 @@ dependencies = [
     ('gperf', '3.0.4'),
 ]
 
-preconfigopts = 'EMACS=no'
+preconfigopts = 'env EMACS=no'
 configopts = '--with-gnu-gettext'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb
index f6a35a3dc06198a1d27febe9d36da9ae1e35768d..efd5845e70b2ae97f41ef3d71024890ea99d77d6 100644
--- a/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/a/a2ps/a2ps-4.14-ictce-5.3.0.eb
@@ -26,7 +26,7 @@ dependencies = [
     ('gperf', '3.0.4'),
 ]
 
-preconfigopts = 'EMACS=no'
+preconfigopts = 'env EMACS=no'
 configopts = '--with-gnu-gettext'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/a/ant/ant-1.9.6-Java-1.7.0_79.eb b/easybuild/easyconfigs/a/ant/ant-1.9.6-Java-1.7.0_79.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3ee7c5b406ade6929d3a8426c37ec64041e5e8df
--- /dev/null
+++ b/easybuild/easyconfigs/a/ant/ant-1.9.6-Java-1.7.0_79.eb
@@ -0,0 +1,23 @@
+name = 'ant'
+version = '1.9.6'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'http://ant.apache.org/'
+description = """Apache Ant is a Java library and command-line tool whose mission is to drive processes described in build files
+ as targets and extension points dependent upon each other. The main known usage of Ant is the build of Java applications."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['apache-%(name)s-%(version)s-src.tar.gz']
+source_urls = ['http://archive.apache.org/dist/%(name)s/source/']
+
+dependencies = [('Java', '1.7.0_79')]
+
+builddependencies = [('JUnit', '4.11', versionsuffix)]
+
+sanity_check_paths = {
+    'files': ['bin/ant', 'lib/ant.jar', 'lib/ant.jar'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/a/astropy/astropy-1.0.6-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/a/astropy/astropy-1.0.6-goolf-1.4.10-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bab7a31bcf175a43f04661ffc218578bbef517fa
--- /dev/null
+++ b/easybuild/easyconfigs/a/astropy/astropy-1.0.6-goolf-1.4.10-Python-2.7.3.eb
@@ -0,0 +1,33 @@
+easyblock = "PythonPackage"
+
+name = 'astropy'
+version = '1.0.6'
+
+homepage = 'http://www.astropy.org/'
+description = """The Astropy Project is a community effort to develop 
+a single core package for Astronomy in Python and foster interoperability 
+between Python astronomy packages."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pyver = '2.7.3'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+    ('setuptools', '18.4', versionsuffix),
+    ('numpy', '1.7.1', versionsuffix),
+]
+
+pyshortver = '.'.join(pyver.split('.')[:2])
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages' % pyshortver],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/a/attr/attr-2.4.47-GCC-4.6.3.eb b/easybuild/easyconfigs/a/attr/attr-2.4.47-GCC-4.6.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8a4e822bba9cf2bd5cefb2de1690f001c3fe6b13
--- /dev/null
+++ b/easybuild/easyconfigs/a/attr/attr-2.4.47-GCC-4.6.3.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'attr'
+version = '2.4.47'
+
+homepage = 'http://savannah.nongnu.org/projects/attr'
+description = """Commands for Manipulating Filesystem Extended Attributes"""
+
+toolchain = {'name': 'GCC', 'version': '4.6.3'}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = ['attr-%(version)s.src.tar.gz']
+
+installopts = 'install-dev install-lib'
+
+sanity_check_paths = {
+    'files': ['bin/attr', 'bin/getfattr', 'bin/setfattr', 'include/attr/attributes.h', 'include/attr/error_context.h',
+              'include/attr/libattr.h', 'include/attr/xattr.h', 'lib/libattr.a', 'lib/libattr.%s' % SHLIB_EXT],
+    'dirs': ['share'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/BCFtools/BCFtools-1.3-foss-2016a.eb b/easybuild/easyconfigs/b/BCFtools/BCFtools-1.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6d469bdd3bfdf8170b2cbb1329fd00c1b6e73eda
--- /dev/null
+++ b/easybuild/easyconfigs/b/BCFtools/BCFtools-1.3-foss-2016a.eb
@@ -0,0 +1,41 @@
+easyblock = 'ConfigureMake'
+
+name = 'BCFtools'
+version = '1.3'
+
+homepage = 'http://www.htslib.org/'
+description = """Samtools is a suite of programs for interacting with high-throughput sequencing data.
+ BCFtools - Reading/writing BCF2/VCF/gVCF files and calling/filtering/summarising SNP and short indel sequence variants"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['https://github.com/samtools/%(namelower)s/releases/download/%(version)s']
+
+patches = ['%(name)s-%(version)s_extHTSlib_Makefile.patch']
+
+dependencies = [
+    ('HTSlib', '1.3'),
+    ('zlib', '1.2.8'),
+    ('GSL', '2.1'),
+]
+
+parallel = 1
+
+skipsteps = ['configure']
+
+buildopts = 'CC="$CC" CFLAGS="$CFLAGS" USE_GSL=1'
+installopts = ' prefix=%(installdir)s'
+
+postinstallcmds = [
+    'mkdir -p %(installdir)s/lib/plugins',
+    'cp -a plugins/*.so %(installdir)s/lib/plugins/.',
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['bcftools', 'plot-vcfstats', 'vcfutils.pl']],
+    'dirs': ['lib/plugins'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2015b.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..50f76cdae7065ab6b201133efa8e0b9d005bf7d3
--- /dev/null
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2015b.eb
@@ -0,0 +1,33 @@
+# Author: Maxime Schmitt, University of Luxembourg
+# Author: Adam Huffman, The Francis Crick Institute
+#
+# Based on the work of: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics (SIB)
+# Biozentrum - University of Basel
+
+easyblock = 'MakeCp'
+
+name = 'BEDTools'
+version = '2.25.0'
+
+homepage = "https://github.com/arq5x/bedtools2"
+description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps
+ and computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF,
+ and SAM/BAM."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+# https://github.com/arq5x/bedtools2/releases/download/v2.25.0/bedtools-2.25.0.tar.gz
+source_urls = ['https://github.com/arq5x/bedtools2/releases/download/v%(version)s/']
+sources = ['bedtools-%(version)s.tar.gz']
+
+buildopts = 'CXX="$CXX"'
+
+files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed', 'bedToBam', 'fastaFromBed']],
+    'dirs': files_to_copy,
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2016a.eb b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..89147e0b2075048bb79ed7c0827f6229e61417df
--- /dev/null
+++ b/easybuild/easyconfigs/b/BEDTools/BEDTools-2.25.0-foss-2016a.eb
@@ -0,0 +1,33 @@
+# Author: Maxime Schmitt, University of Luxembourg
+# Author: Adam Huffman, The Francis Crick Institute
+#
+# Based on the work of: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics (SIB)
+# Biozentrum - University of Basel
+
+easyblock = 'MakeCp'
+
+name = 'BEDTools'
+version = '2.25.0'
+
+homepage = "https://github.com/arq5x/bedtools2"
+description = """The BEDTools utilities allow one to address common genomics tasks such as finding feature overlaps
+ and computing coverage. The utilities are largely based on four widely-used file formats: BED, GFF/GTF, VCF,
+ and SAM/BAM."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+# https://github.com/arq5x/bedtools2/releases/download/v2.25.0/bedtools-2.25.0.tar.gz
+source_urls = ['https://github.com/arq5x/bedtools2/releases/download/v%(version)s/']
+sources = ['bedtools-%(version)s.tar.gz']
+
+buildopts = 'CXX="$CXX"'
+
+files_to_copy = ["bin", "docs", "data", "genomes", "scripts", "test"]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['bedtools', 'pairToBed', 'mergeBed', 'bedToBam', 'fastaFromBed']],
+    'dirs': files_to_copy,
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BWA/BWA-0.7.13-foss-2016a.eb b/easybuild/easyconfigs/b/BWA/BWA-0.7.13-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..419aba7bab7fe6cfef40db2c9093e3efc6243b61
--- /dev/null
+++ b/easybuild/easyconfigs/b/BWA/BWA-0.7.13-foss-2016a.eb
@@ -0,0 +1,32 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Cyprus Institute / CaSToRC, Uni.Lu/LCSB, NTUA
+# Authors::   George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+# 
+# Version >= 0.7.13
+# Author: Adam Huffman
+# The Francis Crick Institute 
+# 
+# Note that upstream development is mainly at: https://github.com/lh3/bwa 
+##
+
+name = 'BWA'
+version = '0.7.13'
+
+homepage = 'http://bio-bwa.sourceforge.net/'
+description = """Burrows-Wheeler Aligner (BWA) is an efficient program that aligns
+ relatively short nucleotide sequences against a long reference sequence such as the human genome."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['https://github.com/lh3/%(name)s/archive/']
+sources = ['v%(version)s.tar.gz']
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BWA/BWA-0.7.13-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BWA/BWA-0.7.13-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9cbb01f19159fdaa5eb5f8bfa09132d8eab17325
--- /dev/null
+++ b/easybuild/easyconfigs/b/BWA/BWA-0.7.13-goolf-1.4.10.eb
@@ -0,0 +1,28 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Cyprus Institute / CaSToRC, Uni.Lu/LCSB, NTUA
+# Authors::   George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis@cern.ch>, Daniel Navarro <daniel_navarro@meei.harvard.edu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'BWA'
+version = '0.7.13'
+
+homepage = 'http://bio-bwa.sourceforge.net/'
+description = """Burrows-Wheeler Aligner (BWA) is an efficient program that aligns
+ relatively short nucleotide sequences against a long reference sequence such as the human genome."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [('http://sourceforge.net/projects/bio-bwa/files/', 'download')]
+
+dependencies = [('zlib', '1.2.8')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BWA/BWA-0.7.13-intel-2016a.eb b/easybuild/easyconfigs/b/BWA/BWA-0.7.13-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f4774cbbbe1440cbc59188a6b06783e2e7ae4e0c
--- /dev/null
+++ b/easybuild/easyconfigs/b/BWA/BWA-0.7.13-intel-2016a.eb
@@ -0,0 +1,32 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Cyprus Institute / CaSToRC, Uni.Lu/LCSB, NTUA
+# Authors::   George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+# 
+# Version >= 0.7.13
+# Author: Adam Huffman
+# The Francis Crick Institute 
+# 
+# Note that upstream development is mainly at: https://github.com/lh3/bwa 
+##
+
+name = 'BWA'
+version = '0.7.13'
+
+homepage = 'http://bio-bwa.sourceforge.net/'
+description = """Burrows-Wheeler Aligner (BWA) is an efficient program that aligns
+ relatively short nucleotide sequences against a long reference sequence such as the human genome."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['https://github.com/lh3/%(name)s/archive/']
+sources = ['v%(version)s.tar.gz']
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BayeScEnv/BayeScEnv-1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/b/BayeScEnv/BayeScEnv-1.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7a976185d2b1cde165fca93e9e87cbe80335db4e
--- /dev/null
+++ b/easybuild/easyconfigs/b/BayeScEnv/BayeScEnv-1.1-goolf-1.4.10.eb
@@ -0,0 +1,31 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+
+easyblock = 'MakeCp'
+
+name = 'BayeScEnv'
+version = '1.1'
+
+homepage = 'https://github.com/devillemereuil/bayescenv'
+description = """BayeScEnv is a Fst-based, genome-scan method that uses environmental variables to detect local adaptation."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'openmp': True}
+
+source_urls = ['https://github.com/devillemereuil/bayescenv/archive/']
+sources = ['v%(version)s.tar.gz']
+
+start_dir = 'source'
+
+files_to_copy = [(['source/bayescenv'], 'bin'), 'test', 'COPYING', 'README.md', 'ChangeLog']
+
+parallel = 1
+                
+sanity_check_paths = {
+    'files': ['bin/bayescenv'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BayesAss/BayesAss-3.0.4-foss-2016a.eb b/easybuild/easyconfigs/b/BayesAss/BayesAss-3.0.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0dc4a540af75aeeb1671168000928c0badaa7da6
--- /dev/null
+++ b/easybuild/easyconfigs/b/BayesAss/BayesAss-3.0.4-foss-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'BayesAss'
+version = '3.0.4'
+
+homepage = 'http://www.rannala.org/?page_id=245'
+description = """ 
+BayesAss: Bayesian Inference of Recent Migration Using Multilocus Genotypes 
+"""
+
+toolchain = {'name': 'foss','version': '2016a'}
+sources = ['BA3-%(version)s.tar.gz']
+
+source_urls = ['http://downloads.sourceforge.net/project/bayesass/BA3/%(version)s/src/']
+
+dependencies = [
+    ('GSL','2.1')
+]
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['bin/BA3'],
+    'dirs' : ['bin', 'include']
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Beast/Beast-2.4.0-foss-2016a.eb b/easybuild/easyconfigs/b/Beast/Beast-2.4.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..484da63909cf76bf4f8ad53154161fe0b0f837e8
--- /dev/null
+++ b/easybuild/easyconfigs/b/Beast/Beast-2.4.0-foss-2016a.eb
@@ -0,0 +1,36 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = "Tarball"
+
+name = 'Beast'
+version = '2.4.0'
+
+homepage = 'http://beast2.org/'
+description = """ BEAST is a cross-platform program for Bayesian MCMC analysis of molecular 
+ sequences. It is entirely orientated towards rooted, time-measured phylogenies inferred using 
+ strict or relaxed molecular clock models. It can be used as a method of reconstructing phylogenies 
+ but is also a framework for testing evolutionary hypotheses without conditioning on a single 
+ tree topology. BEAST uses MCMC to average over tree space, so that each tree is weighted 
+ proportional to its posterior probability. """
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/CompEvol/beast2/releases/download/v%(version)s/']
+sources = ['BEAST.v%(version)s.Linux.tgz']
+
+dependencies = [
+    # this is not mandatory but beagle-lib is recommended by developers
+    # beagle-lib will also load the required java dependency
+    # if you remove this you should add the java dependency
+    ('beagle-lib', '2.1.2'),
+]
+
+sanity_check_paths = {
+    'files': ["bin/beast"],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-1.0.6-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-1.0.6-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5afb842c806f0011366ad25d2fd7544e65143a85
--- /dev/null
+++ b/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-1.0.6-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,37 @@
+easyblock = 'ConfigureMake'
+
+name = 'BerkeleyGW'
+version = "1.0.6"
+
+homepage = 'http://www.berkeleygw.org'
+description = """The BerkeleyGW Package is a set of computer codes that calculates the quasiparticle
+ properties and the optical responses of a large variety of materials from bulk periodic crystals to
+ nanostructures such as slabs, wires and molecules."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://www.berkeleygw.org/releases/']
+sources = ['BGW-%(version)s.tar.gz']
+checksums = ['8740562da41e87a62eb8d457675e4bfd']
+
+skipsteps = ['configure']
+
+prebuildopts = 'cp config/generic.mpi.linux.mk arch.mk && '
+
+buildopts = 'all-flavors COMPFLAG=-DINTEL PARAFLAG="-DMPI -DOMP" DEBUGFLAG="" F90free="$MPIF90 -free" LINK="$MPIF90" '
+buildopts += 'FOPTS="$FFLAGS -qopenmp" MOD_OPT="-module " C_PARAFLAG="$PARAFLAG" CC_COMP="$MPICXX" C_COMP="$MPICC" '
+buildopts += 'C_LINK="$MPICXX" C_OPTS="$CFLAGS -qopenmp" MKLPATH="$MKLROOT" LAPACKLIB="$LIBLAPACK" '
+buildopts += 'BLACSDIR="$BLACS_LIB_DIR" BLACS="$LIBBLACS" SCALAPACKLIB="$LIBSCALAPACK" '
+buildopts += 'FFTWINCLUDE="$FFTW_INC_DIR" FFTWLIB="$MKLROOT/lib/intel64/libfftw2xf_double_intel.a" '
+
+installopts = 'INSTDIR=%(installdir)s'
+
+sanity_check_paths = {
+    'files': ['bin/'+prog+'.'+flavor+'.x'
+              for prog in ['epsilon', 'sigma', 'kernel', 'absorption']
+              for flavor in ['real', 'cplx']],
+    'dirs': []
+}
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-1.1-beta2-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-1.1-beta2-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9d064dae20430ed745791509ebf355d9d5b0b99c
--- /dev/null
+++ b/easybuild/easyconfigs/b/BerkeleyGW/BerkeleyGW-1.1-beta2-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,37 @@
+easyblock = 'ConfigureMake'
+
+name = 'BerkeleyGW'
+version = "1.1-beta2"
+
+homepage = 'http://www.berkeleygw.org'
+description = """The BerkeleyGW Package is a set of computer codes that calculates the quasiparticle
+ properties and the optical responses of a large variety of materials from bulk periodic crystals to
+ nanostructures such as slabs, wires and molecules."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://www.berkeleygw.org/releases/']
+sources = ['BGW-%(version)s.tar.gz']
+checksums = ['75a258c9a5d255da9e0b15bd3e7f08b2']
+
+skipsteps = ['configure']
+
+prebuildopts = 'cp config/generic.mpi.linux.mk arch.mk && '
+
+buildopts = 'all-flavors COMPFLAG=-DINTEL PARAFLAG="-DMPI -DOMP" DEBUGFLAG="" F90free="$MPIF90 -free" LINK="$MPIF90" '
+buildopts += 'FOPTS="$FFLAGS -qopenmp" MOD_OPT="-module " C_PARAFLAG="$PARAFLAG" CC_COMP="$MPICXX" C_COMP="$MPICC" '
+buildopts += 'C_LINK="$MPICXX" C_OPTS="$CFLAGS -qopenmp" MKLPATH="$MKLROOT" LAPACKLIB="$LIBLAPACK" '
+buildopts += 'BLACSDIR="$BLACS_LIB_DIR" BLACS="$LIBBLACS" SCALAPACKLIB="$LIBSCALAPACK" '
+buildopts += 'FFTWINCLUDE="$FFTW_INC_DIR" FFTWLIB="$MKLROOT/lib/intel64/libfftw2xf_double_intel.a" '
+
+installopts = 'INSTDIR=%(installdir)s'
+
+sanity_check_paths = {
+    'files': ['bin/'+prog+'.'+flavor+'.x'
+              for prog in ['epsilon', 'sigma', 'kernel', 'absorption']
+              for flavor in ['real', 'cplx']],
+    'dirs': []
+}
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/b/BioPerl/BioPerl-1.6.924-foss-2016a-Perl-5.22.1.eb b/easybuild/easyconfigs/b/BioPerl/BioPerl-1.6.924-foss-2016a-Perl-5.22.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d62e2cbb8823c0787bf2bc24c9cf66135246bc84
--- /dev/null
+++ b/easybuild/easyconfigs/b/BioPerl/BioPerl-1.6.924-foss-2016a-Perl-5.22.1.eb
@@ -0,0 +1,40 @@
+easyblock = 'Bundle'
+
+name = 'BioPerl'
+version = '1.6.924'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://www.bioperl.org/'
+description = """Bioperl is the product of a community effort to produce Perl code which is useful in biology.
+ Examples include Sequence objects, Alignment objects and database searching objects."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+# this is a bundle of Perl modules
+exts_defaultclass = 'PerlModule'
+exts_filter = ("perldoc -lm %(ext_name)s ", "")
+
+dependencies = [
+    ('Perl', '5.22.1'),
+    ('DB_File', '1.835', versionsuffix),
+]
+
+exts_list = [
+    # CGI has been removed from the Perl core since version 5.22
+    ('CGI', '4.28', {
+        'source_tmpl': 'CGI-4.28.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEEJO/'],
+    }),
+    (name, version, {
+        'modulename': 'Bio::Perl',
+       	'source_tmpl': 'release-%s.tar.gz' % version.replace('.', '-'),
+       	'source_urls': ['https://github.com/bioperl/bioperl-live/archive/'],
+    }),
+]
+
+modextrapaths = {
+    'PERL5LIB': 'lib/perl5/site_perl/%(perlver)s/'
+}
+
+moduleclass = 'bio'
+
diff --git a/easybuild/easyconfigs/b/Biopython/Biopython-1.65-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/b/Biopython/Biopython-1.65-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a42f248efeb46bf4dd8e0f662f640fcf7dc6273d
--- /dev/null
+++ b/easybuild/easyconfigs/b/Biopython/Biopython-1.65-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,37 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 The Cyprus Institute
+# Authors::   Andreas Panteli <a.panteli@cyi.ac.cy>, Thekla Loizou <t.loizou@cyi.ac.cy>, George Tsouloupas <g.tsouloupas@cyi.ac.cy>
+# License::   MIT/GPL
+#
+##
+easyblock = "PythonPackage"
+
+name = 'Biopython'
+version = '1.65'
+versionsuffix = "-Python-%(pyver)s"
+
+homepage = 'http://www.biopython.org'
+description = """Biopython is a set of freely available tools for biological computation written
+in Python by an international team of developers. It is a distributed collaborative effort to
+develop Python libraries and applications which address the needs of current and future work in
+bioinformatics. """
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://biopython.org/DIST']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+dependencies = [
+    ('Python', '2.7.11')
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/Bio', 'lib/python%(pyshortver)s/site-packages/BioSQL']
+}
+
+options = {'modulename': 'Bio'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.2-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.2-CrayGNU-2015.06.eb
similarity index 90%
rename from easybuild/easyconfigs/b/Bison/Bison-3.0.2-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/b/Bison/Bison-3.0.2-CrayGNU-2015.06.eb
index 77bb4a043c6890614f7d515fffc37c0f3e507e9d..1e373e5c59b17a5df1a6cf3e8a608fb4e057c136 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-3.0.2-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.2-CrayGNU-2015.06.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/bison'
 description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
  into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.2-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.2-CrayGNU-2015.11.eb
similarity index 90%
rename from easybuild/easyconfigs/b/Bison/Bison-3.0.2-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/b/Bison/Bison-3.0.2-CrayGNU-2015.11.eb
index cfb18be138f7c0e6fec969bd32021b12d6ac2311..fbde1c1bed1c5e6027cb8574ca149df57e9e1f74 100644
--- a/easybuild/easyconfigs/b/Bison/Bison-3.0.2-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.2-CrayGNU-2015.11.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.gnu.org/software/bison'
 description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
  into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..570b1b1c8b45862447f62194a567f52fbbd8c8aa
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCC-4.9.3-2.25.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'Bison'
+version = '3.0.4'
+
+homepage = 'http://www.gnu.org/software/bison'
+description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
+ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [('M4', '1.4.17')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-4.9.2.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-4.9.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..159751eac59fc77d31b944be15bb14f24266359c
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-4.9.2.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'Bison'
+version = '3.0.4'
+
+homepage = 'http://www.gnu.org/software/bison'
+description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
+ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.2'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+    ('M4', '1.4.17'),
+    # use same binutils version that was used when building GCCcore toolchain
+    ('binutils', '2.25', '', True),
+]
+
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-5.3.0.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b7cebec0495d7b7c81ee8147da87d345f1bfa6b1
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-GCCcore-5.3.0.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'Bison'
+version = '3.0.4'
+
+homepage = 'http://www.gnu.org/software/bison'
+description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
+ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
+
+toolchain = {'name': 'GCCcore', 'version': '5.3.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+    ('M4', '1.4.17'),
+    # use same binutils version that was used when building GCCcore toolchain
+    ('binutils', '2.26', '', True),
+]
+
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Bison/Bison-3.0.4-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..64d95d529f92c97987703edd0948463cac584918
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bison/Bison-3.0.4-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'Bison'
+version = '3.0.4'
+
+homepage = 'http://www.gnu.org/software/bison'
+description = """Bison is a general-purpose parser generator that converts an annotated context-free grammar
+ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [('M4', '1.4.17')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["bison", "yacc"]] + ["lib/liby.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/b/Blitz++/Blitz++-0.10-foss-2016a.eb b/easybuild/easyconfigs/b/Blitz++/Blitz++-0.10-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f5aaed761cd6084d890f13e684db42b3bacb0d07
--- /dev/null
+++ b/easybuild/easyconfigs/b/Blitz++/Blitz++-0.10-foss-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'Blitz++'
+version = '0.10'
+
+homepage = 'http://blitz.sourceforge.net/'
+description = """Blitz++ is a (LGPLv3+) licensed meta-template library for array manipulation in C++
+ with a speed comparable to Fortran implementations, while preserving an object-oriented interface"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = ['blitz-%(version)s.tar.gz']
+source_urls = [('https://sourceforge.net/projects/blitz/files/blitz/%(name)s %(version)s', 'download')]
+
+sanity_check_paths = {
+    'files': ['lib/libblitz.a'],
+    'dirs': ['include/blitz/array', 'include/blitz/gnu', 'include/blitz/meta', 'include/random', 'lib/pkgconfig'],
+}
+
+configopts = '--enable-shared'
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/b/Blitz++/Blitz++-0.10-goolf-1.5.16.eb b/easybuild/easyconfigs/b/Blitz++/Blitz++-0.10-goolf-1.5.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e75ab2de98e8d1c7e8463035955b5cd7456f93e8
--- /dev/null
+++ b/easybuild/easyconfigs/b/Blitz++/Blitz++-0.10-goolf-1.5.16.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'Blitz++'
+version = '0.10'
+
+homepage = 'http://blitz.sourceforge.net/'
+description = """Blitz++ is a (LGPLv3+) licensed meta-template library for array manipulation in C++
+ with a speed comparable to Fortran implementations, while preserving an object-oriented interface"""
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+
+sources = ['blitz-%(version)s.tar.gz']
+source_urls = [('https://sourceforge.net/projects/blitz/files/blitz/%(name)s %(version)s', 'download')]
+
+sanity_check_paths = {
+    'files': ['lib/libblitz.a'],
+    'dirs': ['include/blitz/array', 'include/blitz/gnu', 'include/blitz/meta', 'include/random', 'lib/pkgconfig'],
+}
+
+configopts = '--enable-shared'
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.97-foss-2016a.eb b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.97-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f63a76fa69259c7e8077d4eebb005e0a4c496fa1
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bonnie++/Bonnie++-1.97-foss-2016a.eb
@@ -0,0 +1,28 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Bonnie++'
+version = '1.97'
+
+homepage = 'http://www.coker.com.au/bonnie++/'
+description = """Bonnie++-1.97: Enhanced performance Test of Filesystem I/O"""
+
+sources = [SOURCELOWER_TGZ]
+source_urls = ['http://www.coker.com.au/bonnie++/experimental']
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sanity_check_paths = {
+    'files': ['sbin/bonnie++'],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.58.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/b/Boost/Boost-1.58.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f392ae7ad43de789e65a530d800f515652b94256
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.58.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,23 @@
+name = 'Boost'
+version = '1.58.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.11'),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.59.0-intel-2015b.eb b/easybuild/easyconfigs/b/Boost/Boost-1.59.0-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..61f63ebb4eaa04a08df4f9c246bd223dc36680b7
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.59.0-intel-2015b.eb
@@ -0,0 +1,22 @@
+name = 'Boost'
+version = '1.59.0'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+configopts = '--without-libraries=python'
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Boost/Boost-1.60.0-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/b/Boost/Boost-1.60.0-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a913c208499b17dd4228b65c51fbd87c3741924c
--- /dev/null
+++ b/easybuild/easyconfigs/b/Boost/Boost-1.60.0-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,23 @@
+name = 'Boost'
+version = '1.60.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.11'),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-foss-2016a.eb b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7979ba4e23291604f891e983d5c280eec51368b0
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bowtie/Bowtie-1.1.2-foss-2016a.eb
@@ -0,0 +1,18 @@
+# Modified from existing version by:
+# Robert Schmidt <rjeschmi@gmail.com>
+# Ottawa Hospital Research Institute - Bioinformatics Team
+name = 'Bowtie'
+version = '1.1.2'
+
+homepage = 'http://bowtie-bio.sourceforge.net/index.shtml'
+description = """Bowtie is an ultrafast, memory-efficient short read aligner.
+It aligns short DNA sequences (reads) to the human genome.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = ['%(namelower)s-%(version)s-src.zip']
+source_urls = ['http://download.sourceforge.net/bowtie-bio/']
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.8-foss-2015b.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.8-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..29bf068b6a79690b5e927f38a324b10edd666115
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.8-foss-2015b.eb
@@ -0,0 +1,40 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+# Modified by: Robert Schmidt <rjeschmi@gmail.com>
+# Ottawa Hospital Research Institute - Bioinformatics Team
+# Modified by: Adam Huffman <adam.huffman@crick.ac.uk>
+# The Francis Crick Institute
+
+easyblock = 'MakeCp'
+
+name = 'Bowtie2'
+version = '2.2.8'
+
+homepage = 'http://bowtie-bio.sourceforge.net/bowtie2/index.shtml'
+description = """ Bowtie 2 is an ultrafast and memory-efficient tool for aligning sequencing reads 
+ to long reference sequences. It is particularly good at aligning reads of about 50 up to 100s or 1,000s 
+ of characters, and particularly good at aligning to relatively long (e.g. mammalian) genomes. 
+ Bowtie 2 indexes the genome with an FM Index to keep its memory footprint small: for the human genome, 
+ its memory footprint is typically around 3.2 GB. Bowtie 2 supports gapped, local, and paired-end alignment modes."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = ['%(namelower)s-%(version)s-source.zip']
+source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
+
+files_to_copy = [
+    (["bowtie2", "bowtie2-align-l", "bowtie2-align-s", "bowtie2-build", "bowtie2-build-l", "bowtie2-build-s",
+      "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
+    "doc", "example", "scripts", "MANUAL", "MANUAL.markdown", "NEWS"]
+
+sanity_check_paths = {
+    'files': ["bin/bowtie2-align-l", "bin/bowtie2-build", "bin/bowtie2-inspect"],
+    'dirs': [],
+}
+
+# to add script folder to path just uncomment this line
+#modextrapaths = {'PATH': 'scripts'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.8-foss-2016a.eb b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.8-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e48888855ecec82e7a43ed845c0965f2e2390ab1
--- /dev/null
+++ b/easybuild/easyconfigs/b/Bowtie2/Bowtie2-2.2.8-foss-2016a.eb
@@ -0,0 +1,40 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+# Modified by: Robert Schmidt <rjeschmi@gmail.com>
+# Ottawa Hospital Research Institute - Bioinformatics Team
+# Modified by: Adam Huffman <adam.huffman@crick.ac.uk>
+# The Francis Crick Institute
+
+easyblock = 'MakeCp'
+
+name = 'Bowtie2'
+version = '2.2.8'
+
+homepage = 'http://bowtie-bio.sourceforge.net/bowtie2/index.shtml'
+description = """ Bowtie 2 is an ultrafast and memory-efficient tool for aligning sequencing reads 
+ to long reference sequences. It is particularly good at aligning reads of about 50 up to 100s or 1,000s 
+ of characters, and particularly good at aligning to relatively long (e.g. mammalian) genomes. 
+ Bowtie 2 indexes the genome with an FM Index to keep its memory footprint small: for the human genome, 
+ its memory footprint is typically around 3.2 GB. Bowtie 2 supports gapped, local, and paired-end alignment modes."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = ['%(namelower)s-%(version)s-source.zip']
+source_urls = [('http://sourceforge.net/projects/bowtie-bio/files/%(namelower)s/%(version)s', 'download')]
+
+files_to_copy = [
+    (["bowtie2", "bowtie2-align-l", "bowtie2-align-s", "bowtie2-build", "bowtie2-build-l", "bowtie2-build-s",
+      "bowtie2-inspect", "bowtie2-inspect-l", "bowtie2-inspect-s"], 'bin'),
+    "doc", "example", "scripts", "MANUAL", "MANUAL.markdown", "NEWS"]
+
+sanity_check_paths = {
+    'files': ["bin/bowtie2-align-l", "bin/bowtie2-build", "bin/bowtie2-inspect"],
+    'dirs': [],
+}
+
+# to add script folder to path just uncomment this line
+#modextrapaths = {'PATH': 'scripts'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/bam-readcount/bam-readcount-0.7.4-cmake_install_prefix.patch b/easybuild/easyconfigs/b/bam-readcount/bam-readcount-0.7.4-cmake_install_prefix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..aecba22db8fb2b7b37824de6b34efbf436c84194
--- /dev/null
+++ b/easybuild/easyconfigs/b/bam-readcount/bam-readcount-0.7.4-cmake_install_prefix.patch
@@ -0,0 +1,16 @@
+# patch to remove hard-coded installation prefix
+# Adam Huffman
+# The Francis Crick Institute
+
+diff -u bam-readcount-0.7.4/CMakeLists.txt bam-readcount-0.7.4.new/CMakeLists.txt
+--- bam-readcount-0.7.4/CMakeLists.txt	2014-12-07 19:45:03.000000000 +0000
++++ bam-readcount-0.7.4.new/CMakeLists.txt	2016-04-06 22:06:12.336807391 +0100
+@@ -2,7 +2,7 @@
+ 
+ project(bam-readcount)
+ 
+-set(CMAKE_INSTALL_PREFIX "/usr")
++#set(CMAKE_INSTALL_PREFIX "/usr")
+ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake;${CMAKE_SOURCE_DIR}/build-common/cmake")
+ include(TestHelper)
+ include(VersionHelper)
diff --git a/easybuild/easyconfigs/b/bam-readcount/bam-readcount-0.7.4-foss-2015b.eb b/easybuild/easyconfigs/b/bam-readcount/bam-readcount-0.7.4-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9f5b2f295cd32806339f9446da158198d4dbf08a
--- /dev/null
+++ b/easybuild/easyconfigs/b/bam-readcount/bam-readcount-0.7.4-foss-2015b.eb
@@ -0,0 +1,37 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Adam Huffman
+# The Francis Crick Institute
+easyblock = 'CMakeMake'
+
+name = 'bam-readcount'
+version = '0.7.4'
+
+homepage = 'https://github.com/genome/bam-readcount'
+description = """Count DNA sequence reads in BAM files"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/genome/%(name)s/archive']
+
+patches = ['%(name)s-%(version)s-cmake_install_prefix.patch']
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+]
+
+dependencies = [
+    ('SAMtools', '1.3'),
+    ('zlib', '1.2.8'),
+]
+
+prebuildopts = "export SAMTOOLS_ROOT=${EBROOTSAMTOOLS}/include/bam && make deps &&"
+
+separate_build_dir = True
+
+sanity_check_paths = {
+    'files': ["bin/bam-readcount"],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/b/beagle-lib/beagle-lib-2.1.2-foss-2016a.eb b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-2.1.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..29785ed5e61f15120787c76c6b0da2b7d58fc09e
--- /dev/null
+++ b/easybuild/easyconfigs/b/beagle-lib/beagle-lib-2.1.2-foss-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'beagle-lib'
+version = '2.1.2'
+homepage=  'https://github.com/beagle-dev/beagle-lib'
+description = """
+beagle-lib is a high-performance library that can perform the core
+calculations at the heart of most Bayesian and Maximum Likelihood
+phylogenetics packages.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+# https://github.com/beagle-dev/beagle-lib/archive/beagle_release_2_1_2.tar.gz
+source_urls = ['https://github.com/beagle-dev/beagle-lib/archive/']
+sources = ['beagle_release_%s.tar.gz' % version.replace('.', '_')]
+
+dependencies = [('Java', '1.8.0_74', '', True)]
+
+builddependencies = [('Autotools', '20150215')]
+
+# parallel build does not work (to test)
+parallel = 1
+
+preconfigopts = "./autogen.sh && "
+
+sanity_check_paths = {
+    'files': ["include/libhmsbeagle-1/libhmsbeagle/%s" % includefile
+              for includefile in ["beagle.h", "platform.h"]] +
+             ["lib/libhmsbeagle%s.so" % libfile
+              for libfile in ["-cpu", "-cpu-sse", "-jni", ""]],
+    'dirs': []
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb
index bfc339020fbd2b5f416984daa12cbb53c402e10f..af12b0472e56e4b6b22fc9073144dc3d7a14d4c2 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goalf-1.1.0-no-OFED.eb
@@ -9,9 +9,6 @@
 # This work implements a part of the HPCBIOS project and is a component of the policy:
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_07-02.html
 ##
-
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.22'
 
@@ -24,15 +21,4 @@ toolchainopts = {'pic': True}
 sources = ['binutils-%s.tar.bz2' % version]
 source_urls = [GNU_SOURCE]
 
-# make sure that system libraries are also considered by ld
-configopts = '--with-sysroot=/'
-
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb
index 437f04c2a6fc8e9622950e760f51e26a99b1a307..8035182b62245ac3c4b8a514b4f17b0492dd2949 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-gompi-1.4.12-no-OFED.eb
@@ -9,9 +9,6 @@
 # This work implements a part of the HPCBIOS project and is a component of the policy:
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_07-02.html
 ##
-
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.22'
 
@@ -24,15 +21,4 @@ toolchainopts = {'pic': True}
 sources = ['binutils-%s.tar.bz2' % version]
 source_urls = [GNU_SOURCE]
 
-# make sure that system libraries are also considered by ld
-configopts = '--with-sysroot=/'
-
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb
index 5f76d89a06764d873b39e83f81320f12e7e8f66c..de87300f7c45a4deeb13fbc0d2a2279c625d41a3 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.4.10.eb
@@ -9,9 +9,6 @@
 # This work implements a part of the HPCBIOS project and is a component of the policy:
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_07-02.html
 ##
-
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.22'
 
@@ -23,15 +20,4 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 sources = ['binutils-%s.tar.bz2' % version]
 source_urls = [GNU_SOURCE]
 
-# make sure that system libraries are also considered by ld
-configopts = '--with-sysroot=/'
-
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.5.14.eb b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.5.14.eb
index 5dae8ebe27dc03e4c75dc3c7bdc380e8e2823f76..d989a00acf10d062f6ab7be1a7064278b136888e 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.22-goolf-1.5.14.eb
@@ -9,9 +9,6 @@
 # This work implements a part of the HPCBIOS project and is a component of the policy:
 # http://hpcbios.readthedocs.org/en/latest/HPCBIOS_07-02.html
 ##
-
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.22'
 
@@ -24,12 +21,4 @@ toolchainopts = {'pic': True}
 sources = ['binutils-%(version)s.tar.bz2']
 source_urls = [GNU_SOURCE]
 
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a', 'lib64/libiberty.a'] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.24-foss-2014b.eb b/easybuild/easyconfigs/b/binutils/binutils-2.24-foss-2014b.eb
index 3d49fdcf03a6d201b6de0aaad2b6fb363160402d..9683cfc7289740b52aed8a666eeb95bba67b635e 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.24-foss-2014b.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.24-foss-2014b.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.24'
 
@@ -15,15 +13,4 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-# make sure that system libraries are also considered by ld
-configopts = '--with-sysroot=/'
-
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a'] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.24-intel-2014b.eb b/easybuild/easyconfigs/b/binutils/binutils-2.24-intel-2014b.eb
index 77fb03962bf0ff81f50096e33d3cc63e99def20f..7598e76c0730b11c331fb482479d25903de038e8 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.24-intel-2014b.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.24-intel-2014b.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.24'
 
@@ -15,18 +13,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-# make sure that system libraries are also considered by ld
-configopts = '--with-sysroot=/'
-
 # disable warning/error #175 ("subscript out of range")
 buildopts = 'CFLAGS="$CFLAGS -wd175"'
 
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a'] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2-binutils-2.25.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2-binutils-2.25.eb
index 608c44a15521cde30eec5ba9c49943893f9c0e17..08e10d150ca088971d37c0e9f9d9b8b0e88d11db 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2-binutils-2.25.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2-binutils-2.25.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.25'
 
@@ -14,28 +12,10 @@ source_urls = [GNU_SOURCE]
 builddependencies = [
     ('flex', '2.5.39'),
     ('Bison', '3.0.4'),
-    # zlib required, but being linked instatically, so not a runtime dep
+    # zlib required, but being linked in statically, so not a runtime dep
     ('zlib', '1.2.8'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
-# statically link with zlib, to avoid runtime dependency on zlib
-preconfigopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
-prebuildopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
-
-# make sure that system libraries are also considered by ld and ld.gold is also built
-# --enable-plugins should be used whenever --enable-gold is used, see http://llvm.org/docs/GoldPlugin.html
-configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins --enable-shared --enable-static'
-
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] +
-             ['lib/lib%s.%s' % (l, x) for l in ['bfd', 'opcodes'] for x in ['a', SHLIB_EXT]] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2.eb
index 17ecd5c19008a011fb0180ea8bc6f8c4d342ab97..ea9a13974b4fef4514d3dc59c1fcf84bc310289f 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.2.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.25'
 
@@ -11,30 +9,11 @@ toolchain = {'name': 'GCC', 'version': '4.9.2'}
 sources = [SOURCE_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-# zlib required, but being linked instatically, so not a runtime dep
 builddependencies = [
     ('flex', '2.5.39'),
     ('Bison', '3.0.4'),
-    # zlib required, but being linked instatically, so not a runtime dep
+    # zlib required, but being linked in statically, so not a runtime dep
     ('zlib', '1.2.8'),
 ]
 
-# statically link with zlib, to avoid runtime dependency on zlib
-preconfigopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
-prebuildopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
-
-# make sure that system libraries are also considered by ld and ld.gold is also built
-# --enable-plugins should be used whenever --enable-gold is used, see http://llvm.org/docs/GoldPlugin.html
-configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins --enable-shared --enable-static'
-
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] +
-             ['lib/lib%s.%s' % (l, x) for l in ['bfd', 'opcodes'] for x in ['a', SHLIB_EXT]] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3-binutils-2.25.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3-binutils-2.25.eb
index 61254037e0396e5d63659b3e4c854e5aacb3403e..9709696cf5d799e6a07dbba291c31adcf8029718 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3-binutils-2.25.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3-binutils-2.25.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.25'
 
@@ -14,28 +12,10 @@ source_urls = [GNU_SOURCE]
 builddependencies = [
     ('flex', '2.5.39'),
     ('Bison', '3.0.4'),
-    # zlib required, but being linked instatically, so not a runtime dep
+    # zlib required, but being linked in statically, so not a runtime dep
     ('zlib', '1.2.8'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
-# statically link with zlib, to avoid runtime dependency on zlib
-preconfigopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
-prebuildopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
-
-# make sure that system libraries are also considered by ld and ld.gold is also built
-# --enable-plugins should be used whenever --enable-gold is used, see http://llvm.org/docs/GoldPlugin.html
-configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins --enable-shared --enable-static'
-
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] +
-             ['lib/lib%s.%s' % (l, x) for l in ['bfd', 'opcodes'] for x in ['a', SHLIB_EXT]] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3.eb
index 0007322f1fb51af25c3045f33ec9ce537e831076..7ccace850154f2a1081ff7cab8cdee3f4aa51e42 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-4.9.3.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.25'
 
@@ -11,30 +9,11 @@ toolchain = {'name': 'GCC', 'version': '4.9.3'}
 sources = [SOURCE_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-# zlib required, but being linked instatically, so not a runtime dep
 builddependencies = [
     ('flex', '2.5.39'),
     ('Bison', '3.0.4'),
-    # zlib required, but being linked instatically, so not a runtime dep
+    # zlib required, but being linked in statically, so not a runtime dep
     ('zlib', '1.2.8'),
 ]
 
-# statically link with zlib, to avoid runtime dependency on zlib
-preconfigopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
-prebuildopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
-
-# make sure that system libraries are also considered by ld and ld.gold is also built
-# --enable-plugins should be used whenever --enable-gold is used, see http://llvm.org/docs/GoldPlugin.html
-configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins --enable-shared --enable-static'
-
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] +
-             ['lib/lib%s.%s' % (l, x) for l in ['bfd', 'opcodes'] for x in ['a', SHLIB_EXT]] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-5.1.0-binutils-2.25.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-5.1.0-binutils-2.25.eb
index e6f5a84c78781fe6e551cdee1befa1c521116c05..d6e68008e5b74f3b7b37e5c24b59f2fad41a83a7 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-5.1.0-binutils-2.25.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCC-5.1.0-binutils-2.25.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.25'
 
@@ -14,28 +12,10 @@ source_urls = [GNU_SOURCE]
 builddependencies = [
     ('flex', '2.5.39'),
     ('Bison', '3.0.4'),
-    # zlib required, but being linked instatically, so not a runtime dep
+    # zlib required, but being linked in statically, so not a runtime dep
     ('zlib', '1.2.8'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
-# statically link with zlib, to avoid runtime dependency on zlib
-preconfigopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
-prebuildopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
-
-# make sure that system libraries are also considered by ld and ld.gold is also built
-# --enable-plugins should be used whenever --enable-gold is used, see http://llvm.org/docs/GoldPlugin.html
-configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins --enable-shared --enable-static'
-
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] +
-             ['lib/lib%s.%s' % (l, x) for l in ['bfd', 'opcodes'] for x in ['a', SHLIB_EXT]] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCCcore-4.9.2.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCCcore-4.9.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9ec7a3f3f32c857c08cdceb68bb64cccdf58be86
--- /dev/null
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCCcore-4.9.2.eb
@@ -0,0 +1,22 @@
+name = 'binutils'
+version = '2.25'
+
+homepage = 'http://directory.fsf.org/project/binutils/'
+description = "binutils: GNU binary utilities"
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.2'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+    ('M4', '1.4.17'),
+    ('flex', '2.5.39'),
+    ('Bison', '3.0.4'),
+    # zlib required, but being linked in statically, so not a runtime dep
+    ('zlib', '1.2.8'),
+    # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
+    ('binutils', version, '', True)
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb
index 8efdae380a3276dbcf09a912fcc6f2dabe6af209..f411442d12171e8f694182b97b8c6ede94946df0 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25-GCCcore-4.9.3.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.25'
 
@@ -15,28 +13,10 @@ builddependencies = [
     ('M4', '1.4.17'),
     ('flex', '2.5.39'),
     ('Bison', '3.0.4'),
-    # zlib required, but being linked instatically, so not a runtime dep
+    # zlib required, but being linked in statically, so not a runtime dep
     ('zlib', '1.2.8'),
     # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
     ('binutils', version, '', True)
 ]
 
-# statically link with zlib, to avoid runtime dependency on zlib
-preconfigopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
-prebuildopts = 'LIBS="$EBROOTZLIB/lib/libz.a"'
-
-# make sure that system libraries are also considered by ld and ld.gold is also built
-# --enable-plugins should be used whenever --enable-gold is used, see http://llvm.org/docs/GoldPlugin.html
-configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins  --enable-shared --enable-static'
-
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] +
-             ['lib/lib%s.%s' % (l, x) for l in ['bfd', 'opcodes'] for x in ['a', SHLIB_EXT]] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25.1.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25.1.eb
index b6d188a41b1513a8888fb8e9b020022b67894154..e3f5b15724b3c824f9f42a3b0f1bd93b43df255d 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25.1.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25.1.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.25.1'
 
@@ -14,26 +12,8 @@ source_urls = [GNU_SOURCE]
 builddependencies = [
     ('flex', '2.5.39'),
     ('Bison', '3.0.4'),
-    # zlib required, but being linked instatically, so not a runtime dep
+    # zlib required, but being linked in statically, so not a runtime dep
     ('zlib', '1.2.8'),
 ]
 
-# statically link with zlib, to avoid runtime dependency on zlib
-# further, add the system library path in the rpath: this should 'harden' the
-# resulting binutils to bootstrap GCC (no trouble when other libstdc++ is build etc)
-preconfigopts = 'LIBS="$EBROOTZLIB/lib/libz.a -Wl,-rpath=/lib64 -Wl,-rpath=/usr/lib64 -Wl,-rpath=/lib -Wl,-rpath=/usr/lib"'
-prebuildopts = preconfigopts
-
-# make sure that system libraries are also considered by ld and ld.gold is also built
-# --enable-plugins should be used whenever --enable-gold is used, see http://llvm.org/docs/GoldPlugin.html
-configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins'
-
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a'] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.25.eb b/easybuild/easyconfigs/b/binutils/binutils-2.25.eb
index 40e3ccc1a8a1d21b734167a244140b98ac4ab08c..e08cd975ad8390ca71b24ccc2327ca7ce761515b 100644
--- a/easybuild/easyconfigs/b/binutils/binutils-2.25.eb
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.25.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'binutils'
 version = '2.25'
 
@@ -15,26 +13,8 @@ builddependencies = [
     ('M4', '1.4.17'),
     ('flex', '2.5.39'),
     ('Bison', '3.0.4'),
-    # zlib required, but being linked instatically, so not a runtime dep
+    # zlib required, but being linked in statically, so not a runtime dep
     ('zlib', '1.2.8'),
 ]
 
-# statically link with zlib, to avoid runtime dependency on zlib
-# further, add the system library path in the rpath: this should 'harden' the
-# resulting binutils to bootstrap GCC (no trouble when other libstdc++ is build etc)
-preconfigopts = 'LIBS="$EBROOTZLIB/lib/libz.a -Wl,-rpath=/lib64 -Wl,-rpath=/usr/lib64 -Wl,-rpath=/lib -Wl,-rpath=/usr/lib"'
-prebuildopts = preconfigopts
-
-# make sure that system libraries are also considered by ld and ld.gold is also built
-# --enable-plugins should be used whenever --enable-gold is used, see http://llvm.org/docs/GoldPlugin.html
-configopts = '--with-sysroot=/ --enable-gold --enable-ld=default --enable-plugins'
-
-binlist = ['addr2line', 'ar', 'as', 'c++filt', 'elfedit', 'gprof', 'ld', 'ld.bfd', 'ld.gold', 'nm',
-           'objcopy', 'objdump', 'ranlib', 'readelf', 'size', 'strings', 'strip']
-sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binlist] + ['lib/libbfd.a', 'lib/libopcodes.a'] +
-             ['include/%s' % x for x in ['ansidecl.h', 'bfd.h', 'bfdlink.h', 'dis-asm.h', 'symcat.h']],
-    'dirs': [],
-}
-
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.26-GCCcore-5.3.0.eb b/easybuild/easyconfigs/b/binutils/binutils-2.26-GCCcore-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d7c829040f282bbcca731450c140f8fb6f46dd28
--- /dev/null
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.26-GCCcore-5.3.0.eb
@@ -0,0 +1,21 @@
+name = 'binutils'
+version = '2.26'
+
+homepage = 'http://directory.fsf.org/project/binutils/'
+description = "binutils: GNU binary utilities"
+
+toolchain = {'name': 'GCCcore', 'version': '5.3.0'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    # zlib required, but being linked instatically, so not a runtime dep
+    ('zlib', '1.2.8'),
+    # use same binutils version that was used when building GCC toolchain, to 'bootstrap' this binutils
+    ('binutils', version, '', True)
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/binutils/binutils-2.26.eb b/easybuild/easyconfigs/b/binutils/binutils-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..702b4131204ea3a3ad1e00a352867735673631eb
--- /dev/null
+++ b/easybuild/easyconfigs/b/binutils/binutils-2.26.eb
@@ -0,0 +1,19 @@
+name = 'binutils'
+version = '2.26'
+
+homepage = 'http://directory.fsf.org/project/binutils/'
+description = "binutils: GNU binary utilities"
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    # zlib required, but being linked instatically, so not a runtime dep
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-CrayGNU-2015.06.eb
similarity index 89%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-CrayGNU-2015.06.eb
index 5b74aeb4ae2d557bb178051891e9aa903ccf0aff..afe1e361bf4127b59425c0273948a8211c6778ce 100644
--- a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-CrayGNU-2015.06.eb
@@ -6,7 +6,7 @@ description = """bzip2 is a freely available, patent free, high-quality data com
  compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical
  compressors), whilst being around twice as fast at compression and six times faster at decompression."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-CrayGNU-2015.11.eb
similarity index 89%
rename from easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-CrayGNU-2015.11.eb
index 5666a2e9f5905e0d1cb60e954dad508ab0c47f5b..4907113147dc01b0a57e137af8825ce4557ebddb 100644
--- a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-CrayGNU-2015.11.eb
@@ -6,7 +6,7 @@ description = """bzip2 is a freely available, patent free, high-quality data com
  compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical
  compressors), whilst being around twice as fast at compression and six times faster at decompression."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goolf-1.5.16.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goolf-1.5.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1f608a116f8799fea788891a894d0a9c5112e48e
--- /dev/null
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-goolf-1.5.16.eb
@@ -0,0 +1,15 @@
+name = 'bzip2'
+version = '1.0.6'
+
+homepage = 'http://www.bzip.org/'
+description = """bzip2 is a freely available, patent free, high-quality data compressor. It typically 
+compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical 
+compressors), whilst being around twice as fast at compression and six times faster at decompression."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.bzip.org/%(version)s/']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d048641ea527b171eeccebf91de6ea202c4d367b
--- /dev/null
+++ b/easybuild/easyconfigs/b/bzip2/bzip2-1.0.6-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,15 @@
+name = 'bzip2'
+version = '1.0.6'
+
+homepage = 'http://www.bzip.org/'
+description = """bzip2 is a freely available, patent free, high-quality data compressor. It typically
+ compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical
+ compressors), whilst being around twice as fast at compression and six times faster at decompression."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://www.bzip.org/%(version)s']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.8-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.8-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f4633df3983106f014a0f0945e76d324e68e9a07
--- /dev/null
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.8-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,33 @@
+name = 'CGAL'
+version = '4.8'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.cgal.org/'
+description = """The goal of the CGAL Open Source Project is to provide easy access to efficient 
+ and reliable geometric algorithms in the form of a C++ library."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'strict': True}
+
+# note: source URL needs to be updated for a new version (checksums too)!
+source_urls = ['https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-%(version)s']
+sources = [SOURCE_TAR_XZ]
+checksums = ['e31e7039b5cdc74ac7b106db8ba644f3']
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('Boost', '1.60.0', versionsuffix),
+    ('MPFR', '3.1.4'),
+    ('Qt5', '5.6.0'),
+    ('libGLU', '9.0.0', '-Mesa-11.2.1'),
+]
+
+configopts = "-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
+configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
+
+builddependencies = [
+    ('CMake', '3.5.2'),
+]
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/CGAL/CGAL-4.8-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/c/CGAL/CGAL-4.8-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fd4219e20618e9c2c7b77f255d4a2f3a2823d232
--- /dev/null
+++ b/easybuild/easyconfigs/c/CGAL/CGAL-4.8-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,33 @@
+name = 'CGAL'
+version = '4.8'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.cgal.org/'
+description = """The goal of the CGAL Open Source Project is to provide easy access to efficient 
+ and reliable geometric algorithms in the form of a C++ library."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'strict': True}
+
+# note: source URL needs to be updated for a new version (checksums too)!
+source_urls = ['https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-%(version)s']
+sources = [SOURCE_TAR_XZ]
+checksums = ['e31e7039b5cdc74ac7b106db8ba644f3']
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('Boost', '1.60.0', versionsuffix),
+    ('MPFR', '3.1.4'),
+    ('Qt5', '5.6.0'),
+    ('libGLU', '9.0.0', '-Mesa-11.2.1'),
+]
+
+configopts = "-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include\;$EBROOTLIBGLU/include "
+configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
+configopts += "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
+
+builddependencies = [
+    ('CMake', '3.5.2'),
+]
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayGNU-2015.06.eb
similarity index 90%
rename from easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayGNU-2015.06.eb
index d4b9c663529b41bc34a4a86ca6707bb3812c127e..3de7ff42c388ec88c7ac76f3febbad3d8057de72 100644
--- a/easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayGNU-2015.06.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.cmake.org'
 description = """CMake, the cross-platform, open-source build system.
  CMake is a family of tools designed to build, test and package software."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 
 source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayGNU-2015.11.eb
similarity index 90%
rename from easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayGNU-2015.11.eb
index 1a73916b52324dba8eda1b73de3525986a6880c5..1f3739c57eef627eca29bc23a26b6360fa05eaed 100644
--- a/easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayGNU-2015.11.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.cmake.org'
 description = """CMake, the cross-platform, open-source build system.
  CMake is a family of tools designed to build, test and package software."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 
 source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayIntel-2015.11-XC.eb b/easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayIntel-2015.11.eb
similarity index 89%
rename from easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayIntel-2015.11-XC.eb
rename to easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayIntel-2015.11.eb
index 8fe0d6e4d8714ff13d1422ce0025e485c08b50cb..7c87dffeabbf68044fd0dfa85c8c7544973851cf 100644
--- a/easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayIntel-2015.11-XC.eb
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.2.2-CrayIntel-2015.11.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.cmake.org'
 description = """CMake, the cross-platform, open-source build system.
  CMake is a family of tools designed to build, test and package software."""
 
-toolchain = {'name': 'CrayIntel', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayIntel', 'version': '2015.11'}
 
 source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.4.1-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..df5823de42217612725d39f3c8cf7901504e638f
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.4.1-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.4.1'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+dependencies = [
+    ('ncurses', '6.0'),
+    # OS dependency should be preferred if the os version is more recent then this version,
+    # it's nice to have an up to date openssl for security reasons
+    #('OpenSSL', '1.0.1p'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.5.1-intel-2016a.eb b/easybuild/easyconfigs/c/CMake/CMake-3.5.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a70441375c0e4016fb4660ae26409b92fa93be4b
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.5.1-intel-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.5.1'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+dependencies = [
+    ('ncurses', '6.0'),
+    # OS dependency should be preferred if the os version is more recent then this version,
+    # it's nice to have an up to date openssl for security reasons
+    #('OpenSSL', '1.0.1s'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.5.2-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/c/CMake/CMake-3.5.2-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..619aaa3ab8aa293ee5a423bca49653d6debe769d
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.5.2-GCC-4.9.3-2.25.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.5.2'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+dependencies = [
+    ('ncurses', '6.0', '', ('GCCcore', '4.9.3')),
+    # OS dependency should be preferred if the os version is more recent then this version,
+    # it's nice to have an up to date openssl for security reasons
+    #('OpenSSL', '1.0.1s'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.5.2-foss-2016a.eb b/easybuild/easyconfigs/c/CMake/CMake-3.5.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9075c094fb9dddf47a7d3a7d009235ce8088034e
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.5.2-foss-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.5.2'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+dependencies = [
+    ('ncurses', '6.0'),
+    # OS dependency should be preferred if the os version is more recent then this version,
+    # it's nice to have an up to date openssl for security reasons
+    #('OpenSSL', '1.0.1s'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CMake/CMake-3.5.2-intel-2016a.eb b/easybuild/easyconfigs/c/CMake/CMake-3.5.2-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6d07f31ebd4b1a43e755b2083b42e9d8d54c391d
--- /dev/null
+++ b/easybuild/easyconfigs/c/CMake/CMake-3.5.2-intel-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'CMake'
+version = '3.5.2'
+
+homepage = 'http://www.cmake.org'
+description = """CMake, the cross-platform, open-source build system.
+ CMake is a family of tools designed to build, test and package software."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = '-- -DCMAKE_USE_OPENSSL=1'
+
+dependencies = [
+    ('ncurses', '6.0'),
+    # OS dependency should be preferred if the os version is more recent then this version,
+    # it's nice to have an up to date openssl for security reasons
+    #('OpenSSL', '1.0.1s'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-goolf-1.4.10-ipi.eb b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-goolf-1.4.10-ipi.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7188e62917bfc8f1ab2a30c9afc3b1981d470ca1
--- /dev/null
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-goolf-1.4.10-ipi.eb
@@ -0,0 +1,37 @@
+name = 'CP2K'
+version = '2.4.0'
+versionsuffix = '-ipi'
+
+homepage = 'http://www.cp2k.org'
+description = """CP2K is a freely available (GPL) program, written in Fortran 95,
+    to perform atomistic and molecular simulations of solid state, liquid, molecular and biological systems.
+    It provides a general framework for different methods such as e.g. density functional theory (DFT)
+    using a mixed Gaussian and plane waves approach (GPW), and classical pair and many-body potentials. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://sourceforge.net/projects/cp2k/files/']
+
+sources = [SOURCELOWER_TAR_BZ2]
+
+patches = [
+    'CP2K-%(version)s_ipi.patch',
+    'CP2K-%(version)s-fix_compile_date_lastsvn.patch',
+    'do_regtest_nocompile.patch'
+]
+
+builddependencies = [
+    ('flex', '2.5.35'),
+    ('Bison', '2.5')
+]
+
+dependencies = [('Libint', '1.1.4')]
+
+# don't use parallel make, results in compilation failure
+# because Fortran module files aren't created before they are needed
+parallel = 1
+
+# about 100 tests fail
+ignore_regtest_fails=True
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5c6f21e19503adef60c533a883c482a7b2736655
--- /dev/null
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0-goolf-1.4.10.eb
@@ -0,0 +1,35 @@
+name = 'CP2K'
+version = '2.4.0'
+
+homepage = 'http://www.cp2k.org'
+description = """CP2K is a freely available (GPL) program, written in Fortran 95,
+    to perform atomistic and molecular simulations of solid state, liquid, molecular and biological systems.
+    It provides a general framework for different methods such as e.g. density functional theory (DFT)
+    using a mixed Gaussian and plane waves approach (GPW), and classical pair and many-body potentials. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://sourceforge.net/projects/cp2k/files/']
+
+sources = [SOURCELOWER_TAR_BZ2]
+
+patches = [
+    'CP2K-%(version)s-fix_compile_date_lastsvn.patch', 
+    'do_regtest_nocompile.patch'
+]
+
+builddependencies = [
+    ('flex', '2.5.35'),
+    ('Bison', '2.5')
+]
+
+dependencies = [('Libint', '1.1.4')]
+
+# don't use parallel make, results in compilation failure
+# because Fortran module files aren't created before they are needed
+parallel = 1
+
+# about 100 tests fail
+ignore_regtest_fails=True
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0_ipi.patch b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0_ipi.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3c7cc4aaec8804e6b76410c4dfe0a20c84b6bc35
--- /dev/null
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-2.4.0_ipi.patch
@@ -0,0 +1,512 @@
+#This patch makes CP2K source code compatible with i-pi
+#It was created by the CP2K team and can be found in the following link:
+#https://github.com/i-pi/i-pi/tree/master/patches
+diff -rupN cp2k-2.4.0_ref/makefiles/Makefile cp2k-2.4.0/makefiles/Makefile
+--- cp2k-2.4.0_ref/makefiles/Makefile	2013-08-15 10:46:04.535899216 +0100
++++ cp2k-2.4.0/makefiles/Makefile	2013-08-15 10:53:45.827911028 +0100
+@@ -354,7 +354,7 @@ else
+ LIB_OBJECTS =
+ endif
+ 
+-$(LIB_CP2K_ARCHIVE): $(OBJECTS)
++$(LIB_CP2K_ARCHIVE): $(OBJECTS) sockets.o
+ 	$(AR) $(LIB_CP2K_ARCHIVE) $?
+ ifneq ($(RANLIB),)
+ 	$(RANLIB) $(LIB_CP2K_ARCHIVE)
+diff -rupN cp2k-2.4.0_ref/src/cp2k_runs.F cp2k-2.4.0/src/cp2k_runs.F
+--- cp2k-2.4.0_ref/src/cp2k_runs.F	2013-08-15 10:46:04.091899205 +0100
++++ cp2k-2.4.0/src/cp2k_runs.F	2013-08-15 10:56:31.715915275 +0100
+@@ -73,10 +73,10 @@ MODULE cp2k_runs
+   USE input_constants,                 ONLY: &
+        bsse_run, cell_opt_run, debug_run, do_atom, do_band, do_cp2k, do_ep, &
+        do_farming, do_fist, do_mixed, do_opt_basis, do_optimize_input, &
+-       do_qmmm, do_qs, do_tamc, do_test, ehrenfest, electronic_spectra_run, &
+-       energy_force_run, energy_run, geo_opt_run, linear_response_run, &
+-       mol_dyn_run, mon_car_run, none_run, pint_run, real_time_propagation, &
+-       vib_anal
++       do_qmmm, do_qs, do_tamc, do_test, driver_run, ehrenfest, &
++       electronic_spectra_run, energy_force_run, energy_run, geo_opt_run, &
++       linear_response_run, mol_dyn_run, mon_car_run, none_run, pint_run, &
++       real_time_propagation, vib_anal
+   USE input_cp2k,                      ONLY: create_cp2k_input_reading,&
+                                              create_cp2k_root_section,&
+                                              create_global_section,&
+@@ -117,6 +117,7 @@ MODULE cp2k_runs
+   USE timings,                         ONLY: timeset,&
+                                              timestop
+   USE vibrational_analysis,            ONLY: vb_anal
++  USE driver,                          ONLY: run_driver
+ #include "cp_common_uses.h"
+ 
+   IMPLICIT NONE
+@@ -362,6 +363,8 @@ CONTAINS
+                   error=suberror)
+           CASE (mol_dyn_run)
+              CALL qs_mol_dyn ( force_env, globenv, error=suberror )
++          CASE (driver_run)
++             CALL run_driver ( force_env, globenv, error=suberror )
+           CASE (geo_opt_run)
+              CALL cp_geo_opt(force_env,globenv,error=suberror)
+           CASE (cell_opt_run)
+diff -rupN cp2k-2.4.0_ref/src/driver.F cp2k-2.4.0/src/driver.F
+--- cp2k-2.4.0_ref/src/driver.F	1970-01-01 01:00:00.000000000 +0100
++++ cp2k-2.4.0/src/driver.F	2013-08-15 15:43:44.895650242 +0100
+@@ -0,0 +1,216 @@
++! *****************************************************************************
++!> \brief Driver mode - To communicate with i-PI Python wrapper
++!> \par History
++!>      none
++!> \author Michele Ceriotti 03.2012
++! *****************************************************************************
++MODULE driver
++
++  USE force_env_methods,               ONLY: force_env_calc_energy_force
++  USE force_env_types,                 ONLY: force_env_get,&
++                                             force_env_type, &
++                                             force_env_set_cell
++  USE kinds,                           ONLY: default_path_length,&
++                                             dp                                             
++  USE input_section_types,             ONLY: section_vals_get_subs_vals,&
++                                             section_vals_type,&
++                                             section_vals_val_get
++                                                                                          
++  USE cell_types,                      ONLY: cell_clone,&
++                                             cell_create,&
++                                             cell_release,&
++                                             cell_type,&
++                                             compare_cells,&
++                                             init_cell,&
++                                             real_to_scaled,&
++                                             scaled_to_real                                             
++  USE global_types,                    ONLY: global_environment_type
++  USE f77_interface,                   ONLY: default_para_env
++  USE cp_external_control,                     ONLY: external_control
++  USE message_passing,                 ONLY: mp_bcast, mp_sync
++  USE cp_subsys_types,                 ONLY: cp_subsys_release,&
++                                             cp_subsys_type
++  USE iso_c_binding 
++  USE virial_types,                    ONLY: virial_type 
++#include "cp_common_uses.h"t                                               
++                                             
++  IMPLICIT NONE
++  
++  interface
++  subroutine usleep(useconds) bind(C)
++  ! integer(c_int) function usleep(useconds) bind(C)
++  use iso_c_binding
++  implicit none
++  integer(c_int32_t), value :: useconds
++  ! end function
++  end subroutine
++  end interface
++
++  CONTAINS
++  SUBROUTINE run_driver ( force_env, globenv, error )
++    TYPE(force_env_type), POINTER            :: force_env
++    TYPE(global_environment_type), POINTER   :: globenv
++    TYPE(cp_error_type), INTENT(inout)       :: error
++
++    TYPE(section_vals_type), POINTER         :: drv_section, motion_section
++    TYPE(virial_type), POINTER               :: virial
++
++    CHARACTER(len=default_path_length)       :: drv_hostname, c_hostname
++    INTEGER                                  :: drv_port
++    LOGICAL                                  :: drv_unix
++    
++    !MIK DRIVER
++    ! server address parsing
++    CHARACTER*1024  :: serveraddr, host
++    INTEGER socket, port, inet, nread, readbuffer, slock, swait, uwait
++    ! buffers and temporaries for communication
++    INTEGER, PARAMETER :: MSGLEN=12
++    LOGICAL :: isinit=.true., hasdata=.false., ionode=.false.
++    CHARACTER*12 :: header
++    CHARACTER*1024 :: parbuffer
++    INTEGER nat
++    REAL *8 :: cellh(3,3), cellih(3,3), vir(3,3), pot
++    REAL*8, ALLOCATABLE :: combuf(:)
++    REAL*8 :: sigma(3,3)
++    ! access cp2k structures
++    TYPE(cp_subsys_type), POINTER            :: subsys
++    integer ip, ii, idir
++    TYPE(cell_type), POINTER            :: cpcell
++    logical should_stop
++    ionode=(default_para_env%source==default_para_env%mepos)
++
++    ! reads driver parameters from input
++    motion_section => section_vals_get_subs_vals(force_env%root_section,"MOTION",error=error)
++    drv_section     => section_vals_get_subs_vals(motion_section,"DRIVER",error=error)
++
++    CALL section_vals_val_get(drv_section,"HOST",c_val=drv_hostname,error=error)
++    CALL section_vals_val_get(drv_section,"PORT",i_val=drv_port,error=error)
++    CALL section_vals_val_get(drv_section,"UNIX",l_val=drv_unix,error=error)
++
++    
++    ! opens the socket
++    socket=0    
++    inet=1
++    if (ionode) then
++       write(*,*) "@ i-PI DRIVER BEING LOADED"
++       write(*,*) "@ INPUT DATA: ", TRIM(drv_hostname), drv_port, drv_unix                          
++       c_hostname=TRIM(drv_hostname)//achar(0)
++       CALL open_socket(socket, .not. drv_unix, drv_port, c_hostname) 
++    endif    
++    
++    !now we have a socket, so we can initialize the CP2K environments. 
++    NULLIFY(cpcell)
++    call cell_create(cpcell,error=error)
++    uwait=10000  ! number of MICROseconds to be waited in filesystem lock
++    driver_loop: DO
++      ! do communication on master node only...
++      header = ""
++
++      ! this syncs the processes, possibly (see sockets.c) without calling MPI_Barrier, 
++      ! which is nice as MPI_barrier eats up a lot of CPU for nothing
++      inet=slock(default_para_env%source, default_para_env%mepos) 
++      CALL mp_sync(default_para_env%group)
++
++      if (ionode) nread=readbuffer(socket, header, MSGLEN) 
++      if (ionode)  write(0,*) "returned from readbuffer" 
++
++      inet=swait(uwait, default_para_env%source, default_para_env%mepos)
++      CALL mp_sync(default_para_env%group)
++
++      call mp_bcast(nread,default_para_env%source, default_para_env%group)
++      if (nread .eq. 0) then
++        if (ionode) write(*,*) " @ DRIVER MODE: Could not read from socket, exiting now."
++        exit
++      endif
++
++      call mp_bcast(header,default_para_env%source, default_para_env%group)
++      
++      if (ionode) write(*,*) " @ DRIVER MODE: Message from server: ", trim(header)
++      if (trim(header) == "STATUS") then          
++
++         inet=slock(default_para_env%source, default_para_env%mepos) 
++         CALL mp_sync(default_para_env%group)
++         if (ionode) then  ! does not  need init (well, maybe it should, just to check atom numbers and the like... )
++            if (hasdata) then
++               call writebuffer(socket,"HAVEDATA    ",MSGLEN)
++            else
++               call writebuffer(socket,"READY       ",MSGLEN)
++            endif
++         endif
++         inet=swait(uwait,default_para_env%source, default_para_env%mepos)
++         CALL mp_sync(default_para_env%group)
++      else if (trim(header) == "POSDATA") then              
++         if (ionode) then        
++            nread=readbuffer(socket, cellh, 9*8)
++            nread=readbuffer(socket, cellih, 9*8)
++            nread=readbuffer(socket, nat, 4)
++            cellh=transpose(cellh)
++            cellih=transpose(cellih)
++         endif
++         call mp_bcast(cellh,default_para_env%source, default_para_env%group)
++         call mp_bcast(cellih,default_para_env%source, default_para_env%group)
++         call mp_bcast(nat,default_para_env%source, default_para_env%group)
++         if (.not.allocated(combuf)) allocate(combuf(3*nat))
++         if (ionode) nread=readbuffer(socket, combuf, nat*3*8)
++         call mp_bcast(combuf,default_para_env%source, default_para_env%group)
++         
++         CALL force_env_get(force_env,subsys=subsys,error=error)
++         if (nat/=subsys%particles%n_els) WRITE(*,*) " @DRIVER MODE: Uh-oh! Particle number mismatch between i-pi and cp2k input!"
++         ii=0
++         DO ip=1,subsys%particles%n_els
++          DO idir=1,3
++             ii=ii+1
++             subsys%particles%els(ip)%r(idir)=combuf(ii)
++          END DO
++         END DO
++         CALL init_cell(cpcell, hmat=cellh)
++         CALL force_env_set_cell(force_env,cell=cpcell,error=error)
++         
++         CALL force_env_calc_energy_force(force_env,calc_force=.TRUE. ,error=error)    
++    
++         if (ionode) write(*,*) " @ DRIVER MODE: Received positions "
++         
++         combuf=0
++         ii=0
++         DO ip=1,subsys%particles%n_els
++          DO idir=1,3
++             ii=ii+1
++             combuf(ii)=subsys%particles%els(ip)%f(idir)
++          END DO
++         END DO         
++         CALL force_env_get(force_env, potential_energy=pot, error=error)
++         CALL force_env_get(force_env,cell=cpcell, virial=virial, error=error)
++         vir = transpose(virial%pv_virial)
++         
++         CALL external_control(should_stop,"DPI",globenv=globenv,error=error)
++         IF (should_stop) EXIT
++       
++         hasdata=.true.
++      else if (trim(header)=="GETFORCE") then
++         if (ionode) write(*,*) " @ DRIVER MODE: Returning v,forces,stress "
++         if (ionode) then     
++            call writebuffer(socket,"FORCEREADY  ",MSGLEN)            
++            call writebuffer(socket,pot,8)
++            call writebuffer(socket,nat,4)            
++            call writebuffer(socket,combuf,3*nat*8)
++            call writebuffer(socket,vir,9*8)
++
++            ! i-pi can also receive an arbitrary string, that will be printed out to the "extra" 
++            ! trajectory file. this is useful if you want to return additional information, e.g.
++            ! atomic charges, wannier centres, etc. one must return the number of characters, then
++            ! the string. here we just send back zero characters.            
++            nat=0
++            call writebuffer(socket,nat,4)  ! writes out zero for the length of the "extra" field (not implemented yet!)
++         endif
++         hasdata=.false.
++      else 
++         if (ionode) write(*,*) " @DRIVER MODE:  Socket disconnected, time to exit. "
++         exit
++      endif
++    ENDDO driver_loop  
++    
++  END SUBROUTINE run_driver
++  
++END MODULE driver
++  
++                                         
+diff -rupN cp2k-2.4.0_ref/src/input_constants.F cp2k-2.4.0/src/input_constants.F
+--- cp2k-2.4.0_ref/src/input_constants.F	2013-08-15 10:46:04.107899205 +0100
++++ cp2k-2.4.0/src/input_constants.F	2013-08-15 10:53:45.839911028 +0100
+@@ -135,7 +135,8 @@ MODULE input_constants
+                                               cell_opt_run=14,&
+                                               real_time_propagation=15,&
+                                               ehrenfest=16, &
+-                                              do_tamc=17
++                                              do_tamc=17, &
++                                              driver_run=18
+ 
+   ! Run Types of Atom Code
+   INTEGER, PARAMETER, PUBLIC               :: atom_no_run=1,&
+diff -rupN cp2k-2.4.0_ref/src/input_cp2k.F cp2k-2.4.0/src/input_cp2k.F
+--- cp2k-2.4.0_ref/src/input_cp2k.F	2013-08-15 10:46:04.131899206 +0100
++++ cp2k-2.4.0/src/input_cp2k.F	2013-08-15 10:53:45.843911028 +0100
+@@ -422,13 +422,13 @@ CONTAINS
+          "BAND", "CELL_OPT", "WFN_OPT", "WAVEFUNCTION_OPTIMIZATION",&
+          "MOLECULAR_DYNAMICS", "GEOMETRY_OPTIMIZATION", "MONTECARLO",&
+          "ELECTRONIC_SPECTRA", "LINEAR_RESPONSE", "NORMAL_MODES","RT_PROPAGATION",&
+-         "EHRENFEST_DYN","TAMC" ),&
++         "EHRENFEST_DYN","TAMC","DRIVER" ),&
+          enum_i_vals=(/ none_run, energy_run, energy_force_run, mol_dyn_run,&
+           geo_opt_run, mon_car_run, electronic_spectra_run, debug_run,&
+           bsse_run, linear_response_run, pint_run, vib_anal,do_band,&
+           cell_opt_run, energy_run, energy_run, mol_dyn_run, geo_opt_run,&
+           mon_car_run, electronic_spectra_run, linear_response_run,&
+-          vib_anal,real_time_propagation,ehrenfest,do_tamc/),&
++          vib_anal,real_time_propagation,ehrenfest,do_tamc,driver_run/),&
+          enum_desc=s2a("Perform no tasks", "Computes energy","Computes energy and forces",&
+          "Molecular Dynamics","Geometry Optimization","Monte Carlo", "Computes absorption Spectra",&
+          "Performs a Debug analysis","Basis set superposition error","Linear Response",&
+@@ -437,7 +437,7 @@ CONTAINS
+          "Alias for MC","Alias for SPECTRA","Alias for LR","Alias for VIBRATIONAL_ANALYSIS",&
+          "Real Time propagation run (fixed ionic positions)",&
+          "Ehrenfest dynamics (using real time propagation of the wavefunction)",&
+-         "TAMC"),&
++         "TAMC","i-PI driver mode"),&
+          supported_feature=.TRUE.,error=error)
+     CALL section_add_keyword(section,keyword,error=error)
+     CALL keyword_release(keyword,error=error)
+diff -rupN cp2k-2.4.0_ref/src/input_cp2k_motion.F cp2k-2.4.0/src/input_cp2k_motion.F
+--- cp2k-2.4.0_ref/src/input_cp2k_motion.F	2013-08-15 10:46:04.095899205 +0100
++++ cp2k-2.4.0/src/input_cp2k_motion.F	2013-08-15 10:53:45.843911028 +0100
+@@ -103,6 +103,10 @@ CONTAINS
+        CALL section_add_subsection(section,subsection,error=error)
+        CALL section_release(subsection,error=error)
+ 
++       CALL create_driver_section(subsection,error=error)
++       CALL section_add_subsection(section,subsection,error=error)
++       CALL section_release(subsection,error=error)
++
+        CALL create_fe_section(subsection,error=error)
+        CALL section_add_subsection(section, subsection, error=error)
+        CALL section_release(subsection,error=error)
+@@ -1713,6 +1717,59 @@ CONTAINS
+   END SUBROUTINE create_md_section
+ 
+ ! *****************************************************************************
++!> \param section will contain the driver section
++!> \param error variable to control error logging, stopping,...
++!>        see module cp_error_handling
++!> \author mceriotti
++! *****************************************************************************
++  SUBROUTINE create_driver_section(section,error)
++    TYPE(section_type), POINTER              :: section
++    TYPE(cp_error_type), INTENT(inout)       :: error
++
++    CHARACTER(len=*), PARAMETER :: routineN = 'create_driver_section', &
++      routineP = moduleN//':'//routineN
++
++    LOGICAL                                  :: failure
++    TYPE(keyword_type), POINTER              :: keyword
++
++    failure=.FALSE.
++
++    CPPrecondition(.NOT.ASSOCIATED(section),cp_failure_level,routineP,error,failure)
++    IF (.NOT. failure) THEN
++       CALL section_create(section,name="DRIVER",&
++            description="This section defines the parameters needed to run in i-PI driver mode.",&
++            n_keywords=3, n_subsections=0, repeats=.FALSE., required=.TRUE.,&
++            error=error)
++
++       NULLIFY(keyword)
++       CALL keyword_create(keyword, name="unix",&
++            description="Use a UNIX socket rather than an INET socket.",&
++            usage="unix LOGICAL",&
++            default_l_val=.FALSE., lone_keyword_l_val=.TRUE., error=error)
++       CALL section_add_keyword(section,keyword,error=error)
++       CALL keyword_release(keyword,error=error)
++
++       CALL keyword_create(keyword, name="port",&
++            description="Port number for the i-PI server.",&
++            usage="port <INTEGER>",&
++            default_i_val=12345, error=error)
++       CALL section_add_keyword(section,keyword,error=error)
++       CALL keyword_release(keyword,error=error)       
++
++
++       CALL keyword_create(keyword, name="host",&
++            description="Host name for the i-PI server.",&
++            usage="host <HOSTNAME>",&
++            default_c_val="localhost", error=error)
++       CALL section_add_keyword(section,keyword,error=error)
++       CALL keyword_release(keyword,error=error)  
++
++    END IF
++
++  END SUBROUTINE create_driver_section
++
++
++! *****************************************************************************
+ !> \brief Defines AVERAGES section
+ !> \param error variable to control error logging, stopping,...
+ !>        see module cp_error_handling
+diff -rupN cp2k-2.4.0_ref/src/OBJECTDEFS cp2k-2.4.0/src/OBJECTDEFS
+--- cp2k-2.4.0_ref/src/OBJECTDEFS	2013-08-15 10:46:04.091899205 +0100
++++ cp2k-2.4.0/src/OBJECTDEFS	2013-08-15 10:53:45.843911028 +0100
+@@ -180,6 +180,7 @@ OBJECTS_GENERIC =\
+  dm_ls_scf.o\
+  dm_ls_scf_qs.o\
+  dm_ls_scf_types.o\
++ driver.o\
+  efield_utils.o\
+  eigenvalueproblems.o\
+  eip_environment.o\
+diff -rupN cp2k-2.4.0_ref/src/sockets.c cp2k-2.4.0/src/sockets.c
+--- cp2k-2.4.0_ref/src/sockets.c	1970-01-01 01:00:00.000000000 +0100
++++ cp2k-2.4.0/src/sockets.c	2013-08-15 15:27:36.971625458 +0100
+@@ -0,0 +1,112 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <sys/stat.h>
++#include <netinet/in.h>
++#include <sys/un.h>
++#include <netdb.h> 
++
++
++//#define FS_WAIT 1     // uncomment to use a file system lock rather than mpi_barrier.
++
++void error(const char *msg)
++{   perror(msg);   }
++
++void open_socket_(int *psockfd, int* inet, int* port, char* host)  // the darn fortran passes an extra argument for the string length. here I just ignore it
++{
++   int sockfd, portno, n;
++   struct hostent *server;
++
++   fprintf(stderr, "Connection requested %s, %d, %d\n", host, *port, *inet);
++   struct sockaddr * psock; int ssock;
++   if (*inet!=0)
++   {  
++      struct sockaddr_in serv_addr;      psock=(struct sockaddr *)&serv_addr;     ssock=sizeof(serv_addr);
++      sockfd = socket(AF_INET, SOCK_STREAM, 0);
++      if (sockfd < 0)  error("ERROR opening socket");
++   
++      server = gethostbyname(host);
++      if (server == NULL)
++      {
++         fprintf(stderr, "ERROR, no such host %s \n", host);
++         exit(-1);
++      }
++
++      bzero((char *) &serv_addr, sizeof(serv_addr));
++      serv_addr.sin_family = AF_INET;
++      bcopy((char *)server->h_addr, (char *)&serv_addr.sin_addr.s_addr, server->h_length);
++      serv_addr.sin_port = htons(*port);
++   }
++   else
++   {
++      struct sockaddr_un serv_addr;      psock=(struct sockaddr *)&serv_addr;     ssock=sizeof(serv_addr);
++      sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
++      bzero((char *) &serv_addr, sizeof(serv_addr));
++      serv_addr.sun_family = AF_UNIX;
++      strcpy(serv_addr.sun_path, "/tmp/ipi_");
++      strcpy(serv_addr.sun_path+9, host);
++   }
++   
++   if (connect(sockfd, psock, ssock) < 0) error("ERROR connecting");
++
++   *psockfd=sockfd;
++}
++
++void writebuffer_(int *psockfd, char *data, int* plen)
++{
++   int n;   
++   int sockfd=*psockfd;
++   int len=*plen;
++
++   n = write(sockfd,data,len);
++   if (n < 0) error("ERROR writing to socket\n");
++}
++
++
++int readbuffer_(int *psockfd, char *data, int* plen)
++{
++   int n, nr;
++   int sockfd=*psockfd;
++   int len=*plen;
++
++   n = nr = read(sockfd,data,len);
++   
++   while (nr>0 && n<len )
++   {  nr=read(sockfd,&data[n],len-n); n+=nr; }
++   if (n <= 0)  error("ERROR reading from socket\n"); 
++
++   return n;
++}
++
++int check_reg(const char *path) {
++	struct stat sb;
++	return stat(path, &sb) == 0 && S_ISREG(sb.st_mode);
++}
++
++#ifdef FS_LOCK
++int slock_(int *node, int *ionode)
++{
++//  fprintf(stderr,"creating file lock\n");
++  if ((*node)==(*ionode))
++  {    
++    FILE *fh = fopen(".fs_sync", "w");
++    fclose(fh);  
++  }
++}
++
++int swait_(int *usec, int *node, int *ionode)
++{
++ //  fprintf(stderr, "swait %d %d %d %d\n", *node, *ionode, check_reg(".fs_sync"), ((*node)==(*ionode)) );
++   if ((*node)==(*ionode))
++   {  unlink(".fs_sync"); }
++   else while(check_reg(".fs_sync")) {  usleep(*usec);    }
++}
++
++#else 
++// just do nothing
++int slock_(int *node, int *ionode) { return 0; }
++int swait_(int *usec, int *node, int *ionode) { return 0; }
++#endif
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-CrayGNU-2015.06.eb
similarity index 94%
rename from easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-CrayGNU-2015.06.eb
index c1c02c3bcf4b69bced94dcce520b688d74b3bdb7..428626aef1f0a454e076498929067aeb1cdc9c55 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-CrayGNU-2015.06.eb
@@ -7,7 +7,7 @@ description = """CP2K is a freely available (GPL) program, written in Fortran 95
  methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and
  classical pair and many-body potentials. """
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_BZ2]
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-CrayGNU-2015.11.eb
similarity index 94%
rename from easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-CrayGNU-2015.11.eb
index 18250df781e1b68d3cb16bea772d891a0c901a44..1b2b44d855a3c9c4abcfccb015719ef6cfaa115f 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-2.6.0-CrayGNU-2015.11.eb
@@ -7,7 +7,7 @@ description = """CP2K is a freely available (GPL) program, written in Fortran 95
  methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and
  classical pair and many-body potentials. """
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_BZ2]
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-XC-cuda-7.0.eb b/easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-cuda-7.0.eb
similarity index 95%
rename from easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-XC-cuda-7.0.eb
rename to easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-cuda-7.0.eb
index aeb506b2a1ccb5030380cc61d0a3507aff2ef0bd..d34361f252da6988dbf91cd954686d511960a5ac 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-XC-cuda-7.0.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-cuda-7.0.eb
@@ -10,7 +10,7 @@ description = """CP2K is a freely available (GPL) program, written in Fortran 95
  methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and
  classical pair and many-body potentials. """
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_BZ2]
diff --git a/easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11.eb
similarity index 95%
rename from easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11.eb
index 55e00d968fb45e2a95d5c69004b08f40e0122ad6..e7bf9550c79da598cb2d9b577d8545be2d804677 100644
--- a/easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/c/CP2K/CP2K-3.0-CrayGNU-2015.11.eb
@@ -8,7 +8,7 @@ description = """CP2K is a freely available (GPL) program, written in Fortran 95
  methods such as e.g. density functional theory (DFT) using a mixed Gaussian and plane waves approach (GPW), and
  classical pair and many-body potentials. """
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_BZ2]
diff --git a/easybuild/easyconfigs/c/CUDA/CUDA-7.0.28.eb b/easybuild/easyconfigs/c/CUDA/CUDA-7.0.28.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ab24e09cd3a0bc66da7cc4c57f0e4a5eb6bb9c6f
--- /dev/null
+++ b/easybuild/easyconfigs/c/CUDA/CUDA-7.0.28.eb
@@ -0,0 +1,18 @@
+name = 'CUDA'
+version = '7.0.28'
+
+homepage = 'https://developer.nvidia.com/cuda-toolkit'
+description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
+ computing platform and programming model created by NVIDIA and implemented by the
+ graphics processing units (GPUs) that they produce. CUDA gives developers access
+ to the virtual instruction set and memory of the parallel computational elements in CUDA GPUs."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [
+    'http://developer.download.nvidia.com/compute/cuda/%(version_major)s_%(version_minor)s/Prod/local_installers/',
+]
+
+sources = ['%(namelower)s_%(version)s_linux.run']
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/c/Clang/Clang-3.8.0-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/c/Clang/Clang-3.8.0-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..23fe1ddcc97c66d723718c6137f9dc6f202d24fe
--- /dev/null
+++ b/easybuild/easyconfigs/c/Clang/Clang-3.8.0-GCC-4.9.3-2.25.eb
@@ -0,0 +1,50 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2013-2015 Dmitri Gribenko, Ward Poelmans
+# Authors:: Dmitri Gribenko <gribozavr@gmail.com>
+# Authors:: Ward Poelmans <wpoely86@gmail.com>
+# License:: GPLv2 or later, MIT, three-clause BSD.
+# $Id$
+##
+
+name = "Clang"
+version = "3.8.0"
+
+homepage = "http://clang.llvm.org/"
+description = """C, C++, Objective-C compiler, based on LLVM.  Does not
+ include C++ standard library -- use libstdc++ from GCC."""
+
+# Clang also depends on libstdc++ during runtime, but this dependency is
+# already specified as the toolchain.
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+# Do not set optarch to True: it will cause the build to fail
+toolchainopts = {'optarch': False}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = [
+    "llvm-%(version)s.src.tar.xz",
+    "cfe-%(version)s.src.tar.xz",
+    "compiler-rt-%(version)s.src.tar.xz",
+    "polly-%(version)s.src.tar.xz",
+    "openmp-%(version)s.src.tar.xz",
+]
+
+dependencies = [
+    ('GMP', '6.1.0'),
+    ('ISL', '0.16'),
+]
+
+builddependencies = [
+    ('CMake', '3.5.2'),
+    ('Python', '2.7.11', '-bare'),
+    ('libxml2', '2.9.3'),
+]
+
+assertions = True
+
+usepolly = True
+
+build_targets = ['X86']
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/c/Commet/Commet-20150415-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/c/Commet/Commet-20150415-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..549296f08e8118a595916f2a733b3415255e9de9
--- /dev/null
+++ b/easybuild/easyconfigs/c/Commet/Commet-20150415-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+easyblock = 'MakeCp' 
+
+name = 'Commet' 
+version = '20150415' 
+commit = '4ef0705'
+versionsuffix = '-Python-%(pyver)s' 
+
+homepage = 'https://colibread.inria.fr/software/commet/' 
+description = """ COMMET ("COmpare Multiple METagenomes") provides a global similarity overview between all datasets of
+ a large metagenomic project. 
+""" 
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/pierrepeterlongo/commet/archive']
+sources = ['%s.tar.gz' % commit]
+
+checksums = ['19cba09ca7a92eaed75ed6af820d9451'] 
+
+dependencies = [
+    ('Python', '2.7.11'), 
+] 
+
+files_to_copy = ["bin","doc","include","ABCDE_bench",(["Commet.py"],'bin')] 
+
+sanity_check_paths = {
+    'files': ['bin/%s' % binfile for binfile in ['Commet.py', 'bvop', 'compare_reads',
+                                                 'extract_reads', 'filter_reads', 'index_and_search']],
+    'dirs' : ['doc', 'include']
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/CosmoloPy/CosmoloPy-0.1.104-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/c/CosmoloPy/CosmoloPy-0.1.104-goolf-1.4.10-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..61bd20053b095072e8c087852f46bc57fc9dd576
--- /dev/null
+++ b/easybuild/easyconfigs/c/CosmoloPy/CosmoloPy-0.1.104-goolf-1.4.10-Python-2.7.3.eb
@@ -0,0 +1,31 @@
+easyblock = "PythonPackage"
+
+name = 'CosmoloPy'
+version = '0.1.104'
+
+homepage = 'https://github.com/roban/CosmoloPy'
+description = """A cosmology package for Python. CosmoloPy is 
+built on and designed for use with NumPy and SciPy."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = 'Python'
+pyver = '2.7.3'
+versionsuffix = '-%s-%s' % (python, pyver)
+
+dependencies = [
+    (python, pyver),
+    ('numpy', '1.7.1', versionsuffix),
+]
+
+pyshortver = '.'.join(pyver.split('.')[:2])
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages' % pyshortver],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.06-XC.eb b/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.06.eb
similarity index 96%
rename from easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.06-XC.eb
rename to easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.06.eb
index bf917722672ccce2d9d135cbbe4bd0c7ca0ed634..da34dc3b8219327b8e50bd85241a17e77536ea18 100644
--- a/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.06-XC.eb
+++ b/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.06.eb
@@ -1,7 +1,7 @@
 easyblock = 'CrayToolchain'
 
 name = 'CrayCCE'
-version = '2015.06-XC'
+version = '2015.06'
 
 homepage = 'http://docs.cray.com/books/S-9407-1511'
 description = """Toolchain using Cray compiler wrapper, using PrgEnv-cray module (PE release: November 2015).\n"""
diff --git a/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.11-XC.eb b/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.11.eb
similarity index 96%
rename from easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.11-XC.eb
rename to easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.11.eb
index dbf091ccf30cb7baa1015258480481e8be89e006..f6426373ddcc90f5e56cbe4f54b96281e6077027 100644
--- a/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.11-XC.eb
+++ b/easybuild/easyconfigs/c/CrayCCE/CrayCCE-2015.11.eb
@@ -1,7 +1,7 @@
 easyblock = 'CrayToolchain'
 
 name = 'CrayCCE'
-version = '2015.11-XC'
+version = '2015.11'
 
 homepage = 'http://docs.cray.com/books/S-9407-1511'
 description = """Toolchain using Cray compiler wrapper, using PrgEnv-cray module (PE release: November 2015).\n"""
diff --git a/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.06.eb
similarity index 96%
rename from easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.06.eb
index 0612076d5abe2a38fe4bced37ef267d5cf334783..af4314daa96ad4769572d4c650e079e4c0ea6376 100644
--- a/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.06.eb
@@ -1,7 +1,7 @@
 easyblock = 'CrayToolchain'
 
 name = 'CrayGNU'
-version = '2015.06-XC'
+version = '2015.06'
 
 homepage = 'http://docs.cray.com/books/S-9407-1506'
 description = """Toolchain using Cray compiler wrapper, using PrgEnv-gnu module (PE release: June 2015).\n"""
diff --git a/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.11.eb
similarity index 96%
rename from easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.11.eb
index 370978db7611ef668f766e23d7f9fdb961616ea3..fdcd8836c8ee452ab296f853ba4b9bb03ebc67b0 100644
--- a/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/c/CrayGNU/CrayGNU-2015.11.eb
@@ -1,7 +1,7 @@
 easyblock = 'CrayToolchain'
 
 name = 'CrayGNU'
-version = '2015.11-XC'
+version = '2015.11'
 
 homepage = 'http://docs.cray.com/books/S-9407-1511'
 description = """Toolchain using Cray compiler wrapper, using PrgEnv-gnu module (PE release: November 2015).\n"""
diff --git a/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.06-XC.eb b/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.06.eb
similarity index 96%
rename from easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.06-XC.eb
rename to easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.06.eb
index c80854490aa4b41523d97e422ecf4d51031d9dc5..5d9b4c1609a475d9a83c2cc22afbee598fac2989 100644
--- a/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.06-XC.eb
+++ b/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.06.eb
@@ -1,7 +1,7 @@
 easyblock = 'CrayToolchain'
 
 name = 'CrayIntel'
-version = '2015.06-XC'
+version = '2015.06'
 
 homepage = 'http://docs.cray.com/books/S-9407-1511'
 description = """Toolchain using Cray compiler wrapper, using PrgEnv-intel module (PE release: November 2015).\n"""
diff --git a/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.11-XC.eb b/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.11.eb
similarity index 96%
rename from easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.11-XC.eb
rename to easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.11.eb
index cc105734db6613e99bab01a569413e9e853d629a..8632b007b7c86813e763b8107d93b7ae1f07f5b1 100644
--- a/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.11-XC.eb
+++ b/easybuild/easyconfigs/c/CrayIntel/CrayIntel-2015.11.eb
@@ -1,7 +1,7 @@
 easyblock = 'CrayToolchain'
 
 name = 'CrayIntel'
-version = '2015.11-XC'
+version = '2015.11'
 
 homepage = 'http://docs.cray.com/books/S-9407-1511'
 description = """Toolchain using Cray compiler wrapper, using PrgEnv-intel module (PE release: November 2015).\n"""
diff --git a/easybuild/easyconfigs/c/CrossTalkZ/CrossTalkZ-1.4-foss-2016a.eb b/easybuild/easyconfigs/c/CrossTalkZ/CrossTalkZ-1.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2facea57d93b5384a34e9b880f0c3713c743f78c
--- /dev/null
+++ b/easybuild/easyconfigs/c/CrossTalkZ/CrossTalkZ-1.4-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'CMakeMake'
+
+name = 'CrossTalkZ'
+version = '1.4'
+
+homepage = 'http://sonnhammer.sbc.su.se/download/software/CrossTalkZ/'
+description = """
+CrossTalkZ is a statistical method and software to assess the significance of crosstalk enrichment 
+between pairs of gene or protein groups in large biological networks.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'usempi': True, 'pic': True}
+
+source_urls = [
+    'http://sonnhammer.sbc.su.se/download/software/CrossTalkZ/'
+]
+sources = ['%(name)s_%(version)s.tgz']
+
+dependencies = [('Boost', '1.60.0')]
+
+builddependencies = [('CMake', '3.4.3',)]
+
+
+start_dir = 'src'
+
+configopts = " -DBoost_NO_BOOST_CMAKE=ON -DBoost_NO_SYSTEM_PATHS=ON -DBOOST_ROOT=$EBROOTBOOST"
+
+sanity_check_paths = {
+    'files': ['bin/CrossTalkZ'],
+    'dirs': [''],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-1.3.0-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-1.3.0-goolf-1.4.10.eb
index 501824903b421ad611701a06a6531280b6c7dfe4..7b8dca855454b089db498ab87d21136757cb1d8b 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-1.3.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-1.3.0-goolf-1.4.10.eb
@@ -34,7 +34,7 @@ patches = [
     'cufflinks-1.x-ldflags.patch'
 ]
 
-preconfigopts = 'CPPFLAGS="-I$EBROOTEIGEN/include $CPPFLAGS" LDFLAGS="-lboost_system $LDFLAGS" '
+preconfigopts = 'env CPPFLAGS="-I$EBROOTEIGEN/include $CPPFLAGS" LDFLAGS="-lboost_system $LDFLAGS" '
 configopts = '--with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goalf-1.1.0-no-OFED.eb
index d25853769963dfb67b91b97772ad77a39117c74a..2ef873d2da07e979d4a67c4bcf473d137ee0be67 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goalf-1.1.0-no-OFED.eb
@@ -30,7 +30,7 @@ dependencies = [
 ]
 
 configopts = '--with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
-preconfigopts = 'CPPFLAGS="-I$EBROOTEIGEN/include $CPPFLAGS" LDFLAGS="-lboost_system $LDFLAGS" '
+preconfigopts = 'env CPPFLAGS="-I$EBROOTEIGEN/include $CPPFLAGS" LDFLAGS="-lboost_system $LDFLAGS" '
 
 sanity_check_paths = {
     'files': ['bin/cufflinks'],
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goolf-1.4.10.eb
index 645f94a8337430d99428ef59d3908aff3b5a98a1..25b9208f0e418c4eb25e097bca73df4ad93d3c5e 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-goolf-1.4.10.eb
@@ -32,7 +32,7 @@ dependencies = [
 patches = ['Cufflinks_GCC-4.7.patch']
 
 configopts = '--with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
-preconfigopts = 'CPPFLAGS="-I$EBROOTEIGEN/include $CPPFLAGS" LDFLAGS="-lboost_system $LDFLAGS" '
+preconfigopts = 'env CPPFLAGS="-I$EBROOTEIGEN/include $CPPFLAGS" LDFLAGS="-lboost_system $LDFLAGS" '
 
 sanity_check_paths = {
     'files': ['bin/cufflinks'],
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-ictce-5.3.0.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-ictce-5.3.0.eb
index 799e9172ba2fc4690f20879733c158d8af239901..9c37cd717b93588153399ef57f9e729dccc63e73 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.0.2-ictce-5.3.0.eb
@@ -34,7 +34,7 @@ dependencies = [
 
 configopts = '--with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
 configopts += ' --enable-intel64 '
-preconfigopts = 'CPPFLAGS="-I$EBROOTEIGEN/include $CPPFLAGS" LDFLAGS="-lboost_system $LDFLAGS" '
+preconfigopts = 'env CPPFLAGS="-I$EBROOTEIGEN/include $CPPFLAGS" LDFLAGS="-lboost_system $LDFLAGS" '
 
 sanity_check_paths = {
     'files': ['bin/cufflinks'],
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.1.1-ictce-5.5.0.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.1.1-ictce-5.5.0.eb
index 991b5a4c8bfc3039af562bada4809817feb358dc..6751cec53076cba6266b1fd8a819dbede980bb93 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.1.1-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.1.1-ictce-5.5.0.eb
@@ -33,7 +33,7 @@ dependencies = [
 ]
 
 configopts = '--enable-intel64 --with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
-preconfigopts = 'CPPFLAGS=-I$EBROOTEIGEN/include'
+preconfigopts = 'env CPPFLAGS=-I$EBROOTEIGEN/include'
 
 sanity_check_paths = {
     'files': ['bin/cufflinks'],
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-foss-2015a.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-foss-2015a.eb
index d0372e6f7036ef03b18931e96882e5a5a80096ed..6ac33d77d411c4d88b5696c7f00fa86ccef9f2b7 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-foss-2015a.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-foss-2015a.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
-preconfigopts = 'CPPFLAGS=-I$EBROOTEIGEN/include'
+preconfigopts = 'env CPPFLAGS=-I$EBROOTEIGEN/include'
 configopts = '--with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-goolf-1.4.10.eb
index 2741497a4d1b8df3330585dc6d778caa15b2520e..e368245a6cd43bd3e3d29cd2519b1a7c6e724db3 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-goolf-1.4.10.eb
@@ -18,7 +18,7 @@ dependencies = [
 ]
 
 configopts = '--with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
-preconfigopts = 'CPPFLAGS="-I$EBROOTEIGEN/include $CPPFLAGS" LDFLAGS="-lboost_system $LDFLAGS" '
+preconfigopts = 'env CPPFLAGS="-I$EBROOTEIGEN/include $CPPFLAGS" LDFLAGS="-lboost_system $LDFLAGS" '
 
 sanity_check_paths = {
     'files': ['bin/cufflinks'],
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-goolf-1.7.20.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-goolf-1.7.20.eb
index 0a4b6fa7ab65249235b7e6e3b74ef54514d92ae4..fe15c228e170cd48c58f13f63458bd0438baa1bb 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-goolf-1.7.20.eb
@@ -18,7 +18,7 @@ dependencies = [
 ]
 
 configopts = '--with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
-preconfigopts = 'CPPFLAGS="-I$EBROOTEIGEN/include $CPPFLAGS" LDFLAGS="-lboost_system $LDFLAGS" '
+preconfigopts = 'env CPPFLAGS="-I$EBROOTEIGEN/include $CPPFLAGS" LDFLAGS="-lboost_system $LDFLAGS" '
 
 sanity_check_paths = {
     'files': ['bin/cufflinks'],
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-intel-2015a.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-intel-2015a.eb
index 43da714323fdde6ed1031d9eb95f25a6c4a469b6..50fce481a6c8bdf4963cb7296c1eb6e3faefe778 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-intel-2015a.eb
@@ -19,7 +19,7 @@ dependencies = [
 ]
 
 configopts = '--enable-intel64 --with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
-preconfigopts = 'CPPFLAGS=-I$EBROOTEIGEN/include'
+preconfigopts = 'env CPPFLAGS=-I$EBROOTEIGEN/include'
 
 sanity_check_paths = {
     'files': ['bin/cufflinks'],
diff --git a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-intel-2015b-Python-2.7.10-Boost-1.59.0.eb b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-intel-2015b-Python-2.7.10-Boost-1.59.0.eb
index 38e9d1ce03cfd65a4af1be442d39f9b620ef711b..8360322002f7e357ac4410234990fb67f42b9cdd 100644
--- a/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-intel-2015b-Python-2.7.10-Boost-1.59.0.eb
+++ b/easybuild/easyconfigs/c/Cufflinks/Cufflinks-2.2.1-intel-2015b-Python-2.7.10-Boost-1.59.0.eb
@@ -21,7 +21,7 @@ dependencies = [
 ]
 
 configopts = '--enable-intel64 --with-boost=$EBROOTBOOST --with-bam-libdir=${EBROOTSAMTOOLS}/lib'
-preconfigopts = 'CPPFLAGS=-I${EBROOTEIGEN}/include'
+preconfigopts = 'env CPPFLAGS=-I${EBROOTEIGEN}/include'
 
 sanity_check_paths = {
     'files': ['bin/cufflinks'],
diff --git a/easybuild/easyconfigs/c/cURL/cURL-7.47.0-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/c/cURL/cURL-7.47.0-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..45e6650292aaf7f5fc881a0fa122c503615f4219
--- /dev/null
+++ b/easybuild/easyconfigs/c/cURL/cURL-7.47.0-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'cURL'
+version = '7.47.0'
+
+homepage = 'http://curl.haxx.se'
+description = """libcurl is a free and easy-to-use client-side URL transfer library,
+ supporting DICT, FILE, FTP, FTPS, Gopher, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS,
+ POP3, POP3S, RTMP, RTSP, SCP, SFTP, SMTP, SMTPS, Telnet and TFTP. libcurl supports
+ SSL certificates, HTTP POST, HTTP PUT, FTP uploading, HTTP form based upload,
+ proxies, cookies, user+password authentication (Basic, Digest, NTLM, Negotiate,
+ Kerberos), file transfer resume, http proxy tunneling and more."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://curl.haxx.se/download/']
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+# dependencies = [('OpenSSL', '1.0.1s')]
+# configopts = "--with-ssl=$EBROOTOPENSSL"
+
+modextravars = {'CURL_INCLUDES': '%(installdir)s/include'}
+
+sanity_check_paths = {
+    'files': ['bin/curl', 'lib/libcurl.a', 'lib/libcurl.%s' % SHLIB_EXT],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a.eb b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8d8841ea433ecf9b8afc58262eeb86a1980eee5e
--- /dev/null
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-foss-2016a.eb
@@ -0,0 +1,53 @@
+easyblock = 'ConfigureMake'
+
+name = 'cairo'
+version = '1.14.6'
+
+homepage = 'http://cairographics.org'
+description = """Cairo is a 2D graphics library with support for multiple output devices.
+ Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers,
+ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://cairographics.org/releases/']
+sources = [SOURCE_TAR_XZ]
+
+glibver = '2.47.5'
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libpng', '1.6.21'),
+    ('freetype', '2.6.2'),
+    ('pixman', '0.34.0'),
+    ('fontconfig', '2.11.94'),
+    ('expat', '2.1.0'),
+    ('GLib', glibver),
+    ('libX11', '1.6.3'),
+    ('libxcb', '1.11.1'),
+    ('libXrender', '0.9.9'),
+    ('libXext', '1.3.3'),
+    ('libXau', '1.0.8'),
+    ('libXdmcp', '1.1.2'),
+]
+builddependencies = [
+    ('renderproto', '0.11'),
+    ('xproto', '7.0.28'),
+    ('xextproto', '7.3.0'),
+]
+
+# disable symbol lookup, which requires -lbfd, to avoid link issues with (non-PIC) libiberty.a provided by GCC
+configopts = "--enable-symbol-lookup=no --enable-gobject=yes --enable-svg=yes --enable-tee=yes "
+
+sanity_check_paths = {
+    'files': ['bin/cairo-trace', 'lib/cairo/libcairo-trace.so', 'lib/cairo/libcairo-trace.a',
+              'lib/libcairo.a', 'lib/libcairo-gobject.a', 'lib/libcairo-script-interpreter.a',
+              'lib/libcairo-gobject.so', 'lib/libcairo-script-interpreter.so', 'lib/libcairo.so'] +
+             ['include/cairo/cairo%s.h' % x for x in ['', '-deprecated', '-features', '-ft', '-gobject', '-pdf', '-ps',
+                                                      '-script', '-script-interpreter', '-svg', '-version', '-xcb',
+                                                      '-xlib', '-xlib-xrender']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-GLib-2.48.0.eb b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-GLib-2.48.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ecd56f916623676b053f4ad8a8e0f5392585eeff
--- /dev/null
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a-GLib-2.48.0.eb
@@ -0,0 +1,56 @@
+easyblock = 'ConfigureMake'
+
+name = 'cairo'
+version = '1.14.6'
+glibver = '2.48.0'
+versionsuffix = '-GLib-%s' % glibver
+
+homepage = 'http://cairographics.org'
+description = """Cairo is a 2D graphics library with support for multiple output devices.
+ Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers,
+ PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://cairographics.org/releases/']
+sources = [SOURCE_TAR_XZ]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libpng', '1.6.21'),
+    ('freetype', '2.6.3'),
+    ('pixman', '0.34.0'),
+    ('fontconfig', '2.11.95'),
+    ('expat', '2.1.1'),
+    ('GLib', glibver),
+    ('libX11', '1.6.3'),
+    ('libxcb', '1.11.1'),
+    ('libXrender', '0.9.9'),
+    ('libXext', '1.3.3'),
+    ('libXau', '1.0.8'),
+    ('libXdmcp', '1.1.2'),
+]
+builddependencies = [
+    ('renderproto', '0.11'),
+    ('xproto', '7.0.28'),
+    ('xextproto', '7.3.0'),
+]
+
+# disable symbol lookup, which requires -lbfd, to avoid link issues with (non-PIC) libiberty.a provided by GCC
+configopts = "--enable-symbol-lookup=no --enable-gobject=yes --enable-svg=yes --enable-tee=yes "
+
+# workaround for "hidden symbol .* in .* is referenced by DSO" and "ld: final link failed: Bad value"
+buildopts = 'LD="$CC" LDFLAGS="$LDFLAGS -shared-intel"'
+
+sanity_check_paths = {
+    'files': ['bin/cairo-trace', 'lib/cairo/libcairo-trace.so', 'lib/cairo/libcairo-trace.a',
+              'lib/libcairo.a', 'lib/libcairo-gobject.a', 'lib/libcairo-script-interpreter.a',
+              'lib/libcairo-gobject.so', 'lib/libcairo-script-interpreter.so', 'lib/libcairo.so'] +
+             ['include/cairo/cairo%s.h' % x for x in ['', '-deprecated', '-features', '-ft', '-gobject', '-pdf', '-ps',
+                                                      '-script', '-script-interpreter', '-svg', '-version', '-xcb',
+                                                      '-xlib', '-xlib-xrender']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a.eb b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a.eb
index 2966a85fa7cad2f61e253380f87fb857c937e0df..a289e5fb021f8e19bd1b4fc2fec9298ef3447170 100644
--- a/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a.eb
+++ b/easybuild/easyconfigs/c/cairo/cairo-1.14.6-intel-2016a.eb
@@ -28,9 +28,13 @@ dependencies = [
     ('libxcb', '1.11.1'),
     ('libXrender', '0.9.9'),
     ('libXext', '1.3.3'),
+    ('libXau', '1.0.8'),
+    ('libXdmcp', '1.1.2'),
 ]
 builddependencies = [
     ('renderproto', '0.11'),
+    ('xproto', '7.0.28'),
+    ('xextproto', '7.3.0'),
 ]
 
 # disable symbol lookup, which requires -lbfd, to avoid link issues with (non-PIC) libiberty.a provided by GCC
diff --git a/easybuild/easyconfigs/c/cramtools/cramtools-3.0-Java-1.7.0_80.eb b/easybuild/easyconfigs/c/cramtools/cramtools-3.0-Java-1.7.0_80.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d00a912e71a5b69f94d1ffa3613d19925b4b10d1
--- /dev/null
+++ b/easybuild/easyconfigs/c/cramtools/cramtools-3.0-Java-1.7.0_80.eb
@@ -0,0 +1,27 @@
+easyblock = 'Tarball'
+
+name = 'cramtools'
+version = '3.0'
+versionsuffix = "-Java-%(javaver)s"
+
+homepage = 'https://github.com/enasequence/cramtools/'
+description = """CRAMTools is a set of Java tools and APIs for efficient compression of sequence 
+read data. Although this is intended as a stable version the code is released as
+early access. Parts of the CRAMTools are experimental and may not be supported
+in the future."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/enasequence/%(name)s/archive/']
+
+dependencies = [('Java', '1.7.0_80')]
+
+modloadmsg = "To execute cramtools run: java -jar \\${EBROOTCRAMTOOLS}/%(name)s-%(version)s.jar"
+
+sanity_check_paths = {
+    'files': ["%(name)s-%(version)s.jar"],
+    'dirs': ["lib"]
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/c/cuDNN/cuDNN-4.0.eb b/easybuild/easyconfigs/c/cuDNN/cuDNN-4.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5bcd0e1aa3b8e9cb6ad86b7d7fc2298851393a97
--- /dev/null
+++ b/easybuild/easyconfigs/c/cuDNN/cuDNN-4.0.eb
@@ -0,0 +1,32 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Author:    Stephane Thiell <sthiell@stanford.edu>
+##
+easyblock = 'Tarball'
+
+name = 'cuDNN'
+version = '4.0'
+
+homepage = 'https://developer.nvidia.com/cudnn'
+description = """The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for
+    deep neural networks."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# Nvidia developer registration required.
+# Download link: https://developer.nvidia.com/rdp/cudnn-download
+sources = ['%(namelower)s-7.0-linux-x64-v%(version)s-prod.tgz']
+
+dependencies = [('CUDA', '7.5.18')]
+
+checksums = [
+    '845ead4b37f1a2a243d7d1b4d42d1d8b',    # cudnn-7.0-linux-x64-v4.0-prod.tgz
+]
+
+sanity_check_paths = {
+    'files': ['include/cudnn.h', 'lib64/libcudnn_static.a'],
+    'dirs': ['include', 'lib64'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/cuDNN/cuDNN-5.0-rc.eb b/easybuild/easyconfigs/c/cuDNN/cuDNN-5.0-rc.eb
new file mode 100644
index 0000000000000000000000000000000000000000..536c2f33c677c08b16964966b0a22da92b2e17cf
--- /dev/null
+++ b/easybuild/easyconfigs/c/cuDNN/cuDNN-5.0-rc.eb
@@ -0,0 +1,32 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Author:    Stephane Thiell <sthiell@stanford.edu>
+##
+easyblock = 'Tarball'
+
+name = 'cuDNN'
+version = '5.0-rc'
+
+homepage = 'https://developer.nvidia.com/cudnn'
+description = """The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for
+    deep neural networks."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# Nvidia developer registration required.
+# Download link: https://developer.nvidia.com/rdp/cudnn-download
+sources = ['%(namelower)s-7.5-linux-x64-v%(version)s.tgz']
+
+dependencies = [('CUDA', '7.5.18')]
+
+checksums = [
+    '0febee3f11276218668857191514b7e0',    # cudnn-7.5-linux-x64-v5.0-rc.tgz
+]
+
+sanity_check_paths = {
+    'files': ['include/cudnn.h', 'lib64/libcudnn_static.a'],
+    'dirs': ['include', 'lib64'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/c/cutadapt/cutadapt-1.9.1-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.9.1-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5c57e5846c2a39d70bd372c02702812bcd8d4c7e
--- /dev/null
+++ b/easybuild/easyconfigs/c/cutadapt/cutadapt-1.9.1-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics (SIB)
+# Biozentrum - University of Basel
+# Author: Adam Huffman
+# The Francis Crick Institute
+
+easyblock = "PythonPackage"
+
+name = 'cutadapt'
+version = '1.9.1'
+versionsuffix = '-Python-%(pyver)s' 
+
+homepage = 'http://opensource.scilifelab.se/projects/cutadapt/'
+description = """ Cutadapt finds and removes adapter sequences, primers, poly-A tails and
+ other types of unwanted sequence from your high-throughput sequencing reads. """
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/cutadapt'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/cutadapt/'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/d/DB/DB-6.2.23-foss-2016a.eb b/easybuild/easyconfigs/d/DB/DB-6.2.23-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fcf1bd769617b093b3eb1824ad17539b52004e91
--- /dev/null
+++ b/easybuild/easyconfigs/d/DB/DB-6.2.23-foss-2016a.eb
@@ -0,0 +1,18 @@
+name = 'DB'
+version = '6.2.23'
+
+homepage = 'http://www.oracle.com/technetwork/products/berkeleydb'
+description = """Berkeley DB enables the development of custom data management solutions,
+ without the overhead traditionally associated with such custom projects."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+# download via http://www.oracle.com/technetwork/products/berkeleydb/downloads/, requires registration
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ["include/db.h"],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
\ No newline at end of file
diff --git a/easybuild/easyconfigs/d/DB_File/DB_File-1.835-foss-2016a-Perl-5.22.1.eb b/easybuild/easyconfigs/d/DB_File/DB_File-1.835-foss-2016a-Perl-5.22.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8c069fec945235589e0467118777b76be9742c9e
--- /dev/null
+++ b/easybuild/easyconfigs/d/DB_File/DB_File-1.835-foss-2016a-Perl-5.22.1.eb
@@ -0,0 +1,28 @@
+easyblock = 'PerlModule'
+
+name = 'DB_File'
+version = '1.835'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://perldoc.perl.org/DB_File.html'
+description = """Perl5 access to Berkeley DB version 1.x."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.cpan.org/modules/by-module/DB_File/PMQS']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Perl', '5.22.1'),
+    ('DB', '6.2.23'),
+]
+
+preconfigopts = 'env DB_FILE_INCLUDE="$EBROOTDB/include" DB_FILE_LIB="$EBROOTDB/lib" '
+
+sanity_check_paths = {
+    'files': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/DB_File.pm'],
+    'dirs': [],
+}
+
+moduleclass = 'data'
+
diff --git a/easybuild/easyconfigs/d/DBus/DBus-1.10.8-intel-2016a.eb b/easybuild/easyconfigs/d/DBus/DBus-1.10.8-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f322881382fc4ad293ba4d60f7249dc3baf08b41
--- /dev/null
+++ b/easybuild/easyconfigs/d/DBus/DBus-1.10.8-intel-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'DBus'
+version = '1.10.8'
+
+homepage = 'http://dbus.freedesktop.org/doc/dbus-glib'
+description = """D-Bus is a message bus system, a simple way for applications to talk
+ to one another.  In addition to interprocess communication, D-Bus helps
+ coordinate process lifecycle; it makes it simple and reliable to code
+ a "single instance" application or daemon, and to launch applications
+ and daemons on demand when their services are needed."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://dbus.freedesktop.org/releases/dbus']
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/dbus-%s' % x for x in ['cleanup-sockets', 'daemon', 'launch', 'monitor', 'run-session', 'send', 'uuidgen']] +
+             ['lib/libdbus-1.%s' % x for x in ['a', SHLIB_EXT]],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/DFT-D3/DFT-D3-3.1.1-intel-2015a.eb b/easybuild/easyconfigs/d/DFT-D3/DFT-D3-3.1.1-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..99e680c26db2e91d3c7e82a59a71ab8d66deb3e4
--- /dev/null
+++ b/easybuild/easyconfigs/d/DFT-D3/DFT-D3-3.1.1-intel-2015a.eb
@@ -0,0 +1,29 @@
+easyblock = 'MakeCp'
+
+name = 'DFT-D3'
+version = '3.1.1'
+
+homepage = 'http://www.thch.uni-bonn.de/tc/index.php?section=downloads&subsection=DFT-D3&lang=english'
+description = """DFT-D3 implements a dispersion correction for density functionals, Hartree-Fock and semi-empirical quantum chemical methods."""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+
+source_urls = ['http://www.thch.uni-bonn.de/tc/downloads/%(name)s/data']
+# Note that the DFT-D3 tarball is named as "dftd3.tgz" with no version
+# numbering. Also, the authors are prone (alas) to stealth upgrades, so that two
+# tarballs with the same version number can have different checksums. For this
+# reason, it is suggested to manually download and rename the tarball. The
+# checksum may also need updating from time to time.
+# Checksum last updated: 15 April 2016
+# Date tarball was reported to have been modified: 11 January 2016
+sources = ['dftd3-%(version)s.tgz']
+checksums = [('md5', 'c9d6a92c43bb2ba71ad75f388fdce216')]
+
+files_to_copy = [(['dftd3'], 'bin'), (['man.pdf'], 'doc')]
+
+sanity_check_paths = {
+    'files': ['bin/dftd3'],
+    'dirs': [],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.10-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.10-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6c27df0850942f371670c22f0085ee9f65c7aed2
--- /dev/null
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.10-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,19 @@
+name = 'Doxygen'
+version = '1.8.10'
+
+homepage = 'http://www.doxygen.org'
+description = """Doxygen is a documentation system for C++, C, Java, Objective-C, Python, 
+ IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+sources = ['%(namelower)s-%(version)s.src.tar.gz']
+source_urls = ['http://ftp.stack.nl/pub/users/dimitri/']
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('flex', '2.5.39'),
+    ('Bison', '3.0.4'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-GCC-4.9.2.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-GCC-4.9.2.eb
index 5adccf48d70476aee19c14ae1596e1fb79b5676d..9af65e4593e31e084a8d6901f7f2277fa3cd18dc 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-GCC-4.9.2.eb
@@ -16,4 +16,6 @@ builddependencies = [
     ('Bison', '3.0.4'),
 ]
 
+parallel = 1
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-foss-2015a.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-foss-2015a.eb
index 1db648e43da586836ab0c3363835af1f96228f92..5b5d5f06cdfdb264c93dfc91fd059ce07d44554c 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-foss-2015a.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-foss-2015a.eb
@@ -16,4 +16,6 @@ builddependencies = [
     ('Bison', '3.0.4'),
 ]
 
+parallel = 1
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-foss-2016a.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-foss-2016a.eb
index fea350b75565a0e9bf692634e37b3fd33d8d9ee0..45e774b0e381a8b6a5bc693fc87371bf23ecc3fd 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-foss-2016a.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-foss-2016a.eb
@@ -16,4 +16,6 @@ builddependencies = [
     ('Bison', '3.0.4'),
 ]
 
+parallel = 1
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-intel-2016a.eb b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-intel-2016a.eb
index 2d5dc8597f3f6417bf228fc27656f6292b38ede9..a63ff80fea99963b24142537f73563091eb9397b 100644
--- a/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-intel-2016a.eb
+++ b/easybuild/easyconfigs/d/Doxygen/Doxygen-1.8.11-intel-2016a.eb
@@ -16,4 +16,6 @@ builddependencies = [
     ('Bison', '3.0.4'),
 ]
 
+parallel = 1
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/d/dask/dask-0.8.2-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/d/dask/dask-0.8.2-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..10a9f3bf3627be8228d9911e5770f0cb9a29d672
--- /dev/null
+++ b/easybuild/easyconfigs/d/dask/dask-0.8.2-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'dask'
+version = '0.8.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://github.com/dask/dask/'
+description = """Dask provides multi-core execution on larger-than-memory datasets using blocked algorithms
+ and task scheduling."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.11')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/d/dask/dask-0.8.2-intel-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/d/dask/dask-0.8.2-intel-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7dcf741ab4c8763b294ecc35375c4ee19b2d8e29
--- /dev/null
+++ b/easybuild/easyconfigs/d/dask/dask-0.8.2-intel-2016a-Python-3.5.1.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'dask'
+version = '0.8.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://github.com/dask/dask/'
+description = """Dask provides multi-core execution on larger-than-memory datasets using blocked algorithms
+ and task scheduling."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '3.5.1')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/d/dbus-glib/dbus-glib-0.106-intel-2016a.eb b/easybuild/easyconfigs/d/dbus-glib/dbus-glib-0.106-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..321204b24485cd0ee7ac1bc8ecf88b6f6d50a658
--- /dev/null
+++ b/easybuild/easyconfigs/d/dbus-glib/dbus-glib-0.106-intel-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'dbus-glib'
+version = '0.106'
+
+homepage = 'http://dbus.freedesktop.org/doc/dbus-glib'
+description = """D-Bus is a message bus system, a simple way for applications to talk to one another."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://dbus.freedesktop.org/releases/dbus-glib']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('GLib', '2.47.5'),
+    ('DBus', '1.10.8'),
+    ('expat', '2.1.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/dbus-binding-tool', 'lib/libdbus-glib-1.%s' % SHLIB_EXT, 'lib/libdbus-glib-1.a'],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/e/EasyBuild/EasyBuild-2.7.0.eb b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-2.7.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1ca29896e871f529687b320b23a2b1ae17faaf00
--- /dev/null
+++ b/easybuild/easyconfigs/e/EasyBuild/EasyBuild-2.7.0.eb
@@ -0,0 +1,31 @@
+easyblock = 'EB_EasyBuildMeta'
+
+name = 'EasyBuild'
+version = '2.7.0'
+
+homepage = 'http://hpcugent.github.com/easybuild/'
+description = """EasyBuild is a software build and installation framework
+ written in Python that allows you to install software in a structured,
+ repeatable and robust way."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [
+    'https://pypi.python.org/packages/source/v/vsc-base/',
+    'https://pypi.python.org/packages/source/e/easybuild-framework/',
+    'https://pypi.python.org/packages/source/e/easybuild-easyblocks/',
+    'https://pypi.python.org/packages/source/e/easybuild-easyconfigs/',
+]
+# order matters a lot, to avoid having dependencies auto-resolved (--no-deps easy_install option doesn't work?)
+sources = [
+    'vsc-base-2.4.18.tar.gz',
+    'easybuild-framework-%(version)s.tar.gz',
+    'easybuild-easyblocks-%(version)s.tar.gz',
+    'easybuild-easyconfigs-%(version)s.tar.gz',
+]
+
+# EasyBuild is a (set of) Python packages, so it depends on Python
+# usually, we want to use the system Python, so no actual Python dependency is listed
+allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-2.0.17-goolf-1.4.10.eb b/easybuild/easyconfigs/e/Eigen/Eigen-2.0.17-goolf-1.4.10.eb
index a9cf3457671e383e781c4df906461f81cd4135fc..447fdcc2f14fed2853196a19c997772ac88ba321 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-2.0.17-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-2.0.17-goolf-1.4.10.eb
@@ -6,7 +6,6 @@ description = """Eigen is a C++ template library for linear algebra:
 matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb
index 57fad2e4e7e074765592ee1ea27458b10c134ba5..3cc61b864372d3299c7b17d084cc0401bd104679 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goalf-1.1.0-no-OFED.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb
index 04a48d1f609f90ea81f460110119dba6c8c4ddb1..f64ca17dc1cb76865df99fd6134328879eafb2eb 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-goolf-1.4.10.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
 matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb
index 34c32694d7333835906879dde48afd1176033b20..ad92c7352d47a758d5f873e1e657fa8050ade12e 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-4.0.6.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb
index eda95916d09d66092fd23b490b1db6ec88872bc8..c2159638f240dd527660d01ad202029b9f019ed4 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.1-ictce-5.3.0.eb
@@ -19,7 +19,6 @@ description = """Eigen is a C++ template library for linear algebra:
 
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb
index ab4f378feb1ea3191188fd4b8b6a83d12209bbac..0db2cb2232438d36ef168245fa871a56e412a881 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goalf-1.5.12-no-OFED.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'goalf', 'version': '1.5.12-no-OFED'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb
index 92042e0a82004dd369dfe3921d2de6fe67f1ad38..ad65bdfc92e9490b91fbb3e0201d58bb57d87cb0 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-goolf-1.4.10.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb
index 5e8553cde74c6c267527a535cb144be11d2a2eb2..8868b07c8240c5d73b6cc0e131809415f26ac592 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-4.1.13.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.3.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.3.0.eb
index bf8140941835814debfcfe826f8d272ab1e31dfb..0a2271f0359a8924a7e75f1d9c3d9902e1c29311 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.3.0.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb
index 934d581d377f9514463314da63fd12775c751977..0dd48816d2d2d9f930bb212cc97e7d151029a16d 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.1.4-ictce-5.5.0.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.0-ictce-5.5.0.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.0-ictce-5.5.0.eb
index 890a8a48390f86db428dfd7c0f2fef71d071e4cd..9e7b9cf60de7cdcb32e742410320195b21078ffb 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.0-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.0-ictce-5.5.0.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.2-goolf-1.5.14.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.2-goolf-1.5.14.eb
index 024205f8b6ba005855a3e96cb6518728ad49a7a6..7cbefdf8ab1fe2181989e23d49163a1690a71875 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.2-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.2-goolf-1.5.14.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'goolf', 'version': '1.5.14'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = [BITBUCKET_SOURCE]
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.2-ictce-7.1.2.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.2-ictce-7.1.2.eb
index bca769f27d8d7115a6d5a9f6c6ae000a9b16daaa..81edc7d68bfa13d788db47f922fcbb14c5409382 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.2-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.2-ictce-7.1.2.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'ictce', 'version': '7.1.2'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.2-intel-2014b.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.2-intel-2014b.eb
index ab03a385a5b063bcadbee86c2d3a365ce269f129..b3c186165b6652facb329316b158ec46e1b07955 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.2-intel-2014b.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.2-intel-2014b.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'intel', 'version': '2014b'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.3-foss-2015a.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.3-foss-2015a.eb
index 9cca953ebc6cc2b9652bb63d0d44c727845fc488..d9a3a23dd02e5d414de5fe6f2ccfb28be38c36f7 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.3-foss-2015a.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.3-foss-2015a.eb
@@ -6,7 +6,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'foss', 'version': '2015a'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = [BITBUCKET_SOURCE]
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.3-intel-2015a.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.3-intel-2015a.eb
index d9ce74d1cfac69e2491f7f37c867760cb49b4609..fcb13a817fb7063a99fdfab3b80f7bbbf35ec58b 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.3-intel-2015a.eb
@@ -6,7 +6,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'intel', 'version': '2015a'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.5.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.5.eb
index 5ec6f45b74a642c3db3a6590956641b161cda7af..8648dbd440ce004e46bbc5645b6655e6f5e1ada6 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.5.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.5.eb
@@ -6,7 +6,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'dummy', 'version': ''}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = [BITBUCKET_SOURCE]
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.6-goolf-1.7.20.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.6-goolf-1.7.20.eb
index ec09959b7403acd969cdc628ceed8e42282601be..59832233f0ee52f020a433bcaed6c9938dc81378 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.6-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.6-goolf-1.7.20.eb
@@ -18,7 +18,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'goolf', 'version': '1.7.20'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = [BITBUCKET_SOURCE]
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.6.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.6.eb
index 6d4de9bbd8952ccecb80ae1c4e53f42e1834e4f2..d79ef2b7af35124dba3d18ee18d26b9da9a88076 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.6.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.6.eb
@@ -6,7 +6,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'dummy', 'version': ''}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = [BITBUCKET_SOURCE]
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-foss-2016a.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7d8ebf1a320bbb63eec255d66f50902ecd3897b9
--- /dev/null
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-foss-2016a.eb
@@ -0,0 +1,13 @@
+name = 'Eigen'
+version = '3.2.7'
+
+homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page'
+description = """Eigen is a C++ template library for linear algebra:
+ matrices, vectors, numerical solvers, and related algorithms."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [BITBUCKET_SOURCE]
+sources = ['%(version)s.tar.bz2']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2015b.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2015b.eb
index 16eecd14b86a00f9318963bc0ec2a58bc5b92ae3..499d24c76ff95d135875279cf9847e1b99f2fdc0 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2015b.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2015b.eb
@@ -6,7 +6,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'intel', 'version': '2015b'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2016a.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2016a.eb
index 5e2d4fc5a2ba7d3fbe50fa0dc37dd237a7b3cfd1..f02fff458c02c637054c21ce00fcb1f4706f707d 100644
--- a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2016a.eb
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.7-intel-2016a.eb
@@ -6,7 +6,6 @@ description = """Eigen is a C++ template library for linear algebra:
  matrices, vectors, numerical solvers, and related algorithms."""
 
 toolchain = {'name': 'intel', 'version': '2016a'}
-toolchainopts = {'optarch': True, 'pic': True}
 
 source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
 sources = ['%(version)s.tar.bz2']
diff --git a/easybuild/easyconfigs/e/Eigen/Eigen-3.2.8-intel-2016a.eb b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.8-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3ba31dc38dc9df798ab73b28dda978b461d081ea
--- /dev/null
+++ b/easybuild/easyconfigs/e/Eigen/Eigen-3.2.8-intel-2016a.eb
@@ -0,0 +1,13 @@
+name = 'Eigen'
+version = '3.2.8'
+
+homepage = 'http://eigen.tuxfamily.org/index.php?title=Main_Page'
+description = """Eigen is a C++ template library for linear algebra:
+ matrices, vectors, numerical solvers, and related algorithms."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://bitbucket.org/%(namelower)s/%(namelower)s/get']
+sources = ['%(version)s.tar.bz2']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/e/Exonerate/Exonerate-2.2.0-foss-2015b.eb b/easybuild/easyconfigs/e/Exonerate/Exonerate-2.2.0-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6a9d4b53984092800ab6df5bd6779171ee2a6c86
--- /dev/null
+++ b/easybuild/easyconfigs/e/Exonerate/Exonerate-2.2.0-foss-2015b.eb
@@ -0,0 +1,33 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+# Modified by: Adam Huffman
+# The Francis Crick Institute
+
+easyblock = 'ConfigureMake'
+
+name = 'Exonerate'
+version = '2.2.0'
+
+homepage = 'http://www.ebi.ac.uk/about/vertebrate-genomics/software/exonerate'
+description = """ Exonerate is a generic tool for pairwise sequence comparison.
+ It allows you to align sequences using a many alignment models, using either 
+ exhaustive dynamic programming, or a variety of heuristics. """
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+source_urls = ['http://ftp.ebi.ac.uk/pub/software/vertebrategenomics/%(namelower)s/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('GLib', '2.34.3')]
+
+# parallel build fails
+parallel = 1
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["exonerate", "fastaclip", "fastaoverlap"]],
+    'dirs': ["share"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/e/Exonerate/Exonerate-2.4.0-foss-2016a.eb b/easybuild/easyconfigs/e/Exonerate/Exonerate-2.4.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0cfe11f239af086b8b24e92e4ca93c329bb0dfcc
--- /dev/null
+++ b/easybuild/easyconfigs/e/Exonerate/Exonerate-2.4.0-foss-2016a.eb
@@ -0,0 +1,31 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = 'ConfigureMake'
+
+name = 'Exonerate'
+version = '2.4.0'
+
+homepage = 'http://www.ebi.ac.uk/~guy/exonerate/'
+description = """ Exonerate is a generic tool for pairwise sequence comparison.
+ It allows you to align sequences using a many alignment models, using either 
+ exhaustive dynamic programming, or a variety of heuristics. """
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/nathanweeks/exonerate/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [('GLib', '2.47.5')]
+
+# parallel build fails 
+parallel = 1
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["exonerate", "fastaclip", "fastaoverlap"]],
+    'dirs': ["share"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/e/eudev/eudev-3.1.5-foss-2016a.eb b/easybuild/easyconfigs/e/eudev/eudev-3.1.5-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3265e4fdb489fb73974e09fa0fa0cf642c9b61e8
--- /dev/null
+++ b/easybuild/easyconfigs/e/eudev/eudev-3.1.5-foss-2016a.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'eudev'
+version = '3.1.5'
+
+homepage = 'https://wiki.gentoo.org/wiki/Project:Eudev'
+description = """eudev is a fork of systemd-udev with the goal of obtaining
+ better compatibility with existing software such as
+ OpenRC and Upstart, older kernels, various toolchains
+ and anything else required by users and various distributions."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://dev.gentoo.org/~blueness/%(name)s/']
+patches = ['%(name)s-3.1.2_pre-2.6.34_kernel.patch']
+
+builddependencies = [
+    ('gperf', '3.0.4'),
+]
+
+osdependencies = [('kernel-headers', 'linux-libc-dev')]
+
+configopts = '--disable-blkid --disable-selinux --disable-gudev --disable-manpages '
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['bin/udevadm', 'include/libudev.h', 'include/udev.h', 'lib/libudev.so.1'],
+    'dirs': [],
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.1-foss-2016a.eb b/easybuild/easyconfigs/e/expat/expat-2.1.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1a58effe3dde3eee8d8bad81bae06a8ed6be60d2
--- /dev/null
+++ b/easybuild/easyconfigs/e/expat/expat-2.1.1-foss-2016a.eb
@@ -0,0 +1,16 @@
+easyblock = 'ConfigureMake'
+
+name = 'expat'
+version = '2.1.1'
+
+homepage = 'http://expat.sourceforge.net/'
+description = """Expat is an XML parser library written in C. It is a stream-oriented parser in which an application
+ registers handlers for things the parser might find in the XML document (like start tags)"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [SOURCEFORGE_SOURCE]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/e/expat/expat-2.1.1-intel-2016a.eb b/easybuild/easyconfigs/e/expat/expat-2.1.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6e5b60c35f5bc631d1d58285916029d1d81f6e2b
--- /dev/null
+++ b/easybuild/easyconfigs/e/expat/expat-2.1.1-intel-2016a.eb
@@ -0,0 +1,16 @@
+easyblock = 'ConfigureMake'
+
+name = 'expat'
+version = '2.1.1'
+
+homepage = 'http://expat.sourceforge.net/'
+description = """Expat is an XML parser library written in C. It is a stream-oriented parser in which an application
+ registers handlers for things the parser might find in the XML document (like start tags)"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = [SOURCEFORGE_SOURCE]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-foss-2016a.eb b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a69a7b9e2fd4a380b4fce2c047576d8ba0e2eec7
--- /dev/null
+++ b/easybuild/easyconfigs/f/FASTX-Toolkit/FASTX-Toolkit-0.0.14-foss-2016a.eb
@@ -0,0 +1,44 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'FASTX-Toolkit'
+version = '0.0.14'
+
+homepage = 'http://hannonlab.cshl.edu/fastx_toolkit/'
+description = """The FASTX-Toolkit is a collection of command line tools for 
+ Short-Reads FASTA/FASTQ files preprocessing."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/agordon/fastx_toolkit/releases/download/%(version)s']
+sources = ['fastx_toolkit-%(version)s.tar.bz2']
+
+builddependencies = [('libgtextutils', '0.7')]
+
+sanity_check_paths = {
+    'files':
+        ['bin/fastx_%s' % x for x in
+            ['clipper', 'trimmer', 'quality_stats', 'artifacts_filter', 'reverse_complement',
+             'collapser', 'uncollapser', 'renamer', 'barcode_splitter.pl', 'nucleotide_distribution_graph.sh',
+             'nucleotide_distribution_line_graph.sh']] +
+        ['bin/fasta_%s' % x for x in
+            ['clipping_histogram.pl', 'formatter', 'nucleotide_changer']] +
+        ['bin/fastq_%s' % x for x in
+            ['quality_boxplot_graph.sh', 'quality_converter', 'to_fasta', 'quality_filter',
+             'quality_trimmer', 'masker']],
+    'dirs': ['.']
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/f/FDS/FDS-6.3.0-intel-2015b.eb b/easybuild/easyconfigs/f/FDS/FDS-6.3.0-intel-2015b.eb
index 24f4ba27ec42e20fc26af691a91d2a8c222a93f6..7278d23d80b703dd82a2dec30188728b4ed9bf53 100644
--- a/easybuild/easyconfigs/f/FDS/FDS-6.3.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/f/FDS/FDS-6.3.0-intel-2015b.eb
@@ -23,7 +23,7 @@ start_dir = 'FDS_Compilation'
 skipsteps = ['configure', 'install']
 buildininstalldir = True
 
-prebuildopts = 'FFLAGS="$FFLAGS -fpp"'
+prebuildopts = 'env FFLAGS="$FFLAGS -fpp"'
 
 modextrapaths = {'PATH': 'FDS_Compilation'}
 
diff --git a/easybuild/easyconfigs/f/FFLAS-FFPACK/FFLAS-FFPACK-2.2.0-foss-2016a.eb b/easybuild/easyconfigs/f/FFLAS-FFPACK/FFLAS-FFPACK-2.2.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..da99f9d5b8eaa97f82ef9d0c9732d003d60d8a29
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFLAS-FFPACK/FFLAS-FFPACK-2.2.0-foss-2016a.eb
@@ -0,0 +1,40 @@
+##
+# This file is an EasyBuild recipe; see https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright (c) 2016 Riccardo Murri <riccardo.murri@gmail.com>
+# Authors::   Riccardo Murri <riccardo.murri@gmail.com>
+# License::   GPL
+#
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'FFLAS-FFPACK'
+version = '2.2.0'
+
+homepage = 'https://linbox-team.github.io/fflas-ffpack/'
+description = "Finite Field Linear Algebra Subroutines / Package"
+
+toolchain = {'version': '2016a', 'name': 'foss'}
+
+sources = ['v%(version)s.zip']
+source_urls = ['https://github.com/linbox-team/fflas-ffpack/archive']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+dependencies = [
+    ('GMP', '6.1.0'),
+    ('Givaro', '4.0.1'),
+]
+
+preconfigopts = "env NOCONFIGURE=1 ./autogen.sh && "
+configopts = '--with-gmp=$EBROOTGMP --with-givaro=$EBROOTGIVARO'
+configopts += ' --with-blas-cflags="-I$BLAS_INC_DIR" --with-blas-libs="-L$BLAS_LIB_DIR $LIBBLAS" --enable-openmp'
+
+sanity_check_paths = {
+    'files': ['bin/fflas-ffpack-config', 'include/fflas-ffpack/fflas-ffpack.h'],
+    'dirs': ['bin', 'include', 'lib'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gmpich-2016a.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gmpich-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..71efac9c7e2c35c760db4da6d1d30b5e3bc7ff83
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gmpich-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFTW'
+version = '3.3.4'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT)
+ in one or more dimensions, of arbitrary input size, and of both real and complex data."""
+
+toolchain = {'name': 'gmpich', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [homepage]
+
+common_configopts = "--enable-threads --enable-openmp --with-pic"
+
+configopts = [
+    common_configopts + " --enable-single --enable-sse2 --enable-mpi",
+    common_configopts + " --enable-long-double --enable-mpi",
+    common_configopts + " --enable-quad-precision",
+    common_configopts + " --enable-sse2 --enable-mpi",  # default as last
+]
+
+sanity_check_paths = {
+    'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
+             ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
+                                              '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gmvapich2-2016a.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gmvapich2-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..757b5eba9134faf0e45889bd7252f23398e6a6a2
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gmvapich2-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFTW'
+version = '3.3.4'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT)
+ in one or more dimensions, of arbitrary input size, and of both real and complex data."""
+
+toolchain = {'name': 'gmvapich2', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [homepage]
+
+common_configopts = "--enable-threads --enable-openmp --with-pic"
+
+configopts = [
+    common_configopts + " --enable-single --enable-sse2 --enable-mpi",
+    common_configopts + " --enable-long-double --enable-mpi",
+    common_configopts + " --enable-quad-precision",
+    common_configopts + " --enable-sse2 --enable-mpi",  # default as last
+]
+
+sanity_check_paths = {
+    'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
+             ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
+                                              '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-2016.04.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..aeee54992ebd580acae2f557ef22c1d3955247f9
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-gompi-2016.04.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFTW'
+version = '3.3.4'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT)
+ in one or more dimensions, of arbitrary input size, and of both real and complex data."""
+
+toolchain = {'name': 'gompi', 'version': '2016.04'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [homepage]
+
+common_configopts = "--enable-threads --enable-openmp --with-pic"
+
+configopts = [
+    common_configopts + " --enable-single --enable-sse2 --enable-mpi",
+    common_configopts + " --enable-long-double --enable-mpi",
+    common_configopts + " --enable-quad-precision",
+    common_configopts + " --enable-sse2 --enable-mpi",  # default as last
+]
+
+sanity_check_paths = {
+    'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom', 'q-wisdom']] +
+             ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
+                                              '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']] +
+             ['lib/libfftw3q.a', 'lib/libfftw3q_omp.a'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-intel-2016a.eb b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..09d52dd7555024329d8a4456ed623babc8e6340e
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFTW/FFTW-3.3.4-intel-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFTW'
+version = '3.3.4'
+
+homepage = 'http://www.fftw.org'
+description = """FFTW is a C subroutine library for computing the discrete Fourier transform (DFT)
+ in one or more dimensions, of arbitrary input size, and of both real and complex data."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [homepage]
+
+common_configopts = "--enable-threads --enable-openmp --with-pic"
+
+# no quad precision, requires GCC v4.6 or higher
+# see also http://www.fftw.org/doc/Extended-and-quadruple-precision-in-Fortran.html
+configopts = [
+    common_configopts + " --enable-single --enable-sse2 --enable-mpi",
+    common_configopts + " --enable-long-double --enable-mpi",
+    common_configopts + " --enable-sse2 --enable-mpi",  # default as last
+]
+
+sanity_check_paths = {
+    'files': ['bin/fftw%s' % x for x in ['-wisdom', '-wisdom-to-conf', 'f-wisdom', 'l-wisdom']] +
+             ['include/fftw3%s' % x for x in ['-mpi.f03', '-mpi.h', '.f', '.f03',
+                                              '.h', 'l-mpi.f03', 'l.f03', 'q.f03']] +
+             ['lib/libfftw3%s%s.a' % (x, y) for x in ['', 'f', 'l'] for y in ['', '_mpi', '_omp', '_threads']],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-foss-2016a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0badebf4eb9eac06b609ce7704baaf1e3293e081
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-foss-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFmpeg'
+version = '2.8.7'
+
+homepage = 'https://www.ffmpeg.org/'
+description = """A complete, cross-platform solution to record, convert and stream audio and video."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ffmpeg.org/releases/']
+
+dependencies = [
+    ('NASM', '2.12.01'),
+    ('zlib', '1.2.8'),
+    ('x264', '20160430'),
+]
+
+configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
+configopts += '--enable-libx264'
+
+sanity_check_paths = {
+    'files': ['bin/ff%s' % x for x in ['mpeg', 'probe', 'server']] +
+             ['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc',
+                                                'swresample', 'swscale', 'avutil'] for y in [SHLIB_EXT, 'a']],
+    'dirs': ['include']
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-intel-2016a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..05478ccadaa7fcaad792c1fee2c2dd065061c646
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-2.8.7-intel-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFmpeg'
+version = '2.8.7'
+
+homepage = 'https://www.ffmpeg.org/'
+description = """A complete, cross-platform solution to record, convert and stream audio and video."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ffmpeg.org/releases/']
+
+dependencies = [
+    ('NASM', '2.12.01'),
+    ('zlib', '1.2.8'),
+    ('x264', '20160430'),
+]
+
+configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
+configopts += '--enable-libx264'
+
+sanity_check_paths = {
+    'files': ['bin/ff%s' % x for x in ['mpeg', 'probe', 'server']] +
+             ['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc',
+                                                'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
+    'dirs': ['include']
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.0.2-intel-2016a.eb b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.0.2-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fb0c75a29bf506b5f2c2f3bc0c2fa9bead429a0a
--- /dev/null
+++ b/easybuild/easyconfigs/f/FFmpeg/FFmpeg-3.0.2-intel-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'FFmpeg'
+version = '3.0.2'
+
+homepage = 'https://www.ffmpeg.org/'
+description = """A complete, cross-platform solution to record, convert and stream audio and video."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ffmpeg.org/releases/']
+
+dependencies = [
+    ('NASM', '2.12.01'),
+    ('zlib', '1.2.8'),
+    ('x264', '20160430'),
+]
+
+configopts = '--enable-pic --enable-shared --enable-gpl --enable-version3 --enable-nonfree --cc="$CC" --cxx="$CXX" '
+configopts += '--enable-libx264'
+
+sanity_check_paths = {
+    'files': ['bin/ff%s' % x for x in ['mpeg', 'probe', 'server']] +
+             ['lib/lib%s.%s' % (x, y) for x in ['avdevice', 'avfilter', 'avformat', 'avcodec', 'postproc',
+                                                'swresample', 'swscale', 'avutil'] for y in ['so', 'a']],
+    'dirs': ['include']
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FLAC/FLAC-1.3.1-foss-2015a.eb b/easybuild/easyconfigs/f/FLAC/FLAC-1.3.1-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..76be36ffc6f0dcfa6d1288cd42bd333a52d99e7c
--- /dev/null
+++ b/easybuild/easyconfigs/f/FLAC/FLAC-1.3.1-foss-2015a.eb
@@ -0,0 +1,30 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Author:    Stephane Thiell <sthiell@stanford.edu>
+###
+
+easyblock = 'ConfigureMake'
+
+name = 'FLAC'
+version = '1.3.1'
+
+homepage = 'https://xiph.org/flac/'
+description = """Programs and libraries for working with Free Lossless Audio Codec (FLAC) files."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_XZ]
+source_urls = ['http://downloads.xiph.org/releases/flac/']
+
+# use of assembly routines requires a recent binutils
+builddependencies = [('binutils', '2.25', '', ('GCC', '4.9.2'))]
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['bin/flac', 'include/FLAC/all.h', 'lib/libFLAC.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/f/FLANN/FLANN-1.8.4-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/f/FLANN/FLANN-1.8.4-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..82bf05536dcaeecf1caf9f94faca9cf00619a0ea
--- /dev/null
+++ b/easybuild/easyconfigs/f/FLANN/FLANN-1.8.4-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,34 @@
+easyblock = 'CMakeMake'
+
+name = 'FLANN'
+version = '1.8.4'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.cs.ubc.ca/research/flann/'
+description = "FLANN is a library for performing fast approximate nearest neighbor searches in high dimensional spaces."
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'openmp': True}
+
+source_urls = ['http://www.cs.ubc.ca/research/flann/uploads/FLANN/']
+sources = ['flann-%(version)s-src.zip']
+
+builddependencies = [('CMake', '3.5.2')]
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+separate_build_dir = True
+
+configopts = "-DCMAKE_BUILD_TYPE=Release -DUSE_OPENMP=ON -DUSE_MPI=ON -DBUILD_PYTHON_BINDINGS=ON -DBUILD_C_BINDINGS=ON"
+
+modextrapaths = {'PYTHONPATH': ['share/flann/python']}
+
+sanity_check_paths = {
+    'files': ['lib/libflann_cpp_s.a', 'lib/libflann_s.a',
+              'lib/libflann_cpp.%s' % SHLIB_EXT, 'lib/libflann.%s' % SHLIB_EXT],
+    'dirs': ['include/flann', 'lib/pkgconfig', 'share/doc/flann', 'share/flann/python'],
+}
+sanity_check_commands = [('python', '-c "import pyflann"')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/f/FLASH/FLASH-1.2.11-foss-2016a.eb b/easybuild/easyconfigs/f/FLASH/FLASH-1.2.11-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5212c8b65816b4a10f49c486d5f30dbafa47ec62
--- /dev/null
+++ b/easybuild/easyconfigs/f/FLASH/FLASH-1.2.11-foss-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'MakeCp'
+
+name = 'FLASH'
+version = '1.2.11'
+
+homepage = 'https://ccb.jhu.edu/software/FLASH/'
+description = """FLASH (Fast Length Adjustment of SHort reads) is a very fast and accurate software
+  tool to merge paired-end reads from next-generation sequencing experiments. FLASH is designed to
+  merge pairs of reads when the original DNA fragments are shorter than twice the length of reads.
+  The resulting longer reads can significantly improve genome assemblies. They can also improve
+  transcriptome assembly when FLASH is used to merge RNA-seq data."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://download.sourceforge.net/%(namelower)spage']
+sources = [SOURCE_TAR_GZ]
+
+files_to_copy = [(['flash'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/flash'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/f/FLEUR/FLEUR-0.26e-intel-2016a.eb b/easybuild/easyconfigs/f/FLEUR/FLEUR-0.26e-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d7d711211d473aafbd04bb0bf2a34fd72fd3e4cd
--- /dev/null
+++ b/easybuild/easyconfigs/f/FLEUR/FLEUR-0.26e-intel-2016a.eb
@@ -0,0 +1,45 @@
+easyblock = 'MakeCp'
+
+name = 'FLEUR'
+version = '0.26e'
+
+homepage = 'http://www.flapw.de/'
+description = """FLEUR is a feature-full, freely available FLAPW (full potential linearized augmented planewave) code,
+ based on density-functional theory."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'usempi': True, 'r8': True}
+
+# dowload requires registration, see http://www.flapw.de/pm/index.php?n=FLEUR.Downloads
+sources = ['v%s.tgz' % version.split('.')[1]]
+
+builddependencies = [('imake', '1.0.7')]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+    ('HDF5', '1.8.16'),
+#    ('Wannier90', '2.0.1'),  # only needed if '#define wann' is added to Imakefile
+]
+
+# define hardware platform to be 'parallel intel compiler, 64 bit, use scalapack')
+prebuildopts = "sed -i 's/^#define jureca/#define linux_evp_64/g' Imakefile && "
+# don't specialize for systems with structural symmetry
+prebuildopts += "sed -i 's/^#define inversion//g' Imakefile && "
+# no need to jump through hoops to make compilation work with older Fortran compilers
+prebuildopts += "sed -i 's/^#define f_90//g' Imakefile && "
+
+prebuildopts += "imake && "
+buildopts = 'FC="$FC" FFLAGS="$FFLAGS" HDFROOT=$EBROOTHDF5 fleur.x inpgen.x'
+
+# parallel build tends to fail
+parallel = 1
+
+files_to_copy = [(['fleur.x', 'inpgen.x'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/fleur.x', 'bin/inpgen.x'],
+    'dirs': [],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-foss-2016a.eb b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..650bf33743fd9537b4323a606883597ad021765e
--- /dev/null
+++ b/easybuild/easyconfigs/f/FLTK/FLTK-1.3.3-foss-2016a.eb
@@ -0,0 +1,37 @@
+#
+# author: Dina Mahmoud Ibrahim ( Cairo University )
+#
+easyblock = 'ConfigureMake'
+
+name = 'FLTK'
+version = '1.3.3'
+
+homepage = 'http://www.fltk.org'
+description = """FLTK is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows,
+ and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL
+ and its built-in GLUT emulation."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = ['%(namelower)s-%(version)s-source.tar.gz']
+source_urls = ['http://fltk.org/pub/%(namelower)s/%(version)s/']
+
+
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('libXcursor', '1.1.14'),
+    ('libXinerama', '1.1.3'),
+    ('Mesa', '11.1.2'),
+    ('libGLU', '9.0.0'),
+    ('libpng', '1.6.21'),
+    ('libjpeg-turbo', '1.4.2'),
+    ('xprop', '1.2.2'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/fltk-config', 'bin/fluid'],
+    'dirs': ['lib'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/FSL/FSL-5.0.9-intel-2016a.eb b/easybuild/easyconfigs/f/FSL/FSL-5.0.9-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5b9dfba11bf116530866c8e54737ce2c5f3cc506
--- /dev/null
+++ b/easybuild/easyconfigs/f/FSL/FSL-5.0.9-intel-2016a.eb
@@ -0,0 +1,25 @@
+name = 'FSL'
+version = '5.0.9'
+
+homepage = 'http://www.fmrib.ox.ac.uk/fsl/'
+description = """FSL is a comprehensive library of analysis tools for FMRI, MRI and DTI brain imaging data."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ["http://www.fmrib.ox.ac.uk/fsldownloads/"]
+sources = ['%(namelower)s-%(version)s-sources.tar.gz']
+
+patches = [
+    'FSL-%(version)s_makefile_fixes.patch',
+    'FSL-%(version)s_missing_lib.patch',
+    'FSL_icc_nan-inf_fix.patch',
+]
+
+dependencies = [
+    ('freeglut', '3.0.0'),
+    ('expat', '2.1.0'),
+    ('libX11', '1.6.3'),
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/f/FSL/FSL-5.0.9_missing_lib.patch b/easybuild/easyconfigs/f/FSL/FSL-5.0.9_missing_lib.patch
new file mode 100644
index 0000000000000000000000000000000000000000..40e5baff2f0ff261643eeefae732f55f28e7b651
--- /dev/null
+++ b/easybuild/easyconfigs/f/FSL/FSL-5.0.9_missing_lib.patch
@@ -0,0 +1,14 @@
+# On RHEL 7 and friends, you need to link to libglapi too
+# Ward Poelmans <ward.poelmans@ugent.be>
+diff -ur fsl.oirg/src/fslsurface/Makefile fsl/src/fslsurface/Makefile
+--- fsl.oirg/src/fslsurface/Makefile    2014-02-24 12:09:05.000000000 +0100
++++ fsl/src/fslsurface/Makefile 2016-04-21 18:03:50.246117983 +0200
+@@ -37,7 +37,7 @@
+ USRLDFLAGS = -L${LIB_NEWMAT}  -L${LIB_PROB} -L${LIB_ZLIB}
+ 
+ 
+-LIBS=-lgiftiio -lexpat -lfirst_lib -lmeshclass
++LIBS=-lgiftiio -lexpat -lfirst_lib -lmeshclass -lglapi
+ 
+ APPLY_ZLIB = -DHAVE_ZLIB
+ 
diff --git a/easybuild/easyconfigs/f/FastQC/FastQC-0.11.5-Java-1.7.0_80.eb b/easybuild/easyconfigs/f/FastQC/FastQC-0.11.5-Java-1.7.0_80.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f6dbacc9e2aa15de1cbc18f69adfdfedb7c27cad
--- /dev/null
+++ b/easybuild/easyconfigs/f/FastQC/FastQC-0.11.5-Java-1.7.0_80.eb
@@ -0,0 +1,32 @@
+easyblock = 'PackedBinary'
+
+name = 'FastQC'
+version = '0.11.5'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'http://www.bioinformatics.babraham.ac.uk/projects/fastqc/'
+description = """FastQC is a quality control application for high throughput sequence data.
+ It reads in sequence data in a variety of formats and can either provide an interactive
+ application to review the results of several different QC checks, or create an HTML based
+ report which can be integrated into a pipeline."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://www.bioinformatics.babraham.ac.uk/projects/%(namelower)s']
+sources = ['%(namelower)s_v%(version)s.zip']
+
+patches = ['FastQC_shebang.patch']
+
+dependencies = [('Java', '1.7.0_80')]
+
+postinstallcmds = ["chmod +x %(installdir)s/fastqc"]
+
+sanity_check_paths = {
+    'files': ['fastqc', 'fastqc_icon.ico', 'INSTALL.txt', 'jbzip2-0.9.jar', 'LICENSE.txt', 'LICENSE_JHDF5.txt',
+              'README.txt', 'RELEASE_NOTES.txt', 'run_fastqc.bat', 'sam-1.103.jar', 'cisd-jhdf5.jar'],
+    'dirs': ['Configuration', 'Help', 'Templates', 'uk', 'net', 'org'],
+}
+
+sanity_check_commands = [('fastqc', '-v')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/f/FastQC/FastQC-0.11.5-Java-1.8.0_74.eb b/easybuild/easyconfigs/f/FastQC/FastQC-0.11.5-Java-1.8.0_74.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7b8be6500dd186f2c784666549a8a718522010e8
--- /dev/null
+++ b/easybuild/easyconfigs/f/FastQC/FastQC-0.11.5-Java-1.8.0_74.eb
@@ -0,0 +1,32 @@
+easyblock = 'PackedBinary'
+
+name = 'FastQC'
+version = '0.11.5'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'http://www.bioinformatics.babraham.ac.uk/projects/fastqc/'
+description = """FastQC is a quality control application for high throughput sequence data.
+ It reads in sequence data in a variety of formats and can either provide an interactive
+ application to review the results of several different QC checks, or create an HTML based
+ report which can be integrated into a pipeline."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://www.bioinformatics.babraham.ac.uk/projects/%(namelower)s']
+sources = ['%(namelower)s_v%(version)s.zip']
+
+patches = ['FastQC_shebang.patch']
+
+dependencies = [('Java', '1.8.0_74')]
+
+postinstallcmds = ["chmod +x %(installdir)s/fastqc"]
+
+sanity_check_paths = {
+    'files': ['fastqc', 'fastqc_icon.ico', 'INSTALL.txt', 'jbzip2-0.9.jar', 'LICENSE.txt', 'LICENSE_JHDF5.txt',
+              'README.txt', 'RELEASE_NOTES.txt', 'run_fastqc.bat', 'sam-1.103.jar', 'cisd-jhdf5.jar'],
+    'dirs': ['Configuration', 'Help', 'Templates', 'uk', 'net', 'org'],
+}
+
+sanity_check_commands = [('fastqc', '-v')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/f/file/file-5.17-GCC-4.8.2.eb b/easybuild/easyconfigs/f/file/file-5.17-GCC-4.8.2.eb
index 63db8305d5a81ee034b3a260ab80a7dfbe24355a..bca5d6950841fc77e87458ed55016f32fd63784c 100644
--- a/easybuild/easyconfigs/f/file/file-5.17-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/f/file/file-5.17-GCC-4.8.2.eb
@@ -12,14 +12,14 @@ homepage = 'http://www.darwinsys.com/file/'
 description = """The file command is 'a file type guesser', that is, a command-line tool
  that tells you in words what kind of data a file contains."""
 
+toolchain = {'name': 'GCC', 'version': '4.8.2'}
+
 source_urls = ['ftp://ftp.astron.com/pub/file/']
 sources = [SOURCE_TAR_GZ]
 
-toolchain = {'name': 'GCC', 'version': '4.8.2'}
-
 sanity_check_paths = {
-    'files': ['bin/file'],
-    'dirs': []
+    'files': ['bin/file', 'include/magic.h', 'lib/libmagic.%s' % SHLIB_EXT],
+    'dirs': ['share']
 }
 
 moduleclass = 'system'
diff --git a/easybuild/easyconfigs/f/file/file-5.25-intel-2016a.eb b/easybuild/easyconfigs/f/file/file-5.25-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..61f8e29397861eb43ff3b2ec6d7e5ae2b49a7062
--- /dev/null
+++ b/easybuild/easyconfigs/f/file/file-5.25-intel-2016a.eb
@@ -0,0 +1,25 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'file'
+version = '5.25'
+
+homepage = 'http://www.darwinsys.com/file/'
+description = """The file command is 'a file type guesser', that is, a command-line tool
+ that tells you in words what kind of data a file contains."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['ftp://ftp.astron.com/pub/file/']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/file', 'include/magic.h', 'lib/libmagic.%s' % SHLIB_EXT],
+    'dirs': ['share']
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-foss-2016a.eb b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b04efa3b3acc51b4f2b283745cf71e6db42672ce
--- /dev/null
+++ b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-foss-2016a.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'fixesproto'
+version = '5.0'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X.org FixesProto protocol headers."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_PROTO_SOURCE]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/xfixesproto.h', 'include/X11/extensions/xfixeswire.h'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-gimkl-2.11.5.eb b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-gimkl-2.11.5.eb
index 88fa55c14db33d01979e69594722e051c7c0366d..1deb262347d6cec0b6b1daa4ce3fad21644c23d8 100644
--- a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-gimkl-2.11.5.eb
@@ -9,7 +9,7 @@ description = """X.org FixesProto protocol headers."""
 toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/xfixesproto.h', 'include/X11/extensions/xfixeswire.h'],
diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-goolf-1.4.10.eb b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-goolf-1.4.10.eb
index 80e72c01e5bb3b8b04659e2067134a22e720b622..574d6d02de60f8acae56a1410fe186783d7d5104 100644
--- a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ description = """X.org FixesProto protocol headers."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/xfixesproto.h', 'include/X11/extensions/xfixeswire.h'],
diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb
index c52db08f490f4e4e4d1dcdc398943c33a72e4684..15154dbbea85ea9a5b64fd770dd2c1323dfd3c9e 100644
--- a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ description = """X.org FixesProto protocol headers."""
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/xfixesproto.h', 'include/X11/extensions/xfixeswire.h'],
diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-5.3.0.eb b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-5.3.0.eb
index 06e3d71fbaec6a89a48ba660d029649d15a409d7..4df2be2be9ab59e57e748bfb0245722c1b817f7e 100644
--- a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-ictce-5.3.0.eb
@@ -9,7 +9,7 @@ description = """X.org FixesProto protocol headers."""
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/xfixesproto.h', 'include/X11/extensions/xfixeswire.h'],
diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-intel-2015a.eb b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-intel-2015a.eb
index 5d430a5301ff2097bd77b34744024402eba4b2a2..8b11789fcafe67943b1d888619934c8d6a24554a 100644
--- a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-intel-2015a.eb
@@ -9,7 +9,7 @@ description = """X.org FixesProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/xfixesproto.h', 'include/X11/extensions/xfixeswire.h'],
diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-intel-2015b.eb b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-intel-2015b.eb
index 3fe841d973935304390ec3285222255a7ec09ff2..fd373c373ac0b18c8db9c4fd48c59003d950f6f6 100644
--- a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-intel-2015b.eb
@@ -9,7 +9,7 @@ description = """X.org FixesProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/xfixesproto.h', 'include/X11/extensions/xfixeswire.h'],
diff --git a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-intel-2016a.eb b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-intel-2016a.eb
index 33951308af68a4f506e2ed0c727bc31482a23d58..f26ed2df7ac7bb5e12118867ec0c210a1827721c 100644
--- a/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-intel-2016a.eb
+++ b/easybuild/easyconfigs/f/fixesproto/fixesproto-5.0-intel-2016a.eb
@@ -9,7 +9,7 @@ description = """X.org FixesProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2016a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/xfixesproto.h', 'include/X11/extensions/xfixeswire.h'],
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-CrayGNU-2015.06.eb
similarity index 87%
rename from easybuild/easyconfigs/f/flex/flex-2.5.39-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/f/flex/flex-2.5.39-CrayGNU-2015.06.eb
index d9b2e6f439e250edaa5289424a7ce6e72e2e70c2..24e3dfb5dc336b8cad4e650054195077c7496dce 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.39-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-CrayGNU-2015.06.eb
@@ -5,7 +5,7 @@ homepage = 'http://flex.sourceforge.net/'
 description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, 
  sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-CrayGNU-2015.11.eb
similarity index 87%
rename from easybuild/easyconfigs/f/flex/flex-2.5.39-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/f/flex/flex-2.5.39-CrayGNU-2015.11.eb
index 7fbee438c59e031b996a89299a9df25c06ad93e5..8c57faa30991446979874b6897cd22216ae6b6b3 100644
--- a/easybuild/easyconfigs/f/flex/flex-2.5.39-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-CrayGNU-2015.11.eb
@@ -5,7 +5,7 @@ homepage = 'http://flex.sourceforge.net/'
 description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, 
  sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-GCCcore-4.9.2.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCCcore-4.9.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..71675a8b5cf7215ebdc4aa4a09783a1e834e7e93
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-GCCcore-4.9.2.eb
@@ -0,0 +1,19 @@
+name = 'flex'
+version = '2.5.39'
+
+homepage = 'http://flex.sourceforge.net/'
+description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner,
+ sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.2'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+# use same binutils version that was used when building GCCcore toolchain
+builddependencies = [
+    ('M4', '1.4.17'),
+    ('binutils', '2.25', '', True)
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..154963c1c85cc6f2b946d83fb270a96e19cb018c
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.5.39-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,14 @@
+name = 'flex'
+version = '2.5.39'
+
+homepage = 'http://flex.sourceforge.net/'
+description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner,
+ sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-4.9.3.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4015f4129186587d66c5fad9158d35c5a271c6c4
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-4.9.3.eb
@@ -0,0 +1,21 @@
+name = 'flex'
+version = '2.6.0'
+
+homepage = 'http://flex.sourceforge.net/'
+description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner,
+ sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+dependencies = [('Bison', '3.0.4')]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.25', '', True)]
+
+parallel = 1
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-5.3.0.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e1a943777464a69db10ab7b224b2bd5116257f58
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0-GCCcore-5.3.0.eb
@@ -0,0 +1,21 @@
+name = 'flex'
+version = '2.6.0'
+
+homepage = 'http://flex.sourceforge.net/'
+description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner,
+ sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
+
+toolchain = {'name': 'GCCcore', 'version': '5.3.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+dependencies = [('Bison', '3.0.4')]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.26', '', True)]
+
+parallel = 1
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/flex/flex-2.6.0.eb b/easybuild/easyconfigs/f/flex/flex-2.6.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e7580df4ae2d27389ac5ad52e49caf6295a1b414
--- /dev/null
+++ b/easybuild/easyconfigs/f/flex/flex-2.6.0.eb
@@ -0,0 +1,16 @@
+name = 'flex'
+version = '2.6.0'
+
+homepage = 'http://flex.sourceforge.net/'
+description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners. A scanner, 
+ sometimes called a tokenizer, is a program which recognizes lexical patterns in text."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+dependencies = [('Bison', '3.0.4')]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.94-foss-2016a.eb b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.94-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d955835431314f03ef5685bb23f6c1f469b2f4c3
--- /dev/null
+++ b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.94-foss-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'fontconfig'
+version = '2.11.94'
+
+homepage = 'http://www.freedesktop.org/software/fontconfig'
+description = """Fontconfig is a library designed to provide system-wide font configuration, customization and
+application access."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.freedesktop.org/software/fontconfig/release/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('expat', '2.1.0'),
+    ('freetype', '2.6.2'),
+]
+
+configopts = '--disable-docs '
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.95-foss-2016a.eb b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.95-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..93a5699fb5577bd4970d78c8fa48441098162698
--- /dev/null
+++ b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.95-foss-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'fontconfig'
+version = '2.11.95'
+
+homepage = 'http://www.freedesktop.org/software/fontconfig'
+description = """Fontconfig is a library designed to provide system-wide font configuration, customization and
+application access."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.freedesktop.org/software/fontconfig/release/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('expat', '2.1.1'),
+    ('freetype', '2.6.3'),
+]
+
+configopts = '--disable-docs '
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.95-intel-2016a.eb b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.95-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..09b5a490888d0c0a3cba1a72e3bf82a737c292db
--- /dev/null
+++ b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.11.95-intel-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'fontconfig'
+version = '2.11.95'
+
+homepage = 'http://www.freedesktop.org/software/fontconfig'
+description = """Fontconfig is a library designed to provide system-wide font configuration, customization and
+application access."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://www.freedesktop.org/software/fontconfig/release/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('expat', '2.1.1'),
+    ('freetype', '2.6.3'),
+]
+
+configopts = '--disable-docs '
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-foss-2016a.eb b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1fbffb27588efc6c82d37f505ba0e96a0ed0aef6
--- /dev/null
+++ b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-foss-2016a.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'fontsproto'
+version = '2.1.3'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = "X11 font extension wire protocol"
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_PROTO_SOURCE]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['include/X11/fonts'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-gimkl-2.11.5.eb b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-gimkl-2.11.5.eb
index 0719ec51f469e4f1bac78111cbf5ff491e5c907d..8e577e277b2e6ff595f523fe19ef4eed3facb7c9 100644
--- a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-gimkl-2.11.5.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': [],
diff --git a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015a.eb b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015a.eb
index 6c5ce993873e7f5c7bc3475680d36e78c998aae5..47f2d3c961f7262b6053e69bd5ca0d223e9580a7 100644
--- a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015a.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': [],
diff --git a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015b.eb b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015b.eb
index 5c83a62b97f110f575b7046df964205e3d44cd96..062cfdbcf85c80d376e4e66b02c79577ec814d73 100644
--- a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015b.eb
+++ b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2015b.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': [],
diff --git a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2016a.eb b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2016a.eb
index 5b1c1517ba9fd32526c995e76cc4e99ef739d60c..9c00b32506d3366db2c62d0738c75afeb56cfc02 100644
--- a/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2016a.eb
+++ b/easybuild/easyconfigs/f/fontsproto/fontsproto-2.1.3-intel-2016a.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': [],
diff --git a/easybuild/easyconfigs/f/foss/foss-2016.04.eb b/easybuild/easyconfigs/f/foss/foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b70b879a23795ec2976966775c479b4ff14f06a9
--- /dev/null
+++ b/easybuild/easyconfigs/f/foss/foss-2016.04.eb
@@ -0,0 +1,35 @@
+easyblock = 'Toolchain'
+
+name = 'foss'
+version = '2016.04'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain, including
+ OpenMPI for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+gccver = '5.3.0-2.26'
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.18'
+blas = '%s-%s' % (blaslib, blasver)
+blassuff = '-LAPACK-3.6.0'
+
+# toolchain used to build foss dependencies
+comp_mpi_tc_name = 'gompi'
+comp_mpi_tc = (comp_mpi_tc_name, version)
+
+# compiler toolchain depencies
+# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain
+# because of toolchain preperation functions
+# For binutils, stick to http://wiki.osdev.org/Cross-Compiler_Successful_Builds
+dependencies = [
+    ('GCC', gccver),
+    ('OpenMPI', '1.10.2', '', ('GCC', gccver)),
+    (blaslib, blasver, blassuff, ('GCC', gccver)),
+    ('FFTW', '3.3.4', '', comp_mpi_tc),
+    ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-3.0.0-foss-2016a-Mesa-11.2.1.eb b/easybuild/easyconfigs/f/freeglut/freeglut-3.0.0-foss-2016a-Mesa-11.2.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1965349120d771320ee1751d89bbd458efd15b57
--- /dev/null
+++ b/easybuild/easyconfigs/f/freeglut/freeglut-3.0.0-foss-2016a-Mesa-11.2.1.eb
@@ -0,0 +1,40 @@
+easyblock = 'CMakeMake'
+
+name = 'freeglut'
+version = '3.0.0'
+
+homepage = 'http://freeglut.sourceforge.net/'
+description = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(name)s']
+
+mesa_ver = '11.2.1'
+versionsuffix = '-Mesa-%s' % mesa_ver
+
+builddependencies = [('CMake', '3.4.3')]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('libXext', '1.3.3'),
+    ('libXrandr', '1.5.0'),
+    ('libXi', '1.7.6'),
+    ('Mesa', mesa_ver),
+]
+
+configopts = ' -DX11_X11_LIB="$EBROOTLIBX11/lib/libX11.so" '
+configopts += ' -DX11_X11_INCLUDE_PATH="$EBROOTLIBX11/include/X11" '
+configopts += ' -DX11_Xext_LIB="$EBROOTLIBXEXT/lib/libXext.so" '
+configopts += ' -DX11_Xrandr_LIB="$EBROOTLIBXRANDR/lib/libXrandr.so" '
+configopts += ' -DX11_Xrandr_INCLUDE_PATH="$EBROOTLIBXRANDR/include/X11/extensions/" '
+configopts += ' -DX11_Xi_LIB="$EBROOTLIBXIlib/libXrandr.so" '
+configopts += ' -DX11_Xi_INCLUDE_PATH="$EBROOTLIBXI/include/X11/extensions/" '
+
+sanity_check_paths = {
+    'files': [('lib/libglut.a', 'lib64/libglut.a'), ('lib/libglut.%s' % SHLIB_EXT, 'lib64/libglut.%s' % SHLIB_EXT)],
+    'dirs': ['include/GL'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-3.0.0-foss-2016a.eb b/easybuild/easyconfigs/f/freeglut/freeglut-3.0.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..aa4fa34ea22d6438c43103e1a29f66429bf0e9b6
--- /dev/null
+++ b/easybuild/easyconfigs/f/freeglut/freeglut-3.0.0-foss-2016a.eb
@@ -0,0 +1,37 @@
+easyblock = 'CMakeMake'
+
+name = 'freeglut'
+version = '3.0.0'
+
+homepage = 'http://freeglut.sourceforge.net/'
+description = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(name)s']
+
+builddependencies = [('CMake', '3.4.3')]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('libXext', '1.3.3'),
+    ('libXrandr', '1.5.0'),
+    ('libXi', '1.7.6'),
+    ('Mesa', '11.1.2'),
+]
+
+configopts = ' -DX11_X11_LIB="$EBROOTLIBX11/lib/libX11.so" '
+configopts += ' -DX11_X11_INCLUDE_PATH="$EBROOTLIBX11/include/X11" '
+configopts += ' -DX11_Xext_LIB="$EBROOTLIBXEXT/lib/libXext.so" '
+configopts += ' -DX11_Xrandr_LIB="$EBROOTLIBXRANDR/lib/libXrandr.so" '
+configopts += ' -DX11_Xrandr_INCLUDE_PATH="$EBROOTLIBXRANDR/include/X11/extensions/" '
+configopts += ' -DX11_Xi_LIB="$EBROOTLIBXIlib/libXrandr.so" '
+configopts += ' -DX11_Xi_INCLUDE_PATH="$EBROOTLIBXI/include/X11/extensions/" '
+
+sanity_check_paths = {
+    'files': [('lib/libglut.a', 'lib64/libglut.a'), ('lib/libglut.%s' % SHLIB_EXT, 'lib64/libglut.%s' % SHLIB_EXT)],
+    'dirs': ['include/GL'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6.2-foss-2016a.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3111a314be1d335be306892eb54230a67e4fb812
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.2-foss-2016a.eb
@@ -0,0 +1,21 @@
+name = 'freetype'
+version = '2.6.2'
+
+homepage = 'http://freetype.org'
+description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and
+ portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display
+ servers, font conversion tools, text image generation tools, and many other products as well."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('libpng', '1.6.21')]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT, 'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6.3-foss-2016a.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bc610c637e09e0c08336acbbe80fe5837022c229
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.3-foss-2016a.eb
@@ -0,0 +1,22 @@
+name = 'freetype'
+version = '2.6.3'
+
+homepage = 'http://freetype.org'
+description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and
+ portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display
+ servers, font conversion tools, text image generation tools, and many other products as well."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('libpng', '1.6.21')]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT,
+              'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/f/freetype/freetype-2.6.3-intel-2016a.eb b/easybuild/easyconfigs/f/freetype/freetype-2.6.3-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6245460dc23afc9577f6deaf6f3f21d4296c981d
--- /dev/null
+++ b/easybuild/easyconfigs/f/freetype/freetype-2.6.3-intel-2016a.eb
@@ -0,0 +1,22 @@
+name = 'freetype'
+version = '2.6.3'
+
+homepage = 'http://freetype.org'
+description = """FreeType 2 is a software font engine that is designed to be small, efficient, highly customizable, and
+ portable while capable of producing high-quality output (glyph images). It can be used in graphics libraries, display
+ servers, font conversion tools, text image generation tools, and many other products as well."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('libpng', '1.6.21')]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.%s' % SHLIB_EXT,
+              'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GATK/GATK-3.5-Java-1.8.0_74.eb b/easybuild/easyconfigs/g/GATK/GATK-3.5-Java-1.8.0_74.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c52824dc923673d3c41c8a119ce49b1e28ac8fa0
--- /dev/null
+++ b/easybuild/easyconfigs/g/GATK/GATK-3.5-Java-1.8.0_74.eb
@@ -0,0 +1,40 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 Cyprus Institute / CaSToRC, University of Luxembourg / LCSB
+# Authors::   George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Fotis Georgatos <fotis.georgatos@uni.lu>, Kenneth Hoste (UGent)
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+easyblock = 'Tarball'
+
+name = 'GATK'
+version = '3.5'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'http://www.broadinstitute.org/gatk/'
+description = """The Genome Analysis Toolkit or GATK is a software package developed at the Broad Institute 
+ to analyse next-generation resequencing data. The toolkit offers a wide variety of tools,
+ with a primary focus on variant discovery and genotyping as well as strong emphasis on 
+ data quality assurance. Its robust architecture, powerful processing engine and 
+ high-performance computing features make it capable of taking on projects of any size."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+# download manually from http://www.broadinstitute.org/gatk/download
+sources = ['GenomeAnalysisTK-%(version)s.tar.bz2']
+
+dependencies = [('Java', '1.8.0_74')]
+
+modloadmsg = """To execute GATK run: java -jar \\$EBROOTGATK/GenomeAnalysisTK.jar"""
+
+sanity_check_paths = {
+    'files': ["GenomeAnalysisTK.jar"],
+    'dirs': ["resources"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GCC/GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/g/GCC/GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..34bf1f36a8eb137e603623c0b622df2ff8c7ed17
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCC/GCC-5.3.0-2.26.eb
@@ -0,0 +1,25 @@
+easyblock = 'Bundle'
+
+name = 'GCC'
+version = '5.3.0'
+
+binutilsver = '2.26'
+versionsuffix = '-%s' % binutilsver
+
+homepage = 'http://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
+ as well as libraries for these languages (libstdc++, libgcj,...)."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+dependencies = [
+    ('GCCcore', version),
+    # binutils built on top of GCCcore, which was built on top of (dummy-built) binutils
+    ('binutils', binutilsver, '', ('GCCcore', version)),
+]
+
+altroot = 'GCCcore'
+altversion = 'GCCcore'
+
+# this bundle serves as a compiler-only toolchain, so it should be marked as compiler (important for HMNS)
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GCCcore/GCCcore-4.9.2.eb b/easybuild/easyconfigs/g/GCCcore/GCCcore-4.9.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..01f4776c64c4627f65b18f7407d6c2bc3d3c22ab
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-4.9.2.eb
@@ -0,0 +1,48 @@
+easyblock = 'EB_GCC'
+
+name = 'GCCcore'
+version = '4.9.2'
+
+homepage = 'http://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
+ as well as libraries for these languages (libstdc++, libgcj,...)."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+mpfr_version = '3.1.2'
+gcc_name = 'GCC'
+
+source_urls = [
+    'http://ftpmirror.gnu.org/gcc/gcc-%s' % version,  # GCC auto-resolving HTTP mirror
+    'http://ftpmirror.gnu.org/gmp',  # idem for GMP
+    'http://ftpmirror.gnu.org/mpfr',  # idem for MPFR
+    'http://www.multiprecision.org/mpc/download',  # MPC official
+]
+sources = [
+    '%s-%s.tar.bz2' % (gcc_name.lower(), version),
+    'gmp-6.0.0a.tar.bz2',
+    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpc-1.0.2.tar.gz',
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('binutils', '2.25'),
+]
+
+patches = [('mpfr-%s-allpatches-20141204.patch' % mpfr_version, '../mpfr-%s' % mpfr_version)]
+
+checksums = [
+    '4df8ee253b7f3863ad0b86359cd39c43',     # gcc-4.9.2.tar.bz2
+    'b7ff2d88cae7f8085bd5006096eed470',     # gmp-6.0.0a.tar.bz2
+    '181aa7bb0e452c409f2788a4a7f38476',     # mpfr-3.1.2.tar.gz
+    '68fadff3358fb3e7976c7a398a0af4c3',     # mpc-1.0.2.tar.gz
+    '58aec98d15982f9744a043d2f1c5af82',     # mpfr-3.1.2-allpatches-20141204.patch
+]
+
+languages = ['c', 'c++', 'fortran']
+
+# building GCC sometimes fails if make parallelism is too high, so let's limit it
+maxparallel = 4
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GCCcore/GCCcore-4.9.3.eb b/easybuild/easyconfigs/g/GCCcore/GCCcore-4.9.3.eb
index 268b0526876636af0c7f5e6de8a2e6e7aba2f7d7..a4f11a8fbdad1938453a02d2e5f7b788de3cdc5b 100644
--- a/easybuild/easyconfigs/g/GCCcore/GCCcore-4.9.3.eb
+++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-4.9.3.eb
@@ -10,7 +10,6 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
 toolchain = {'name': 'dummy', 'version': ''}
 
 mpfr_version = '3.1.2'
-gcc_name = 'GCC'
 
 source_urls = [
     'http://ftpmirror.gnu.org/gcc/gcc-%s' % version,  # GCC auto-resolving HTTP mirror
@@ -19,13 +18,16 @@ source_urls = [
     'http://www.multiprecision.org/mpc/download',  # MPC official
 ]
 sources = [
-    '%s-%s.tar.bz2' % (gcc_name.lower(), version),
+    'gcc-%(version)s.tar.bz2',
     'gmp-6.0.0a.tar.bz2',
     'mpfr-%s.tar.gz' % mpfr_version,
     'mpc-1.0.2.tar.gz',
 ]
 
-builddependencies = [('binutils', '2.25')]
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('binutils', '2.25'),
+]
 
 patches = [('mpfr-%s-allpatches-20141204.patch' % mpfr_version, '../mpfr-%s' % mpfr_version)]
 
diff --git a/easybuild/easyconfigs/g/GCCcore/GCCcore-5.3.0.eb b/easybuild/easyconfigs/g/GCCcore/GCCcore-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1f2fc04edbe382762c3f9effff81cf3c4d7f1c5e
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCCcore/GCCcore-5.3.0.eb
@@ -0,0 +1,54 @@
+easyblock = 'EB_GCC'
+
+name = 'GCCcore'
+version = '5.3.0'
+
+homepage = 'http://gcc.gnu.org/'
+description = """The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Java, and Ada,
+ as well as libraries for these languages (libstdc++, libgcj,...)."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+mpfr_version = '3.1.3'
+
+source_urls = [
+    'http://ftpmirror.gnu.org/gcc/gcc-%(version)s',  # GCC auto-resolving HTTP mirror
+    'http://ftpmirror.gnu.org/gmp',  # idem for GMP
+    'http://ftpmirror.gnu.org/mpfr',  # idem for MPFR
+    'http://www.multiprecision.org/mpc/download',  # MPC official
+    'ftp://gcc.gnu.org/pub/gcc/infrastructure/',  # GCC dependencies
+    'http://gcc.cybermirror.org/infrastructure/',  # HTTP mirror for GCC dependencies
+]
+
+sources = [
+    'gcc-%(version)s.tar.bz2',
+    'gmp-6.1.0.tar.bz2',
+    'mpfr-%s.tar.gz' % mpfr_version,
+    'mpc-1.0.3.tar.gz',
+    'isl-0.15.tar.bz2',
+]
+
+patches = [('mpfr-%s-allpatches-20151029.patch' % mpfr_version, '../mpfr-%s' % mpfr_version)]
+
+builddependencies = [
+    ('binutils', '2.26'),
+    ('M4', '1.4.17'),
+]
+
+checksums = [
+    'c9616fd448f980259c31de613e575719',     # gcc-5.3.0.tar.bz2
+    '86ee6e54ebfc4a90b643a65e402c4048',     # gmp-6.1.0.tar.bz2
+    '7b650781f0a7c4a62e9bc8bdaaa0018b',     # mpfr-3.1.3.tar.gz
+    'd6a1d5f8ddea3abd2cc3e98f58352d26',     # mpc-1.0.3.tar.gz
+    '8428efbbc6f6e2810ce5c1ba73ecf98c',     # isl-0.15.tar.bz2
+    '6476b450c3db177b2250f3549362380e',     # mpfr-3.1.3-allpatches-20151029.patch
+]
+
+languages = ['c', 'c++', 'fortran']
+
+withisl = True
+
+# building GCC sometimes fails if make parallelism is too high, so let's limit it
+maxparallel = 4
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/g/GCCcore/mpfr-3.1.3-allpatches-20151029.patch b/easybuild/easyconfigs/g/GCCcore/mpfr-3.1.3-allpatches-20151029.patch
new file mode 100644
index 0000000000000000000000000000000000000000..891831f521e3fc32e59adb76f4dfe42083df1538
--- /dev/null
+++ b/easybuild/easyconfigs/g/GCCcore/mpfr-3.1.3-allpatches-20151029.patch
@@ -0,0 +1,1830 @@
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-02 10:49:23.950112879 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-02 10:49:24.042113845 +0000
+@@ -0,0 +1 @@
++lngamma-and-doc
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-06-19 19:55:09.000000000 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-02 10:49:24.042113845 +0000
+@@ -1 +1 @@
+-3.1.3
++3.1.3-p1
+diff -Naurd mpfr-3.1.3-a/doc/mpfr.texi mpfr-3.1.3-b/doc/mpfr.texi
+--- mpfr-3.1.3-a/doc/mpfr.texi	2015-06-19 19:55:11.000000000 +0000
++++ mpfr-3.1.3-b/doc/mpfr.texi	2015-07-02 10:49:24.018113593 +0000
+@@ -810,13 +810,17 @@
+ When the input point is in the closure of the domain of the mathematical
+ function and an input argument is +0 (resp.@: @minus{}0), one considers
+ the limit when the corresponding argument approaches 0 from above
+-(resp.@: below). If the limit is not defined (e.g., @code{mpfr_log} on
+-@minus{}0), the behavior is specified in the description of the MPFR function.
++(resp.@: below), if possible. If the limit is not defined (e.g.,
++@code{mpfr_sqrt} and @code{mpfr_log} on @minus{}0), the behavior is
++specified in the description of the MPFR function, but must be consistent
++with the rule from the above paragraph (e.g., @code{mpfr_log} on @pom{}0
++gives @minus{}Inf).
+ 
+ When the result is equal to 0, its sign is determined by considering the
+ limit as if the input point were not in the domain: If one approaches 0
+ from above (resp.@: below), the result is +0 (resp.@: @minus{}0);
+-for example, @code{mpfr_sin} on +0 gives +0.
++for example, @code{mpfr_sin} on @minus{}0 gives @minus{}0 and
++@code{mpfr_acos} on 1 gives +0 (in all rounding modes).
+ In the other cases, the sign is specified in the description of the MPFR
+ function; for example @code{mpfr_max} on @minus{}0 and +0 gives +0.
+ 
+@@ -832,8 +836,8 @@
+ @c that advantages in practice), like for any bug fix.
+ Example: @code{mpfr_hypot} on (NaN,0) gives NaN, but @code{mpfr_hypot}
+ on (NaN,+Inf) gives +Inf (as specified in @ref{Special Functions}),
+-since for any finite input @var{x}, @code{mpfr_hypot} on (@var{x},+Inf)
+-gives +Inf.
++since for any finite or infinite input @var{x}, @code{mpfr_hypot} on
++(@var{x},+Inf) gives +Inf.
+ 
+ @node Exceptions, Memory Handling, Floating-Point Values on Special Numbers, MPFR Basics
+ @comment  node-name,  next,  previous,  up
+@@ -1581,7 +1585,8 @@
+ @deftypefunx int mpfr_add_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_add_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1} + @var{op2}} rounded in the direction
+-@var{rnd}. For types having no signed zero, it is considered unsigned
++@var{rnd}.  The IEEE-754 rules are used, in particular for signed zeros.
++But for types having no signed zeros, 0 is considered unsigned
+ (i.e., (+0) + 0 = (+0) and (@minus{}0) + 0 = (@minus{}0)).
+ The @code{mpfr_add_d} function assumes that the radix of the @code{double} type
+ is a power of 2, with a precision at most that declared by the C implementation
+@@ -1599,7 +1604,8 @@
+ @deftypefunx int mpfr_sub_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_sub_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1} - @var{op2}} rounded in the direction
+-@var{rnd}. For types having no signed zero, it is considered unsigned
++@var{rnd}.  The IEEE-754 rules are used, in particular for signed zeros.
++But for types having no signed zeros, 0 is considered unsigned
+ (i.e., (+0) @minus{} 0 = (+0), (@minus{}0) @minus{} 0 = (@minus{}0),
+ 0 @minus{} (+0) = (@minus{}0) and 0 @minus{} (@minus{}0) = (+0)).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_sub}
+@@ -1615,7 +1621,7 @@
+ Set @var{rop} to @math{@var{op1} @GMPtimes{} @var{op2}} rounded in the
+ direction @var{rnd}.
+ When a result is zero, its sign is the product of the signs of the operands
+-(for types having no signed zero, it is considered positive).
++(for types having no signed zeros, 0 is considered positive).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_mul_d}.
+ @end deftypefun
+ 
+@@ -1635,7 +1641,7 @@
+ @deftypefunx int mpfr_div_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1}/@var{op2}} rounded in the direction @var{rnd}.
+ When a result is zero, its sign is the product of the signs of the operands
+-(for types having no signed zero, it is considered positive).
++(for types having no signed zeros, 0 is considered positive).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_div}
+ and @code{mpfr_div_d}.
+ @end deftypefun
+@@ -1643,15 +1649,18 @@
+ @deftypefun int mpfr_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_sqrt_ui (mpfr_t @var{rop}, unsigned long int @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @m{\sqrt{@var{op}}, the square root of @var{op}}
+-rounded in the direction @var{rnd} (set @var{rop} to @minus{}0 if @var{op} is
+-@minus{}0, to be consistent with the IEEE 754 standard).
++rounded in the direction @var{rnd}.  Set @var{rop} to @minus{}0 if
++@var{op} is @minus{}0, to be consistent with the IEEE 754 standard.
+ Set @var{rop} to NaN if @var{op} is negative.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_rec_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @m{1/\sqrt{@var{op}}, the reciprocal square root of @var{op}}
+-rounded in the direction @var{rnd}. Set @var{rop} to +Inf if @var{op} is
+-@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative.
++rounded in the direction @var{rnd}.  Set @var{rop} to +Inf if @var{op} is
++@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative.  Warning!
++Therefore the result on @minus{}0 is different from the one of the rSqrt
++function recommended by the IEEE 754-2008 standard (Section 9.2.1), which
++is @minus{}Inf instead of +Inf.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_cbrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+@@ -1832,7 +1841,9 @@
+ @m{\log_2 @var{op}, log2(@var{op})} or
+ @m{\log_{10} @var{op}, log10(@var{op})}, respectively,
+ rounded in the direction @var{rnd}.
+-Set @var{rop} to @minus{}Inf if @var{op} is @minus{}0
++Set @var{rop} to +0 if @var{op} is 1 (in all rounding modes),
++for consistency with the ISO C99 and IEEE 754-2008 standards.
++Set @var{rop} to @minus{}Inf if @var{op} is @pom{}0
+ (i.e., the sign of the zero has no influence on the result).
+ @end deftypefun
+ 
+@@ -2003,8 +2014,11 @@
+ @deftypefun int mpfr_lngamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to the value of the logarithm of the Gamma function on @var{op},
+ rounded in the direction @var{rnd}.
+-When @math{@minus{}2@var{k}@minus{}1 @le{} @var{op} @le{} @minus{}2@var{k}},
+-@var{k} being a non-negative integer, @var{rop} is set to NaN.
++When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes).
++When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf,
++following the general rules on special values.
++When @math{@minus{}2@var{k}@minus{}1 < @var{op} < @minus{}2@var{k}},
++@var{k} being a nonnegative integer, set @var{rop} to NaN@.
+ See also @code{mpfr_lgamma}.
+ @end deftypefun
+ 
+@@ -2012,10 +2026,11 @@
+ Set @var{rop} to the value of the logarithm of the absolute value of the
+ Gamma function on @var{op}, rounded in the direction @var{rnd}. The sign
+ (1 or @minus{}1) of Gamma(@var{op}) is returned in the object pointed to
+-by @var{signp}. When @var{op} is an infinity or a non-positive integer, set
+-@var{rop} to +Inf. When @var{op} is NaN, @minus{}Inf or a negative integer,
+-*@var{signp} is undefined, and when @var{op} is @pom{}0, *@var{signp} is
+-the sign of the zero.
++by @var{signp}.
++When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes).
++When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf.
++When @var{op} is NaN, @minus{}Inf or a negative integer, *@var{signp} is
++undefined, and when @var{op} is @pom{}0, *@var{signp} is the sign of the zero.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_digamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+@@ -2064,7 +2079,10 @@
+ @deftypefunx int mpfr_fms (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_t @var{op3}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{(@var{op1} @GMPtimes{} @var{op2}) + @var{op3}}
+ (resp.@: @math{(@var{op1} @GMPtimes{} @var{op2}) - @var{op3}})
+-rounded in the direction @var{rnd}.
++rounded in the direction @var{rnd}.  Concerning special values (signed zeros,
++infinities, NaN), these functions behave like a multiplication followed by a
++separate addition or subtraction.  That is, the fused operation matters only
++for rounding.
+ @end deftypefun
+ 
+ @deftypefun int mpfr_agm (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_rnd_t @var{rnd})
+@@ -2089,8 +2107,8 @@
+ i.e., $\sqrt{x^2+y^2}$,
+ @end tex
+ rounded in the direction @var{rnd}.
+-Special values are handled as described in Section F.9.4.3 of
+-the ISO C99 and IEEE 754-2008 standards:
++Special values are handled as described in the ISO C99 (Section F.9.4.3)
++and IEEE 754-2008 (Section 9.2.1) standards:
+ If @var{x} or @var{y} is an infinity, then +Inf is returned in @var{rop},
+ even if the other number is NaN.
+ @end deftypefun
+diff -Naurd mpfr-3.1.3-a/doc/mpfr.info mpfr-3.1.3-b/doc/mpfr.info
+--- mpfr-3.1.3-a/doc/mpfr.info	2015-06-19 19:55:53.000000000 +0000
++++ mpfr-3.1.3-b/doc/mpfr.info	2015-07-02 10:49:38.718267817 +0000
+@@ -1,4 +1,4 @@
+-This is mpfr.info, produced by makeinfo version 5.2 from mpfr.texi.
++This is mpfr.info, produced by makeinfo version 6.0 from mpfr.texi.
+ 
+ This manual documents how to install and use the Multiple Precision
+ Floating-Point Reliable Library, version 3.1.3.
+@@ -55,7 +55,7 @@
+ MPFR Copying Conditions
+ ***********************
+ 
+-The GNU MPFR library (or MPFR for short) is "free"; this means that
++The GNU MPFR library (or MPFR for short) is “free”; this means that
+ everyone is free to use it and free to redistribute it on a free basis.
+ The library is not in the public domain; it is copyrighted and there are
+ restrictions on its distribution, but these restrictions are designed to
+@@ -418,7 +418,7 @@
+ 4.2 Nomenclature and Types
+ ==========================
+ 
+-A "floating-point number", or "float" for short, is an arbitrary
++A “floating-point number”, or “float” for short, is an arbitrary
+ precision significand (also called mantissa) with a limited precision
+ exponent.  The C data type for such objects is ‘mpfr_t’ (internally
+ defined as a one-element array of a structure, and ‘mpfr_ptr’ is the C
+@@ -432,7 +432,7 @@
+ to the other functions supported by MPFR. Unless documented otherwise,
+ the sign bit of a NaN is unspecified.
+ 
+-The "precision" is the number of bits used to represent the significand
++The “precision” is the number of bits used to represent the significand
+ of a floating-point number; the corresponding C data type is
+ ‘mpfr_prec_t’.  The precision can be any integer between ‘MPFR_PREC_MIN’
+ and ‘MPFR_PREC_MAX’.  In the current implementation, ‘MPFR_PREC_MIN’ is
+@@ -446,7 +446,7 @@
+ may abort, crash or have undefined behavior (depending on your C
+ implementation).
+ 
+-The "rounding mode" specifies the way to round the result of a
++The “rounding mode” specifies the way to round the result of a
+ floating-point operation, in case the exact result can not be
+ represented exactly in the destination significand; the corresponding C
+ data type is ‘mpfr_rnd_t’.
+@@ -499,14 +499,14 @@
+ representable numbers, it is rounded to the one with the least
+ significant bit set to zero.  For example, the number 2.5, which is
+ represented by (10.1) in binary, is rounded to (10.0)=2 with a precision
+-of two bits, and not to (11.0)=3.  This rule avoids the "drift"
++of two bits, and not to (11.0)=3.  This rule avoids the “drift”
+ phenomenon mentioned by Knuth in volume 2 of The Art of Computer
+ Programming (Section 4.2.2).
+ 
+    Most MPFR functions take as first argument the destination variable,
+ as second and following arguments the input variables, as last argument
+ a rounding mode, and have a return value of type ‘int’, called the
+-"ternary value".  The value stored in the destination variable is
++“ternary value”.  The value stored in the destination variable is
+ correctly rounded, i.e., MPFR behaves as if it computed the result with
+ an infinite precision, then rounded it to the precision of this
+ variable.  The input variables are regarded as exact (in particular,
+@@ -572,15 +572,18 @@
+    When the input point is in the closure of the domain of the
+ mathematical function and an input argument is +0 (resp. −0), one
+ considers the limit when the corresponding argument approaches 0 from
+-above (resp. below).  If the limit is not defined (e.g., ‘mpfr_log’ on
+-−0), the behavior is specified in the description of the MPFR function.
++above (resp. below), if possible.  If the limit is not defined (e.g.,
++‘mpfr_sqrt’ and ‘mpfr_log’ on −0), the behavior is specified in the
++description of the MPFR function, but must be consistent with the rule
++from the above paragraph (e.g., ‘mpfr_log’ on ±0 gives −Inf).
+ 
+    When the result is equal to 0, its sign is determined by considering
+ the limit as if the input point were not in the domain: If one
+ approaches 0 from above (resp. below), the result is +0 (resp. −0); for
+-example, ‘mpfr_sin’ on +0 gives +0.  In the other cases, the sign is
+-specified in the description of the MPFR function; for example
+-‘mpfr_max’ on −0 and +0 gives +0.
++example, ‘mpfr_sin’ on −0 gives −0 and ‘mpfr_acos’ on 1 gives +0 (in all
++rounding modes).  In the other cases, the sign is specified in the
++description of the MPFR function; for example ‘mpfr_max’ on −0 and +0
++gives +0.
+ 
+    When the input point is not in the closure of the domain of the
+ function, the result is NaN. Example: ‘mpfr_sqrt’ on −17 gives NaN.
+@@ -590,8 +593,8 @@
+ numbers; such a case is always explicitly specified in *note MPFR
+ Interface::.  Example: ‘mpfr_hypot’ on (NaN,0) gives NaN, but
+ ‘mpfr_hypot’ on (NaN,+Inf) gives +Inf (as specified in *note Special
+-Functions::), since for any finite input X, ‘mpfr_hypot’ on (X,+Inf)
+-gives +Inf.
++Functions::), since for any finite or infinite input X, ‘mpfr_hypot’ on
++(X,+Inf) gives +Inf.
+ 
+ 
+ File: mpfr.info,  Node: Exceptions,  Next: Memory Handling,  Prev: Floating-Point Values on Special Numbers,  Up: MPFR Basics
+@@ -1253,8 +1256,9 @@
+           mpfr_rnd_t RND)
+  -- Function: int mpfr_add_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2,
+           mpfr_rnd_t RND)
+-     Set ROP to OP1 + OP2 rounded in the direction RND.  For types
+-     having no signed zero, it is considered unsigned (i.e., (+0) + 0 =
++     Set ROP to OP1 + OP2 rounded in the direction RND.  The IEEE-754
++     rules are used, in particular for signed zeros.  But for types
++     having no signed zeros, 0 is considered unsigned (i.e., (+0) + 0 =
+      (+0) and (−0) + 0 = (−0)).  The ‘mpfr_add_d’ function assumes that
+      the radix of the ‘double’ type is a power of 2, with a precision at
+      most that declared by the C implementation (macro
+@@ -1280,8 +1284,9 @@
+           mpfr_rnd_t RND)
+  -- Function: int mpfr_sub_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2,
+           mpfr_rnd_t RND)
+-     Set ROP to OP1 - OP2 rounded in the direction RND.  For types
+-     having no signed zero, it is considered unsigned (i.e., (+0) − 0 =
++     Set ROP to OP1 - OP2 rounded in the direction RND.  The IEEE-754
++     rules are used, in particular for signed zeros.  But for types
++     having no signed zeros, 0 is considered unsigned (i.e., (+0) − 0 =
+      (+0), (−0) − 0 = (−0), 0 − (+0) = (−0) and 0 − (−0) = (+0)).  The
+      same restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_sub’ and
+      ‘mpfr_sub_d’.
+@@ -1300,7 +1305,7 @@
+           mpfr_rnd_t RND)
+      Set ROP to OP1 times OP2 rounded in the direction RND.  When a
+      result is zero, its sign is the product of the signs of the
+-     operands (for types having no signed zero, it is considered
++     operands (for types having no signed zeros, 0 is considered
+      positive).  The same restrictions than for ‘mpfr_add_d’ apply to
+      ‘mpfr_mul_d’.
+ 
+@@ -1327,21 +1332,24 @@
+           mpfr_rnd_t RND)
+      Set ROP to OP1/OP2 rounded in the direction RND.  When a result is
+      zero, its sign is the product of the signs of the operands (for
+-     types having no signed zero, it is considered positive).  The same
++     types having no signed zeros, 0 is considered positive).  The same
+      restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_div’ and
+      ‘mpfr_div_d’.
+ 
+  -- Function: int mpfr_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_sqrt_ui (mpfr_t ROP, unsigned long int OP,
+           mpfr_rnd_t RND)
+-     Set ROP to the square root of OP rounded in the direction RND (set
+-     ROP to −0 if OP is −0, to be consistent with the IEEE 754
+-     standard).  Set ROP to NaN if OP is negative.
++     Set ROP to the square root of OP rounded in the direction RND.  Set
++     ROP to −0 if OP is −0, to be consistent with the IEEE 754 standard.
++     Set ROP to NaN if OP is negative.
+ 
+  -- Function: int mpfr_rec_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the reciprocal square root of OP rounded in the
+      direction RND.  Set ROP to +Inf if OP is ±0, +0 if OP is +Inf, and
+-     NaN if OP is negative.
++     NaN if OP is negative.  Warning!  Therefore the result on −0 is
++     different from the one of the rSqrt function recommended by the
++     IEEE 754-2008 standard (Section 9.2.1), which is −Inf instead of
++     +Inf.
+ 
+  -- Function: int mpfr_cbrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_root (mpfr_t ROP, mpfr_t OP, unsigned long int K,
+@@ -1515,8 +1523,10 @@
+  -- Function: int mpfr_log2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_log10 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the natural logarithm of OP, log2(OP) or log10(OP),
+-     respectively, rounded in the direction RND.  Set ROP to −Inf if OP
+-     is −0 (i.e., the sign of the zero has no influence on the result).
++     respectively, rounded in the direction RND.  Set ROP to +0 if OP is
++     1 (in all rounding modes), for consistency with the ISO C99 and
++     IEEE 754-2008 standards.  Set ROP to −Inf if OP is ±0 (i.e., the
++     sign of the zero has no influence on the result).
+ 
+  -- Function: int mpfr_exp (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+  -- Function: int mpfr_exp2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+@@ -1649,17 +1659,21 @@
+ 
+  -- Function: int mpfr_lngamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the value of the logarithm of the Gamma function on OP,
+-     rounded in the direction RND.  When −2K−1 <= OP <= −2K, K being a
+-     non-negative integer, ROP is set to NaN. See also ‘mpfr_lgamma’.
++     rounded in the direction RND.  When OP is 1 or 2, set ROP to +0 (in
++     all rounding modes).  When OP is an infinity or a nonpositive
++     integer, set ROP to +Inf, following the general rules on special
++     values.  When −2K−1 < OP < −2K, K being a nonnegative integer, set
++     ROP to NaN.  See also ‘mpfr_lgamma’.
+ 
+  -- Function: int mpfr_lgamma (mpfr_t ROP, int *SIGNP, mpfr_t OP,
+           mpfr_rnd_t RND)
+      Set ROP to the value of the logarithm of the absolute value of the
+      Gamma function on OP, rounded in the direction RND.  The sign (1 or
+      −1) of Gamma(OP) is returned in the object pointed to by SIGNP.
+-     When OP is an infinity or a non-positive integer, set ROP to +Inf.
+-     When OP is NaN, −Inf or a negative integer, *SIGNP is undefined,
+-     and when OP is ±0, *SIGNP is the sign of the zero.
++     When OP is 1 or 2, set ROP to +0 (in all rounding modes).  When OP
++     is an infinity or a nonpositive integer, set ROP to +Inf.  When OP
++     is NaN, −Inf or a negative integer, *SIGNP is undefined, and when
++     OP is ±0, *SIGNP is the sign of the zero.
+ 
+  -- Function: int mpfr_digamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+      Set ROP to the value of the Digamma (sometimes also called Psi)
+@@ -1703,7 +1717,10 @@
+  -- Function: int mpfr_fms (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2, mpfr_t
+           OP3, mpfr_rnd_t RND)
+      Set ROP to (OP1 times OP2) + OP3 (resp. (OP1 times OP2) - OP3)
+-     rounded in the direction RND.
++     rounded in the direction RND.  Concerning special values (signed
++     zeros, infinities, NaN), these functions behave like a
++     multiplication followed by a separate addition or subtraction.
++     That is, the fused operation matters only for rounding.
+ 
+  -- Function: int mpfr_agm (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2,
+           mpfr_rnd_t RND)
+@@ -1717,9 +1734,10 @@
+           RND)
+      Set ROP to the Euclidean norm of X and Y, i.e., the square root of
+      the sum of the squares of X and Y, rounded in the direction RND.
+-     Special values are handled as described in Section F.9.4.3 of the
+-     ISO C99 and IEEE 754-2008 standards: If X or Y is an infinity, then
+-     +Inf is returned in ROP, even if the other number is NaN.
++     Special values are handled as described in the ISO C99 (Section
++     F.9.4.3) and IEEE 754-2008 (Section 9.2.1) standards: If X or Y is
++     an infinity, then +Inf is returned in ROP, even if the other number
++     is NaN.
+ 
+  -- Function: int mpfr_ai (mpfr_t ROP, mpfr_t X, mpfr_rnd_t RND)
+      Set ROP to the value of the Airy function Ai on X, rounded in the
+@@ -2670,7 +2688,7 @@
+ 5.16 Internals
+ ==============
+ 
+-A "limb" means the part of a multi-precision number that fits in a
++A “limb” means the part of a multi-precision number that fits in a
+ single word.  Usually a limb contains 32 or 64 bits.  The C data type
+ for a limb is ‘mp_limb_t’.
+ 
+@@ -3140,7 +3158,7 @@
+   0. PREAMBLE
+ 
+      The purpose of this License is to make a manual, textbook, or other
+-     functional and useful document "free" in the sense of freedom: to
++     functional and useful document “free” in the sense of freedom: to
+      assure everyone the effective freedom to copy and redistribute it,
+      with or without modifying it, either commercially or
+      noncommercially.  Secondarily, this License preserves for the
+@@ -3655,9 +3673,9 @@
+ * Menu:
+ 
+ * mpfr_abs:                              Basic Arithmetic Functions.
+-                                                              (line 160)
+-* mpfr_acos:                             Special Functions.   (line  51)
+-* mpfr_acosh:                            Special Functions.   (line 115)
++                                                              (line 165)
++* mpfr_acos:                             Special Functions.   (line  53)
++* mpfr_acosh:                            Special Functions.   (line 117)
+ * mpfr_add:                              Basic Arithmetic Functions.
+                                                               (line   6)
+ * mpfr_add_d:                            Basic Arithmetic Functions.
+@@ -3670,15 +3688,15 @@
+                                                               (line   8)
+ * mpfr_add_z:                            Basic Arithmetic Functions.
+                                                               (line  14)
+-* mpfr_agm:                              Special Functions.   (line 210)
+-* mpfr_ai:                               Special Functions.   (line 226)
+-* mpfr_asin:                             Special Functions.   (line  52)
+-* mpfr_asinh:                            Special Functions.   (line 116)
++* mpfr_agm:                              Special Functions.   (line 219)
++* mpfr_ai:                               Special Functions.   (line 236)
++* mpfr_asin:                             Special Functions.   (line  54)
++* mpfr_asinh:                            Special Functions.   (line 118)
+ * mpfr_asprintf:                         Formatted Output Functions.
+                                                               (line 193)
+-* mpfr_atan:                             Special Functions.   (line  53)
+-* mpfr_atan2:                            Special Functions.   (line  63)
+-* mpfr_atanh:                            Special Functions.   (line 117)
++* mpfr_atan:                             Special Functions.   (line  55)
++* mpfr_atan2:                            Special Functions.   (line  65)
++* mpfr_atanh:                            Special Functions.   (line 119)
+ * mpfr_buildopt_decimal_p:               Miscellaneous Functions.
+                                                               (line 162)
+ * mpfr_buildopt_gmpinternals_p:          Miscellaneous Functions.
+@@ -3690,7 +3708,7 @@
+ * mpfr_can_round:                        Rounding Related Functions.
+                                                               (line  39)
+ * mpfr_cbrt:                             Basic Arithmetic Functions.
+-                                                              (line 108)
++                                                              (line 113)
+ * mpfr_ceil:                             Integer Related Functions.
+                                                               (line   7)
+ * mpfr_check_range:                      Exception Related Functions.
+@@ -3735,18 +3753,18 @@
+                                                               (line  27)
+ * mpfr_cmp_z:                            Comparison Functions.
+                                                               (line  11)
+-* mpfr_const_catalan:                    Special Functions.   (line 237)
+-* mpfr_const_euler:                      Special Functions.   (line 236)
+-* mpfr_const_log2:                       Special Functions.   (line 234)
+-* mpfr_const_pi:                         Special Functions.   (line 235)
++* mpfr_const_catalan:                    Special Functions.   (line 247)
++* mpfr_const_euler:                      Special Functions.   (line 246)
++* mpfr_const_log2:                       Special Functions.   (line 244)
++* mpfr_const_pi:                         Special Functions.   (line 245)
+ * mpfr_copysign:                         Miscellaneous Functions.
+                                                               (line 109)
+-* mpfr_cos:                              Special Functions.   (line  29)
+-* mpfr_cosh:                             Special Functions.   (line  95)
+-* mpfr_cot:                              Special Functions.   (line  47)
+-* mpfr_coth:                             Special Functions.   (line 111)
+-* mpfr_csc:                              Special Functions.   (line  46)
+-* mpfr_csch:                             Special Functions.   (line 110)
++* mpfr_cos:                              Special Functions.   (line  31)
++* mpfr_cosh:                             Special Functions.   (line  97)
++* mpfr_cot:                              Special Functions.   (line  49)
++* mpfr_coth:                             Special Functions.   (line 113)
++* mpfr_csc:                              Special Functions.   (line  48)
++* mpfr_csch:                             Special Functions.   (line 112)
+ * mpfr_custom_get_exp:                   Custom Interface.    (line  75)
+ * mpfr_custom_get_kind:                  Custom Interface.    (line  65)
+ * mpfr_custom_get_significand:           Custom Interface.    (line  70)
+@@ -3756,47 +3774,47 @@
+ * mpfr_custom_move:                      Custom Interface.    (line  82)
+ * MPFR_DECL_INIT:                        Initialization Functions.
+                                                               (line  74)
+-* mpfr_digamma:                          Special Functions.   (line 166)
++* mpfr_digamma:                          Special Functions.   (line 172)
+ * mpfr_dim:                              Basic Arithmetic Functions.
+-                                                              (line 166)
++                                                              (line 171)
+ * mpfr_div:                              Basic Arithmetic Functions.
+-                                                              (line  72)
++                                                              (line  74)
+ * mpfr_divby0_p:                         Exception Related Functions.
+                                                               (line 134)
+ * mpfr_div_2exp:                         Compatibility with MPF.
+                                                               (line  49)
+ * mpfr_div_2si:                          Basic Arithmetic Functions.
+-                                                              (line 181)
++                                                              (line 186)
+ * mpfr_div_2ui:                          Basic Arithmetic Functions.
+-                                                              (line 179)
++                                                              (line 184)
+ * mpfr_div_d:                            Basic Arithmetic Functions.
+-                                                              (line  84)
++                                                              (line  86)
+ * mpfr_div_q:                            Basic Arithmetic Functions.
+-                                                              (line  88)
++                                                              (line  90)
+ * mpfr_div_si:                           Basic Arithmetic Functions.
+-                                                              (line  80)
++                                                              (line  82)
+ * mpfr_div_ui:                           Basic Arithmetic Functions.
+-                                                              (line  76)
++                                                              (line  78)
+ * mpfr_div_z:                            Basic Arithmetic Functions.
+-                                                              (line  86)
++                                                              (line  88)
+ * mpfr_d_div:                            Basic Arithmetic Functions.
+-                                                              (line  82)
++                                                              (line  84)
+ * mpfr_d_sub:                            Basic Arithmetic Functions.
+-                                                              (line  35)
+-* mpfr_eint:                             Special Functions.   (line 133)
++                                                              (line  36)
++* mpfr_eint:                             Special Functions.   (line 135)
+ * mpfr_eq:                               Compatibility with MPF.
+                                                               (line  28)
+ * mpfr_equal_p:                          Comparison Functions.
+                                                               (line  59)
+ * mpfr_erangeflag_p:                     Exception Related Functions.
+                                                               (line 137)
+-* mpfr_erf:                              Special Functions.   (line 177)
+-* mpfr_erfc:                             Special Functions.   (line 178)
+-* mpfr_exp:                              Special Functions.   (line  23)
+-* mpfr_exp10:                            Special Functions.   (line  25)
+-* mpfr_exp2:                             Special Functions.   (line  24)
+-* mpfr_expm1:                            Special Functions.   (line 129)
+-* mpfr_fac_ui:                           Special Functions.   (line 121)
++* mpfr_erf:                              Special Functions.   (line 183)
++* mpfr_erfc:                             Special Functions.   (line 184)
++* mpfr_exp:                              Special Functions.   (line  25)
++* mpfr_exp10:                            Special Functions.   (line  27)
++* mpfr_exp2:                             Special Functions.   (line  26)
++* mpfr_expm1:                            Special Functions.   (line 131)
++* mpfr_fac_ui:                           Special Functions.   (line 123)
+ * mpfr_fits_intmax_p:                    Conversion Functions.
+                                                               (line 150)
+ * mpfr_fits_sint_p:                      Conversion Functions.
+@@ -3815,20 +3833,20 @@
+                                                               (line 147)
+ * mpfr_floor:                            Integer Related Functions.
+                                                               (line   8)
+-* mpfr_fma:                              Special Functions.   (line 203)
++* mpfr_fma:                              Special Functions.   (line 209)
+ * mpfr_fmod:                             Integer Related Functions.
+                                                               (line  92)
+-* mpfr_fms:                              Special Functions.   (line 205)
++* mpfr_fms:                              Special Functions.   (line 211)
+ * mpfr_fprintf:                          Formatted Output Functions.
+                                                               (line 157)
+ * mpfr_frac:                             Integer Related Functions.
+                                                               (line  76)
+-* mpfr_free_cache:                       Special Functions.   (line 244)
++* mpfr_free_cache:                       Special Functions.   (line 254)
+ * mpfr_free_str:                         Conversion Functions.
+                                                               (line 137)
+ * mpfr_frexp:                            Conversion Functions.
+                                                               (line  45)
+-* mpfr_gamma:                            Special Functions.   (line 148)
++* mpfr_gamma:                            Special Functions.   (line 150)
+ * mpfr_get_d:                            Conversion Functions.
+                                                               (line   7)
+ * mpfr_get_decimal64:                    Conversion Functions.
+@@ -3887,7 +3905,7 @@
+                                                               (line  56)
+ * mpfr_greater_p:                        Comparison Functions.
+                                                               (line  55)
+-* mpfr_hypot:                            Special Functions.   (line 218)
++* mpfr_hypot:                            Special Functions.   (line 227)
+ * mpfr_inexflag_p:                       Exception Related Functions.
+                                                               (line 136)
+ * mpfr_inf_p:                            Comparison Functions.
+@@ -3922,21 +3940,21 @@
+                                                               (line  31)
+ * mpfr_integer_p:                        Integer Related Functions.
+                                                               (line 119)
+-* mpfr_j0:                               Special Functions.   (line 182)
+-* mpfr_j1:                               Special Functions.   (line 183)
+-* mpfr_jn:                               Special Functions.   (line 184)
++* mpfr_j0:                               Special Functions.   (line 188)
++* mpfr_j1:                               Special Functions.   (line 189)
++* mpfr_jn:                               Special Functions.   (line 190)
+ * mpfr_lessequal_p:                      Comparison Functions.
+                                                               (line  58)
+ * mpfr_lessgreater_p:                    Comparison Functions.
+                                                               (line  64)
+ * mpfr_less_p:                           Comparison Functions.
+                                                               (line  57)
+-* mpfr_lgamma:                           Special Functions.   (line 157)
+-* mpfr_li2:                              Special Functions.   (line 143)
+-* mpfr_lngamma:                          Special Functions.   (line 152)
++* mpfr_lgamma:                           Special Functions.   (line 162)
++* mpfr_li2:                              Special Functions.   (line 145)
++* mpfr_lngamma:                          Special Functions.   (line 154)
+ * mpfr_log:                              Special Functions.   (line  16)
+ * mpfr_log10:                            Special Functions.   (line  18)
+-* mpfr_log1p:                            Special Functions.   (line 125)
++* mpfr_log1p:                            Special Functions.   (line 127)
+ * mpfr_log2:                             Special Functions.   (line  17)
+ * mpfr_max:                              Miscellaneous Functions.
+                                                               (line  22)
+@@ -3947,29 +3965,29 @@
+ * mpfr_modf:                             Integer Related Functions.
+                                                               (line  82)
+ * mpfr_mul:                              Basic Arithmetic Functions.
+-                                                              (line  51)
++                                                              (line  53)
+ * mpfr_mul_2exp:                         Compatibility with MPF.
+                                                               (line  47)
+ * mpfr_mul_2si:                          Basic Arithmetic Functions.
+-                                                              (line 174)
++                                                              (line 179)
+ * mpfr_mul_2ui:                          Basic Arithmetic Functions.
+-                                                              (line 172)
++                                                              (line 177)
+ * mpfr_mul_d:                            Basic Arithmetic Functions.
+-                                                              (line  57)
++                                                              (line  59)
+ * mpfr_mul_q:                            Basic Arithmetic Functions.
+-                                                              (line  61)
++                                                              (line  63)
+ * mpfr_mul_si:                           Basic Arithmetic Functions.
+-                                                              (line  55)
++                                                              (line  57)
+ * mpfr_mul_ui:                           Basic Arithmetic Functions.
+-                                                              (line  53)
++                                                              (line  55)
+ * mpfr_mul_z:                            Basic Arithmetic Functions.
+-                                                              (line  59)
++                                                              (line  61)
+ * mpfr_nanflag_p:                        Exception Related Functions.
+                                                               (line 135)
+ * mpfr_nan_p:                            Comparison Functions.
+                                                               (line  39)
+ * mpfr_neg:                              Basic Arithmetic Functions.
+-                                                              (line 159)
++                                                              (line 164)
+ * mpfr_nextabove:                        Miscellaneous Functions.
+                                                               (line  15)
+ * mpfr_nextbelow:                        Miscellaneous Functions.
+@@ -3983,13 +4001,13 @@
+ * mpfr_overflow_p:                       Exception Related Functions.
+                                                               (line 133)
+ * mpfr_pow:                              Basic Arithmetic Functions.
+-                                                              (line 116)
++                                                              (line 121)
+ * mpfr_pow_si:                           Basic Arithmetic Functions.
+-                                                              (line 120)
++                                                              (line 125)
+ * mpfr_pow_ui:                           Basic Arithmetic Functions.
+-                                                              (line 118)
++                                                              (line 123)
+ * mpfr_pow_z:                            Basic Arithmetic Functions.
+-                                                              (line 122)
++                                                              (line 127)
+ * mpfr_prec_round:                       Rounding Related Functions.
+                                                               (line  13)
+ * ‘mpfr_prec_t’:                         Nomenclature and Types.
+@@ -3999,7 +4017,7 @@
+ * mpfr_print_rnd_mode:                   Rounding Related Functions.
+                                                               (line  71)
+ * mpfr_rec_sqrt:                         Basic Arithmetic Functions.
+-                                                              (line 103)
++                                                              (line 105)
+ * mpfr_regular_p:                        Comparison Functions.
+                                                               (line  43)
+ * mpfr_reldiff:                          Compatibility with MPF.
+@@ -4021,11 +4039,11 @@
+ * ‘mpfr_rnd_t’:                          Nomenclature and Types.
+                                                               (line  34)
+ * mpfr_root:                             Basic Arithmetic Functions.
+-                                                              (line 109)
++                                                              (line 114)
+ * mpfr_round:                            Integer Related Functions.
+                                                               (line   9)
+-* mpfr_sec:                              Special Functions.   (line  45)
+-* mpfr_sech:                             Special Functions.   (line 109)
++* mpfr_sec:                              Special Functions.   (line  47)
++* mpfr_sech:                             Special Functions.   (line 111)
+ * mpfr_set:                              Assignment Functions.
+                                                               (line   9)
+ * mpfr_setsign:                          Miscellaneous Functions.
+@@ -4100,57 +4118,57 @@
+                                                               (line  49)
+ * mpfr_signbit:                          Miscellaneous Functions.
+                                                               (line  99)
+-* mpfr_sin:                              Special Functions.   (line  30)
+-* mpfr_sinh:                             Special Functions.   (line  96)
+-* mpfr_sinh_cosh:                        Special Functions.   (line 101)
+-* mpfr_sin_cos:                          Special Functions.   (line  35)
++* mpfr_sin:                              Special Functions.   (line  32)
++* mpfr_sinh:                             Special Functions.   (line  98)
++* mpfr_sinh_cosh:                        Special Functions.   (line 103)
++* mpfr_sin_cos:                          Special Functions.   (line  37)
+ * mpfr_si_div:                           Basic Arithmetic Functions.
+-                                                              (line  78)
++                                                              (line  80)
+ * mpfr_si_sub:                           Basic Arithmetic Functions.
+-                                                              (line  31)
++                                                              (line  32)
+ * mpfr_snprintf:                         Formatted Output Functions.
+                                                               (line 180)
+ * mpfr_sprintf:                          Formatted Output Functions.
+                                                               (line 170)
+ * mpfr_sqr:                              Basic Arithmetic Functions.
+-                                                              (line  69)
++                                                              (line  71)
+ * mpfr_sqrt:                             Basic Arithmetic Functions.
+-                                                              (line  96)
++                                                              (line  98)
+ * mpfr_sqrt_ui:                          Basic Arithmetic Functions.
+-                                                              (line  97)
++                                                              (line  99)
+ * mpfr_strtofr:                          Assignment Functions.
+                                                               (line  80)
+ * mpfr_sub:                              Basic Arithmetic Functions.
+-                                                              (line  25)
++                                                              (line  26)
+ * mpfr_subnormalize:                     Exception Related Functions.
+                                                               (line  60)
+ * mpfr_sub_d:                            Basic Arithmetic Functions.
+-                                                              (line  37)
++                                                              (line  38)
+ * mpfr_sub_q:                            Basic Arithmetic Functions.
+-                                                              (line  43)
++                                                              (line  44)
+ * mpfr_sub_si:                           Basic Arithmetic Functions.
+-                                                              (line  33)
++                                                              (line  34)
+ * mpfr_sub_ui:                           Basic Arithmetic Functions.
+-                                                              (line  29)
++                                                              (line  30)
+ * mpfr_sub_z:                            Basic Arithmetic Functions.
+-                                                              (line  41)
+-* mpfr_sum:                              Special Functions.   (line 252)
++                                                              (line  42)
++* mpfr_sum:                              Special Functions.   (line 262)
+ * mpfr_swap:                             Assignment Functions.
+                                                               (line 150)
+ * ‘mpfr_t’:                              Nomenclature and Types.
+                                                               (line   6)
+-* mpfr_tan:                              Special Functions.   (line  31)
+-* mpfr_tanh:                             Special Functions.   (line  97)
++* mpfr_tan:                              Special Functions.   (line  33)
++* mpfr_tanh:                             Special Functions.   (line  99)
+ * mpfr_trunc:                            Integer Related Functions.
+                                                               (line  10)
+ * mpfr_ui_div:                           Basic Arithmetic Functions.
+-                                                              (line  74)
++                                                              (line  76)
+ * mpfr_ui_pow:                           Basic Arithmetic Functions.
+-                                                              (line 126)
++                                                              (line 131)
+ * mpfr_ui_pow_ui:                        Basic Arithmetic Functions.
+-                                                              (line 124)
++                                                              (line 129)
+ * mpfr_ui_sub:                           Basic Arithmetic Functions.
+-                                                              (line  27)
++                                                              (line  28)
+ * mpfr_underflow_p:                      Exception Related Functions.
+                                                               (line 132)
+ * mpfr_unordered_p:                      Comparison Functions.
+@@ -4181,61 +4199,61 @@
+                                                               (line 182)
+ * mpfr_vsprintf:                         Formatted Output Functions.
+                                                               (line 171)
+-* mpfr_y0:                               Special Functions.   (line 193)
+-* mpfr_y1:                               Special Functions.   (line 194)
+-* mpfr_yn:                               Special Functions.   (line 195)
++* mpfr_y0:                               Special Functions.   (line 199)
++* mpfr_y1:                               Special Functions.   (line 200)
++* mpfr_yn:                               Special Functions.   (line 201)
+ * mpfr_zero_p:                           Comparison Functions.
+                                                               (line  42)
+-* mpfr_zeta:                             Special Functions.   (line 171)
+-* mpfr_zeta_ui:                          Special Functions.   (line 172)
++* mpfr_zeta:                             Special Functions.   (line 177)
++* mpfr_zeta_ui:                          Special Functions.   (line 178)
+ * mpfr_z_sub:                            Basic Arithmetic Functions.
+-                                                              (line  39)
++                                                              (line  40)
+ 
+ 
+ 
+ Tag Table:
+ Node: Top775
+ Node: Copying2007
+-Node: Introduction to MPFR3766
+-Node: Installing MPFR5880
+-Node: Reporting Bugs11323
+-Node: MPFR Basics13353
+-Node: Headers and Libraries13669
+-Node: Nomenclature and Types16828
+-Node: MPFR Variable Conventions18874
+-Node: Rounding Modes20418
+-Ref: ternary value21544
+-Node: Floating-Point Values on Special Numbers23526
+-Node: Exceptions26572
+-Node: Memory Handling29749
+-Node: MPFR Interface30894
+-Node: Initialization Functions33008
+-Node: Assignment Functions40318
+-Node: Combined Initialization and Assignment Functions49673
+-Node: Conversion Functions50974
+-Node: Basic Arithmetic Functions60035
+-Node: Comparison Functions69200
+-Node: Special Functions72687
+-Node: Input and Output Functions86672
+-Node: Formatted Output Functions88644
+-Node: Integer Related Functions98431
+-Node: Rounding Related Functions105051
+-Node: Miscellaneous Functions108888
+-Node: Exception Related Functions117568
+-Node: Compatibility with MPF124386
+-Node: Custom Interface127127
+-Node: Internals131526
+-Node: API Compatibility133066
+-Node: Type and Macro Changes134995
+-Node: Added Functions137844
+-Node: Changed Functions141132
+-Node: Removed Functions145545
+-Node: Other Changes145973
+-Node: Contributors147576
+-Node: References150219
+-Node: GNU Free Documentation License151973
+-Node: Concept Index174562
+-Node: Function and Type Index180659
++Node: Introduction to MPFR3770
++Node: Installing MPFR5884
++Node: Reporting Bugs11327
++Node: MPFR Basics13357
++Node: Headers and Libraries13673
++Node: Nomenclature and Types16832
++Node: MPFR Variable Conventions18894
++Node: Rounding Modes20438
++Ref: ternary value21568
++Node: Floating-Point Values on Special Numbers23554
++Node: Exceptions26813
++Node: Memory Handling29990
++Node: MPFR Interface31135
++Node: Initialization Functions33249
++Node: Assignment Functions40559
++Node: Combined Initialization and Assignment Functions49914
++Node: Conversion Functions51215
++Node: Basic Arithmetic Functions60276
++Node: Comparison Functions69777
++Node: Special Functions73264
++Node: Input and Output Functions87862
++Node: Formatted Output Functions89834
++Node: Integer Related Functions99621
++Node: Rounding Related Functions106241
++Node: Miscellaneous Functions110078
++Node: Exception Related Functions118758
++Node: Compatibility with MPF125576
++Node: Custom Interface128317
++Node: Internals132716
++Node: API Compatibility134260
++Node: Type and Macro Changes136189
++Node: Added Functions139038
++Node: Changed Functions142326
++Node: Removed Functions146739
++Node: Other Changes147167
++Node: Contributors148770
++Node: References151413
++Node: GNU Free Documentation License153167
++Node: Concept Index175760
++Node: Function and Type Index181857
+ 
+ End Tag Table
+ 
+diff -Naurd mpfr-3.1.3-a/src/lngamma.c mpfr-3.1.3-b/src/lngamma.c
+--- mpfr-3.1.3-a/src/lngamma.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/lngamma.c	2015-07-02 10:49:24.018113593 +0000
+@@ -603,16 +603,17 @@
+       mpfr_get_prec (y), mpfr_log_prec, y, inex));
+ 
+   /* special cases */
+-  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
++  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x) ||
++                     (MPFR_IS_NEG (x) && mpfr_integer_p (x))))
+     {
+-      if (MPFR_IS_NAN (x) || MPFR_IS_NEG (x))
++      if (MPFR_IS_NAN (x))
+         {
+           MPFR_SET_NAN (y);
+           MPFR_RET_NAN;
+         }
+-      else /* lngamma(+Inf) = lngamma(+0) = +Inf */
++      else /* lngamma(+/-Inf) = lngamma(nonpositive integer) = +Inf */
+         {
+-          if (MPFR_IS_ZERO (x))
++          if (!MPFR_IS_INF (x))
+             mpfr_set_divby0 ();
+           MPFR_SET_INF (y);
+           MPFR_SET_POS (y);
+@@ -620,8 +621,8 @@
+         }
+     }
+ 
+-  /* if x < 0 and -2k-1 <= x <= -2k, then lngamma(x) = NaN */
+-  if (MPFR_IS_NEG (x) && (unit_bit (x) == 0 || mpfr_integer_p (x)))
++  /* if -2k-1 < x < -2k <= 0, then lngamma(x) = NaN */
++  if (MPFR_IS_NEG (x) && unit_bit (x) == 0)
+     {
+       MPFR_SET_NAN (y);
+       MPFR_RET_NAN;
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-02 10:49:24.038113803 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3"
++#define MPFR_VERSION_STRING "3.1.3-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-02 10:49:24.042113845 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3";
++  return "3.1.3-p1";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tlngamma.c mpfr-3.1.3-b/tests/tlngamma.c
+--- mpfr-3.1.3-a/tests/tlngamma.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tlngamma.c	2015-07-02 10:49:24.018113593 +0000
+@@ -33,7 +33,7 @@
+ special (void)
+ {
+   mpfr_t x, y;
+-  int inex;
++  int i, inex;
+ 
+   mpfr_init (x);
+   mpfr_init (y);
+@@ -46,25 +46,29 @@
+       exit (1);
+     }
+ 
+-  mpfr_set_inf (x, -1);
++  mpfr_set_inf (x, 1);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_nan_p (y))
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0)
+     {
+-      printf ("Error for lngamma(-Inf)\n");
++      printf ("Error for lngamma(+Inf)\n");
+       exit (1);
+     }
+ 
+-  mpfr_set_inf (x, 1);
++  mpfr_set_inf (x, -1);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0)
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0)
+     {
+-      printf ("Error for lngamma(+Inf)\n");
++      printf ("Error for lngamma(-Inf)\n");
+       exit (1);
+     }
+ 
+   mpfr_set_ui (x, 0, MPFR_RNDN);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0)
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++      __gmpfr_flags != MPFR_FLAGS_DIVBY0)
+     {
+       printf ("Error for lngamma(+0)\n");
+       exit (1);
+@@ -72,32 +76,58 @@
+ 
+   mpfr_set_ui (x, 0, MPFR_RNDN);
+   mpfr_neg (x, x, MPFR_RNDN);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_nan_p (y))
++  if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++      __gmpfr_flags != MPFR_FLAGS_DIVBY0)
+     {
+       printf ("Error for lngamma(-0)\n");
+       exit (1);
+     }
+ 
+   mpfr_set_ui (x, 1, MPFR_RNDN);
++  mpfr_clear_flags ();
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y))
++  if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y))
+     {
+       printf ("Error for lngamma(1)\n");
+       exit (1);
+     }
+ 
+-  mpfr_set_si (x, -1, MPFR_RNDN);
+-  mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (!mpfr_nan_p (y))
++  for (i = 1; i <= 5; i++)
+     {
+-      printf ("Error for lngamma(-1)\n");
+-      exit (1);
++      int c;
++
++      mpfr_set_si (x, -i, MPFR_RNDN);
++      mpfr_clear_flags ();
++      mpfr_lngamma (y, x, MPFR_RNDN);
++      if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++          __gmpfr_flags != MPFR_FLAGS_DIVBY0)
++        {
++          printf ("Error for lngamma(-%d)\n", i);
++          exit (1);
++        }
++      if (i & 1)
++        {
++          mpfr_nextabove (x);
++          c = '+';
++        }
++      else
++        {
++          mpfr_nextbelow (x);
++          c = '-';
++        }
++      mpfr_lngamma (y, x, MPFR_RNDN);
++      if (!mpfr_nan_p (y))
++        {
++          printf ("Error for lngamma(-%d%cepsilon)\n", i, c);
++          exit (1);
++        }
+     }
+ 
+   mpfr_set_ui (x, 2, MPFR_RNDN);
+   mpfr_lngamma (y, x, MPFR_RNDN);
+-  if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y))
++  if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y))
+     {
+       printf ("Error for lngamma(2)\n");
+       exit (1);
+@@ -127,7 +157,7 @@
+   mpfr_set_str (x, CHECK_X2, 10, MPFR_RNDN);
+   mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_str (x, CHECK_Y2, 10, MPFR_RNDN);
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (y, x))
++  if (mpfr_cmp0 (y, x))
+     {
+       printf ("mpfr_lngamma("CHECK_X2") is wrong:\n"
+               "expected ");
+@@ -143,7 +173,7 @@
+   mpfr_lngamma (y, x, MPFR_RNDU);
+   mpfr_set_prec (x, 175);
+   mpfr_set_str_binary (x, "0.1010001100011101101011001101110010100001000001000001110011000001101100001111001001000101011011100100010101011110100111110101010100010011010010000101010111001100011000101111E7");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error in mpfr_lngamma (1)\n");
+       exit (1);
+@@ -155,7 +185,7 @@
+   mpfr_lngamma (x, y, MPFR_RNDZ);
+   mpfr_set_prec (y, 21);
+   mpfr_set_str_binary (y, "0.111000101000001100101E9");
+-  if (MPFR_IS_NAN (x) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error in mpfr_lngamma (120)\n");
+       printf ("Expected "); mpfr_print_binary (y); puts ("");
+@@ -169,7 +199,7 @@
+   inex = mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_prec (x, 206);
+   mpfr_set_str_binary (x, "0.10000111011000000011100010101001100110001110000111100011000100100110110010001011011110101001111011110110000001010100111011010000000011100110110101100111000111010011110010000100010111101010001101000110101001E13");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error in mpfr_lngamma (768)\n");
+       exit (1);
+@@ -185,7 +215,7 @@
+   mpfr_set_str_binary (x, "0.1100E-66");
+   mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_str_binary (x, "0.1100E6");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error for lngamma(0.1100E-66)\n");
+       exit (1);
+@@ -199,7 +229,7 @@
+   mpfr_lngamma (y, x, MPFR_RNDN);
+   mpfr_set_prec (x, 32);
+   mpfr_set_str_binary (x, "-0.10001000111011111011000010100010E207");
+-  if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++  if (mpfr_cmp0 (x, y))
+     {
+       printf ("Error for lngamma(-2^199+0.5)\n");
+       printf ("Got        ");
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-02 10:50:08.046573308 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-02 10:50:08.126574142 +0000
+@@ -0,0 +1 @@
++muldiv-2exp-overflow
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-02 10:49:24.042113845 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-02 10:50:08.126574142 +0000
+@@ -1 +1 @@
+-3.1.3-p1
++3.1.3-p2
+diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c
+--- mpfr-3.1.3-a/src/div_2si.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/div_2si.c	2015-07-02 10:50:08.106573933 +0000
+@@ -49,7 +49,7 @@
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+         }
+-      else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n ||
++      else if (MPFR_UNLIKELY(n <= 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n ||
+                                        exp > __gmpfr_emax + n)) )
+         return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y));
+ 
+diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c
+--- mpfr-3.1.3-a/src/div_2ui.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/div_2ui.c	2015-07-02 10:50:08.106573933 +0000
+@@ -32,7 +32,7 @@
+      rnd_mode),
+     ("y[%Pu]=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inexact));
+ 
+-  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
++  if (MPFR_UNLIKELY (n == 0 || MPFR_IS_SINGULAR (x)))
+     return mpfr_set (y, x, rnd_mode);
+   else
+     {
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-02 10:49:24.038113803 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-02 10:50:08.126574142 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p1"
++#define MPFR_VERSION_STRING "3.1.3-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c
+--- mpfr-3.1.3-a/src/mul_2si.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/mul_2si.c	2015-07-02 10:50:08.106573933 +0000
+@@ -39,7 +39,7 @@
+     {
+       mpfr_exp_t exp = MPFR_GET_EXP (x);
+       MPFR_SETRAW (inexact, y, x, exp, rnd_mode);
+-      if (MPFR_UNLIKELY( n > 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
++      if (MPFR_UNLIKELY(n >= 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
+                                    exp > __gmpfr_emax - n)))
+         return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y));
+       else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emin > MPFR_EMAX_MAX + n ||
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-02 10:49:24.042113845 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-02 10:50:08.126574142 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p1";
++  return "3.1.3-p2";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c
+--- mpfr-3.1.3-a/tests/tmul_2exp.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tmul_2exp.c	2015-07-02 10:50:08.106573933 +0000
+@@ -242,6 +242,76 @@
+   large (MPFR_EMAX_MAX);
+ }
+ 
++/* Cases where the function overflows on n = 0 when rounding is like
++   away from zero. */
++static void
++overflow0 (mpfr_exp_t emax)
++{
++  mpfr_exp_t old_emax;
++  mpfr_t x, y1, y2;
++  int neg, r, op;
++  static char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" };
++
++  old_emax = mpfr_get_emax ();
++  set_emax (emax);
++
++  mpfr_init2 (x, 8);
++  mpfr_inits2 (6, y1, y2, (mpfr_ptr) 0);
++
++  mpfr_set_inf (x, 1);
++  mpfr_nextbelow (x);
++
++  for (neg = 0; neg <= 1; neg++)
++    {
++      RND_LOOP (r)
++        {
++          int inex1, inex2;
++          unsigned int flags1, flags2;
++
++          /* Even if there isn't an overflow (rounding ~ toward zero),
++             the result is the same as the one of an overflow. */
++          inex1 = mpfr_overflow (y1, (mpfr_rnd_t) r, neg ? -1 : 1);
++          flags1 = MPFR_FLAGS_INEXACT;
++          if (mpfr_inf_p (y1))
++            flags1 |= MPFR_FLAGS_OVERFLOW;
++          for (op = 0; op < 4; op++)
++            {
++              mpfr_clear_flags ();
++              inex2 =
++                op == 0 ? mpfr_mul_2ui (y2, x, 0, (mpfr_rnd_t) r) :
++                op == 1 ? mpfr_mul_2si (y2, x, 0, (mpfr_rnd_t) r) :
++                op == 2 ? mpfr_div_2ui (y2, x, 0, (mpfr_rnd_t) r) :
++                op == 3 ? mpfr_div_2si (y2, x, 0, (mpfr_rnd_t) r) :
++                (MPFR_ASSERTN (0), 0);
++              flags2 = __gmpfr_flags;
++              if (!(mpfr_equal_p (y1, y2) &&
++                    SAME_SIGN (inex1, inex2) &&
++                    flags1 == flags2))
++                {
++                  printf ("Error in overflow0 for %s, mpfr_%s, emax = %"
++                          MPFR_EXP_FSPEC "d,\nx = ",
++                          mpfr_print_rnd_mode ((mpfr_rnd_t) r), sop[op],
++                          (mpfr_eexp_t) emax);
++                  mpfr_dump (x);
++                  printf ("Expected ");
++                  mpfr_dump (y1);
++                  printf ("  with inex = %d, flags =", inex1);
++                  flags_out (flags1);
++                  printf ("Got      ");
++                  mpfr_dump (y2);
++                  printf ("  with inex = %d, flags =", inex2);
++                  flags_out (flags2);
++                  exit (1);
++                }
++            }
++        }
++      mpfr_neg (x, x, MPFR_RNDN);
++    }
++
++  mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
++  set_emax (old_emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -334,6 +404,11 @@
+   underflow0 ();
+   large0 ();
+ 
++  if (mpfr_get_emax () != MPFR_EMAX_MAX)
++    overflow0 (mpfr_get_emax ());
++  overflow0 (MPFR_EMAX_MAX);
++  overflow0 (-1);
++
+   tests_end_mpfr ();
+   return 0;
+ }
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-17 08:54:48.592799981 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-17 08:54:48.616811495 +0000
+@@ -0,0 +1 @@
++muldiv-2exp-underflow
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-17 08:54:48.616811495 +0000
+@@ -1 +1 @@
+-3.1.3-p2
++3.1.3-p3
+diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c
+--- mpfr-3.1.3-a/src/div_2si.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/div_2si.c	2015-07-17 08:54:48.608807656 +0000
+@@ -45,7 +45,8 @@
+           if (rnd_mode == MPFR_RNDN &&
+               (__gmpfr_emin > MPFR_EMAX_MAX - (n - 1) ||
+                exp < __gmpfr_emin + (n - 1) ||
+-               (inexact >= 0 && mpfr_powerof2_raw (y))))
++               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++                mpfr_powerof2_raw (y))))
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+         }
+diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c
+--- mpfr-3.1.3-a/src/div_2ui.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/div_2ui.c	2015-07-17 08:54:48.608807656 +0000
+@@ -44,7 +44,9 @@
+       if (MPFR_UNLIKELY (n >= diffexp))  /* exp - n <= emin - 1 */
+         {
+           if (rnd_mode == MPFR_RNDN &&
+-              (n > diffexp || (inexact >= 0 && mpfr_powerof2_raw (y))))
++              (n > diffexp ||
++               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++                mpfr_powerof2_raw (y))))
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN (y));
+         }
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-17 08:54:48.616811495 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p2"
++#define MPFR_VERSION_STRING "3.1.3-p3"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c
+--- mpfr-3.1.3-a/src/mul_2si.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/mul_2si.c	2015-07-17 08:54:48.608807656 +0000
+@@ -48,7 +48,8 @@
+           if (rnd_mode == MPFR_RNDN &&
+               (__gmpfr_emin > MPFR_EMAX_MAX + (n + 1) ||
+                exp < __gmpfr_emin - (n + 1) ||
+-               (inexact >= 0 && mpfr_powerof2_raw (y))))
++               ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++                mpfr_powerof2_raw (y))))
+             rnd_mode = MPFR_RNDZ;
+           return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+         }
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-17 08:54:48.616811495 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p2";
++  return "3.1.3-p3";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c
+--- mpfr-3.1.3-a/tests/tmul_2exp.c	2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/tests/tmul_2exp.c	2015-07-17 08:54:48.608807656 +0000
+@@ -50,77 +50,82 @@
+ {
+   mpfr_t x, y, z1, z2;
+   mpfr_exp_t emin;
+-  int i, k;
++  int i, k, s;
+   int prec;
+   int rnd;
+   int div;
+   int inex1, inex2;
+   unsigned int flags1, flags2;
+ 
+-  /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e)
+-   * with emin = e, x = 1 + i/16, i in { -1, 0, 1 }, and k = 1 to 4,
+-   * by comparing the result with the one of a simple division.
++  /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e) with
++   * emin = e, x = s * (1 + i/16), i in { -1, 0, 1 }, s in { -1, 1 }, and
++   * k = 1 to 4, by comparing the result with the one of a simple division.
+    */
+   emin = mpfr_get_emin ();
+   set_emin (e);
+   mpfr_inits2 (8, x, y, (mpfr_ptr) 0);
+   for (i = 15; i <= 17; i++)
+-    {
+-      inex1 = mpfr_set_ui_2exp (x, i, -4, MPFR_RNDN);
+-      MPFR_ASSERTN (inex1 == 0);
+-      for (prec = 6; prec >= 3; prec -= 3)
+-        {
+-          mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0);
+-          RND_LOOP (rnd)
+-            for (k = 1; k <= 4; k++)
+-              {
+-                /* The following one is assumed to be correct. */
+-                inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN);
+-                MPFR_ASSERTN (inex1 == 0);
+-                inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN);
+-                MPFR_ASSERTN (inex1 == 0);
+-                mpfr_clear_flags ();
+-                /* Do not use mpfr_div_ui to avoid the optimization
+-                   by mpfr_div_2si. */
+-                inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd);
+-                flags1 = __gmpfr_flags;
+-
+-              for (div = 0; div <= 2; div++)
++    for (s = 1; s >= -1; s -= 2)
++      {
++        inex1 = mpfr_set_si_2exp (x, s * i, -4, MPFR_RNDN);
++        MPFR_ASSERTN (inex1 == 0);
++        for (prec = 6; prec >= 3; prec -= 3)
++          {
++            mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0);
++            RND_LOOP (rnd)
++              for (k = 1; k <= 4; k++)
+                 {
++                  /* The following one is assumed to be correct. */
++                  inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN);
++                  MPFR_ASSERTN (inex1 == 0);
++                  inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN);
++                  MPFR_ASSERTN (inex1 == 0);
+                   mpfr_clear_flags ();
+-                  inex2 = div == 0 ?
+-                    mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) : div == 1 ?
+-                    mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) :
+-                    mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd);
+-                  flags2 = __gmpfr_flags;
+-                  if (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
+-                      mpfr_equal_p (z1, z2))
+-                    continue;
+-                  printf ("Error in underflow(");
+-                  if (e == MPFR_EMIN_MIN)
+-                    printf ("MPFR_EMIN_MIN");
+-                  else if (e == emin)
+-                    printf ("default emin");
+-                  else if (e >= LONG_MIN)
+-                    printf ("%ld", (long) e);
+-                  else
+-                    printf ("<LONG_MIN");
+-                  printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d, "
+-                          "%s\n", div == 0 ? "mul_2si" : div == 1 ?
+-                          "div_2si" : "div_2ui", i, prec, k,
+-                          mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
+-                  printf ("Expected ");
+-                  mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN);
+-                  printf (", inex = %d, flags = %u\n", SIGN (inex1), flags1);
+-                  printf ("Got      ");
+-                  mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN);
+-                  printf (", inex = %d, flags = %u\n", SIGN (inex2), flags2);
+-                  exit (1);
+-                }  /* div */
+-              }  /* k */
+-          mpfr_clears (z1, z2, (mpfr_ptr) 0);
+-        }  /* prec */
+-    }  /* i */
++                  /* Do not use mpfr_div_ui to avoid the optimization
++                     by mpfr_div_2si. */
++                  inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd);
++                  flags1 = __gmpfr_flags;
++
++                  for (div = 0; div <= 2; div++)
++                    {
++                      mpfr_clear_flags ();
++                      inex2 =
++                        div == 0 ?
++                        mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) :
++                        div == 1 ?
++                        mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) :
++                        mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd);
++                      flags2 = __gmpfr_flags;
++                      if (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
++                          mpfr_equal_p (z1, z2))
++                        continue;
++                      printf ("Error in underflow(");
++                      if (e == MPFR_EMIN_MIN)
++                        printf ("MPFR_EMIN_MIN");
++                      else if (e == emin)
++                        printf ("default emin");
++                      else if (e >= LONG_MIN)
++                        printf ("%ld", (long) e);
++                      else
++                        printf ("<LONG_MIN");
++                      printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d,"
++                              " %s\n", div == 0 ? "mul_2si" : div == 1 ?
++                              "div_2si" : "div_2ui", s * i, prec, k,
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
++                      printf ("Expected ");
++                      mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN);
++                      printf (", inex = %d, flags = %u\n",
++                              SIGN (inex1), flags1);
++                      printf ("Got      ");
++                      mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN);
++                      printf (", inex = %d, flags = %u\n",
++                              SIGN (inex2), flags2);
++                      exit (1);
++                    }  /* div */
++                }  /* k */
++            mpfr_clears (z1, z2, (mpfr_ptr) 0);
++          }  /* prec */
++      }  /* i */
+   mpfr_clears (x, y, (mpfr_ptr) 0);
+   set_emin (emin);
+ }
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-07-17 08:58:21.094987384 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-07-17 08:58:21.118986898 +0000
+@@ -0,0 +1 @@
++frexp
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/VERSION	2015-07-17 08:58:21.118986898 +0000
+@@ -1 +1 @@
+-3.1.3-p3
++3.1.3-p4
+diff -Naurd mpfr-3.1.3-a/src/frexp.c mpfr-3.1.3-b/src/frexp.c
+--- mpfr-3.1.3-a/src/frexp.c	2015-06-19 19:55:09.000000000 +0000
++++ mpfr-3.1.3-b/src/frexp.c	2015-07-17 08:58:21.106987142 +0000
+@@ -26,6 +26,13 @@
+ mpfr_frexp (mpfr_exp_t *exp, mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd)
+ {
+   int inex;
++  unsigned int saved_flags = __gmpfr_flags;
++  MPFR_BLOCK_DECL (flags);
++
++  MPFR_LOG_FUNC
++    (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
++     ("y[%Pu]=%.*Rg exp=%" MPFR_EXP_FSPEC "d inex=%d", mpfr_get_prec (y),
++      mpfr_log_prec, y, (mpfr_eexp_t) *exp, inex));
+ 
+   if (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)))
+     {
+@@ -49,8 +56,32 @@
+         }
+     }
+ 
+-  inex = mpfr_set (y, x, rnd);
++  MPFR_BLOCK (flags, inex = mpfr_set (y, x, rnd));
++  __gmpfr_flags = saved_flags;
++
++  /* Possible overflow due to the rounding, no possible underflow. */
++
++  if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags)))
++    {
++      int inex2;
++
++      /* An overflow here means that the exponent of y would be larger than
++         the one of x, thus x would be rounded to the next power of 2, and
++         the returned y should be 1/2 in absolute value, rounded (i.e. with
++         possible underflow or overflow). This also implies that x and y are
++         different objects, so that the exponent of x has not been lost. */
++      MPFR_LOG_MSG (("Internal overflow\n", 0));
++      MPFR_ASSERTD (x != y);
++      *exp = MPFR_GET_EXP (x) + 1;
++      inex2 = mpfr_set_si_2exp (y, MPFR_INT_SIGN (x), -1, rnd);
++      MPFR_LOG_MSG (("inex=%d inex2=%d\n", inex, inex2));
++      if (inex2 != 0)
++        inex = inex2;
++      MPFR_RET (inex);
++    }
++
+   *exp = MPFR_GET_EXP (y);
+-  MPFR_SET_EXP (y, 0);
++  /* Do not use MPFR_SET_EXP because the range has not been checked yet. */
++  MPFR_EXP (y) = 0;
+   return mpfr_check_range (y, inex, rnd);
+ }
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-07-17 08:58:21.114986979 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p3"
++#define MPFR_VERSION_STRING "3.1.3-p4"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-07-17 08:58:21.118986898 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p3";
++  return "3.1.3-p4";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tfrexp.c mpfr-3.1.3-b/tests/tfrexp.c
+--- mpfr-3.1.3-a/tests/tfrexp.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tfrexp.c	2015-07-17 08:58:21.106987142 +0000
+@@ -129,12 +129,115 @@
+   mpfr_clear (x);
+ }
+ 
++static void check1 (void)
++{
++  mpfr_exp_t emin, emax, e;
++  mpfr_t x, y1, y2;
++  int r, neg, red;
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++  set_emin (MPFR_EMIN_MIN);
++  set_emax (MPFR_EMAX_MAX);
++
++  mpfr_init2 (x, 7);
++  mpfr_inits2 (4, y1, y2, (mpfr_ptr) 0);
++
++  mpfr_set_ui_2exp (x, 1, -2, MPFR_RNDN);
++  while (mpfr_regular_p (x))
++    {
++      /* Test the exponents up to 3 and with the maximum exponent
++         (to check potential intermediate overflow). */
++      if (MPFR_GET_EXP (x) == 4)
++        mpfr_set_exp (x, MPFR_EMAX_MAX);
++      e = MPFR_GET_EXP (x);
++      for (neg = 0; neg < 2; neg++)
++        {
++          RND_LOOP (r)
++            {
++              int inex1, inex2;
++              mpfr_exp_t e1, e2;
++              unsigned int flags1, flags2;
++
++              for (red = 0; red < 2; red++)
++                {
++                  if (red)
++                    {
++                      /* e1: exponent of the rounded value of x. */
++                      MPFR_ASSERTN (e1 == e || e1 == e + 1);
++                      set_emin (e);
++                      set_emax (e);
++                      mpfr_clear_flags ();
++                      inex1 = e1 < 0 ?
++                        mpfr_mul_2ui (y1, x, -e1, (mpfr_rnd_t) r) :
++                        mpfr_div_2ui (y1, x, e1, (mpfr_rnd_t) r);
++                      flags1 = __gmpfr_flags;
++                    }
++                  else
++                    {
++                      inex1 = mpfr_set (y1, x, (mpfr_rnd_t) r);
++                      e1 = MPFR_IS_INF (y1) ? e + 1 : MPFR_GET_EXP (y1);
++                      flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0;
++                    }
++                  mpfr_clear_flags ();
++                  inex2 = mpfr_frexp (&e2, y2, x, (mpfr_rnd_t) r);
++                  flags2 = __gmpfr_flags;
++                  set_emin (MPFR_EMIN_MIN);
++                  set_emax (MPFR_EMAX_MAX);
++                  if ((!red || e == 0) &&
++                      (! mpfr_regular_p (y2) || MPFR_GET_EXP (y2) != 0))
++                    {
++                      printf ("Error in check1 for %s, red = %d, x = ",
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) r), red);
++                      mpfr_dump (x);
++                      printf ("Expected 1/2 <= |y| < 1, got y = ");
++                      mpfr_dump (y2);
++                      exit (1);
++                    }
++                  if (!red)
++                    {
++                      if (e2 > 0)
++                        mpfr_mul_2ui (y2, y2, e2, MPFR_RNDN);
++                      else if (e2 < 0)
++                        mpfr_div_2ui (y2, y2, -e2, MPFR_RNDN);
++                    }
++                  if (! (SAME_SIGN (inex1, inex2) &&
++                         mpfr_equal_p (y1, y2) &&
++                         flags1 == flags2))
++                    {
++                      printf ("Error in check1 for %s, red = %d, x = ",
++                              mpfr_print_rnd_mode ((mpfr_rnd_t) r), red);
++                      mpfr_dump (x);
++                      printf ("Expected y1 = ");
++                      mpfr_dump (y1);
++                      printf ("Got      y2 = ");
++                      mpfr_dump (y2);
++                      printf ("Expected inex ~= %d, got %d\n", inex1, inex2);
++                      printf ("Expected flags:");
++                      flags_out (flags1);
++                      printf ("Got flags:     ");
++                      flags_out (flags2);
++                      exit (1);
++                    }
++                }
++            }
++          mpfr_neg (x, x, MPFR_RNDN);
++        }
++      mpfr_nextabove (x);
++    }
++
++  mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
++  set_emin (emin);
++  set_emax (emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+   tests_start_mpfr ();
+ 
+   check_special ();
++  check1 ();
+ 
+   tests_end_mpfr ();
+   return 0;
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES	2015-10-29 13:47:46.735901185 +0000
++++ mpfr-3.1.3-b/PATCHES	2015-10-29 13:47:46.763900609 +0000
+@@ -0,0 +1 @@
++divhigh-basecase
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION	2015-07-17 08:58:21.118986898 +0000
++++ mpfr-3.1.3-b/VERSION	2015-10-29 13:47:46.763900609 +0000
+@@ -1 +1 @@
+-3.1.3-p4
++3.1.3-p5
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h	2015-07-17 08:58:21.114986979 +0000
++++ mpfr-3.1.3-b/src/mpfr.h	2015-10-29 13:47:46.759900692 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p4"
++#define MPFR_VERSION_STRING "3.1.3-p5"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/mulders.c mpfr-3.1.3-b/src/mulders.c
+--- mpfr-3.1.3-a/src/mulders.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/mulders.c	2015-10-29 13:47:46.751900855 +0000
+@@ -236,9 +236,10 @@
+          that in addition to the limb np[n-1] to reduce, we have at least 2
+          extra limbs, thus accessing np[n-3] is valid. */
+ 
+-      /* warning: we can have np[n-1]=d1 and np[n-2]=d0, but since {np,n} < D,
+-         the largest possible partial quotient is B-1 */
+-      if (MPFR_UNLIKELY(np[n - 1] == d1 && np[n - 2] == d0))
++      /* Warning: we can have np[n-1]>d1 or (np[n-1]=d1 and np[n-2]>=d0) here,
++         since we truncate the divisor at each step, but since {np,n} < D
++         originally, the largest possible partial quotient is B-1. */
++      if (MPFR_UNLIKELY(np[n-1] > d1 || (np[n-1] == d1 && np[n-2] >= d0)))
+         q2 = ~ (mp_limb_t) 0;
+       else
+         udiv_qr_3by2 (q2, q1, q0, np[n - 1], np[n - 2], np[n - 3],
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c	2015-07-17 08:58:21.118986898 +0000
++++ mpfr-3.1.3-b/src/version.c	2015-10-29 13:47:46.763900609 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.3-p4";
++  return "3.1.3-p5";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tdiv.c mpfr-3.1.3-b/tests/tdiv.c
+--- mpfr-3.1.3-a/tests/tdiv.c	2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tdiv.c	2015-10-29 13:47:46.751900855 +0000
+@@ -1099,6 +1099,69 @@
+   mpfr_set_emax (old_emax);
+ }
+ 
++/* Bug in mpfr_divhigh_n_basecase when all limbs of q (except the most
++   significant one) are B-1 where B=2^GMP_NUMB_BITS. Since we truncate
++   the divisor at each step, it might happen at some point that
++   (np[n-1],np[n-2]) > (d1,d0), and not only the equality.
++   Reported by Ricky Farr
++   <https://sympa.inria.fr/sympa/arc/mpfr/2015-10/msg00023.html>
++   To get a failure, a MPFR_DIVHIGH_TAB entry below the MPFR_DIV_THRESHOLD
++   limit must have a value 0. With most mparam.h files, this cannot occur. */
++static void
++test_20151023 (void)
++{
++  mpfr_prec_t p;
++  mpfr_t n, d, q, q0;
++  int inex, i;
++
++  for (p = GMP_NUMB_BITS; p <= 2000; p++)
++    {
++      mpfr_init2 (n, 2*p);
++      mpfr_init2 (d, p);
++      mpfr_init2 (q, p);
++      mpfr_init2 (q0, GMP_NUMB_BITS);
++
++      /* generate a random divisor of p bits */
++      mpfr_urandomb (d, RANDS);
++      /* generate a random quotient of GMP_NUMB_BITS bits */
++      mpfr_urandomb (q0, RANDS);
++      /* zero-pad the quotient to p bits */
++      inex = mpfr_prec_round (q0, p, MPFR_RNDN);
++      MPFR_ASSERTN(inex == 0);
++
++      for (i = 0; i < 3; i++)
++        {
++          /* i=0: try with the original quotient xxx000...000
++             i=1: try with the original quotient minus one ulp
++             i=2: try with the original quotient plus one ulp */
++          if (i == 1)
++            mpfr_nextbelow (q0);
++          else if (i == 2)
++            {
++              mpfr_nextabove (q0);
++              mpfr_nextabove (q0);
++            }
++
++          inex = mpfr_mul (n, d, q0, MPFR_RNDN);
++          MPFR_ASSERTN(inex == 0);
++          mpfr_nextabove (n);
++          mpfr_div (q, n, d, MPFR_RNDN);
++          MPFR_ASSERTN(mpfr_cmp (q, q0) == 0);
++
++          inex = mpfr_mul (n, d, q0, MPFR_RNDN);
++          MPFR_ASSERTN(inex == 0);
++          mpfr_nextbelow (n);
++          mpfr_div (q, n, d, MPFR_RNDN);
++          MPFR_ASSERTN(mpfr_cmp (q, q0) == 0);
++        }
++
++      mpfr_clear (n);
++      mpfr_clear (d);
++      mpfr_clear (q);
++      mpfr_clear (q0);
++    }
++}
++
+ #define TEST_FUNCTION test_div
+ #define TWO_ARGS
+ #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS)
+@@ -1219,6 +1282,7 @@
+   consistency ();
+   test_20070603 ();
+   test_20070628 ();
++  test_20151023 ();
+   test_generic (2, 800, 50);
+   test_extreme ();
+ 
diff --git a/easybuild/easyconfigs/g/GConf/GConf-3.2.6-intel-2016a.eb b/easybuild/easyconfigs/g/GConf/GConf-3.2.6-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..89fe1cefe22f7ce9275561d9ac87da8492fc8316
--- /dev/null
+++ b/easybuild/easyconfigs/g/GConf/GConf-3.2.6-intel-2016a.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'GConf'
+version = '3.2.6'
+
+homepage = 'https://projects.gnome.org/gconf/'
+description = """GConf is a system for storing application preferences.
+ It is intended for user preferences; not configuration
+ of something like Apache, or arbitrary data storage."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://ftp.gnome.org/pub/GNOME/sources/GConf/%(version_major_minor)s/']
+sources = [SOURCE_TAR_XZ]
+
+dependencies = [
+    ('dbus-glib', '0.106'),
+    ('GLib', '2.47.5'),
+    ('GObject-Introspection', '1.47.1'),
+    ('libxml2', '2.9.3'),
+    ('GTK+', '2.24.28'),
+    ('intltool', '0.51.0', '-Perl-5.22.1'),
+]
+
+configopts = '--disable-orbit '
+
+sanity_check_paths = {
+    'files': ['bin/gconf%s' % x for x in['-merge-tree', 'tool-2']] +
+             ['bin/gsettings-%s-convert' % x for x in ['data', 'schema']] +
+             ['lib/libgconf-2.%s' % x for x in['a', 'so']],
+    'dirs': ['include', 'share']
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/GDAL/GDAL-2.0.1-foss-2015a.eb b/easybuild/easyconfigs/g/GDAL/GDAL-2.0.1-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..001e2879dae3dcad958e9a50d9a60741832b69c8
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDAL/GDAL-2.0.1-foss-2015a.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'GDAL'
+version = '2.0.1'
+
+homepage = 'http://www.gdal.org/'
+description = """GDAL is a translator library for raster geospatial data formats that is released under an X/MIT style
+ Open Source license by the Open Source Geospatial Foundation. As a library, it presents a single abstract data model
+ to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for
+ data translation and processing."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'opt': True, 'usempi': True}
+
+source_urls = ['http://download.osgeo.org/gdal/%(version)s/']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('KEALib', '1.4.4'),
+    ('netCDF', '4.3.3.1'),
+    ('HDF5', '1.8.16'),
+    ('expat', '2.1.0'),
+    ('libxml2', '2.9.3'),
+    ('zlib', '1.2.8'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libgdal.%s' % SHLIB_EXT, 'lib/libgdal.a'],
+    'dirs': ['bin', 'include']
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.10.1-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/g/GDB/GDB-7.10.1-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7a28658458c1dc446fa8d949035081bd6b79e820
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDB/GDB-7.10.1-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'GDB'
+version = '7.10.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.gnu.org/software/gdb/gdb.html'
+description = "The GNU Project Debugger"
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_XZ]
+source_urls = [GNU_SOURCE]
+
+patches = ['GDB-7.9-missing-makeinfo.patch']
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('Python', '2.7.11'),
+]
+
+configopts = '--with-python'
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/gdb', 'bin/gdbserver'],
+    'dirs': [],
+}
+
+moduleclass = 'debugger'
diff --git a/easybuild/easyconfigs/g/GDB/GDB-7.11-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/g/GDB/GDB-7.11-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7f2305c130c023f4e65aff6df07629a2eaeab032
--- /dev/null
+++ b/easybuild/easyconfigs/g/GDB/GDB-7.11-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'GDB'
+version = '7.11'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.gnu.org/software/gdb/gdb.html'
+description = "The GNU Project Debugger"
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_XZ]
+source_urls = [GNU_SOURCE]
+
+patches = ['GDB-7.9-missing-makeinfo.patch']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('libreadline', '6.3'),
+    ('ncurses', '6.0'),
+    ('expat', '2.1.0'),
+    ('Python', '2.7.11'),
+]
+
+configopts = '--with-system-zlib --with-python=$EBROOTPYTHON/bin/python --with-expat=$EBROOTEXPAT '
+configopts += '--with-system-readline --enable-tui --enable-plugins'
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/gdb', 'bin/gdbserver'],
+    'dirs': [],
+}
+
+moduleclass = 'debugger'
diff --git a/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-foss-2016a-Mesa-11.2.1.eb b/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-foss-2016a-Mesa-11.2.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..726a6db2a2c33cca8e4949130306dcd390972ece
--- /dev/null
+++ b/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-foss-2016a-Mesa-11.2.1.eb
@@ -0,0 +1,37 @@
+easyblock = 'CMakeMake'
+
+name = 'GL2PS'
+version = '1.3.9'
+
+homepage = 'http://www.geuz.org/gl2ps/'
+description = """GL2PS: an OpenGL to PostScript printing library"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://geuz.org/gl2ps/src/']
+sources = [SOURCELOWER_TGZ]
+
+mesa_ver = '11.2.1'
+versionsuffix = '-Mesa-%s' % mesa_ver
+
+builddependencies = [
+    ('CMake', '3.4.3'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('libXi', '1.7.6'),
+    ('libXmu', '1.1.2'),
+    ('Mesa', mesa_ver),
+    ('libGLU', '9.0.0', versionsuffix),
+    ('freeglut', '3.0.0', versionsuffix),
+    ('libpng', '1.6.21'),
+    ('zlib', '1.2.8'),
+]
+
+sanity_check_paths = {
+    'files': ['include/gl2ps.h', 'lib/libgl2ps.so'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-foss-2016a.eb b/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f83060a449130ff06fdd0db762c2c6ec65dc132f
--- /dev/null
+++ b/easybuild/easyconfigs/g/GL2PS/GL2PS-1.3.9-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'CMakeMake'
+
+name = 'GL2PS'
+version = '1.3.9'
+
+homepage = 'http://www.geuz.org/gl2ps/'
+description = """GL2PS: an OpenGL to PostScript printing library"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://geuz.org/gl2ps/src/']
+sources = [SOURCELOWER_TGZ]
+
+builddependencies = [
+    ('CMake', '3.4.3'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('libXi', '1.7.6'),
+    ('libXmu', '1.1.2'),
+    ('Mesa', '11.1.2'),
+    ('libGLU', '9.0.0'),
+    ('freeglut', '3.0.0'),
+    ('libpng', '1.6.21'),
+    ('zlib', '1.2.8'),
+]
+
+sanity_check_paths = {
+    'files': ['include/gl2ps.h', 'lib/libgl2ps.so'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GLPK/GLPK-4.58-foss-2016a.eb b/easybuild/easyconfigs/g/GLPK/GLPK-4.58-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d5751eec2af50e198a9d59fbc626bff4d7f35a9e
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLPK/GLPK-4.58-foss-2016a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'GLPK'
+version = '4.58'
+
+homepage = 'https://www.gnu.org/software/glpk/'
+description = """The GLPK (GNU Linear Programming Kit) package is intended for
+ solving large-scale linear programming (LP),
+ mixed integer programming (MIP), and other related problems.
+ It is a set of routines written in ANSI C 
+ and organized in the form of a callable library."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://ftp.gnu.org/gnu/%(namelower)s/']
+
+dependencies = [('GMP', '6.1.0')]
+
+configopts = "--with-gmp"
+
+sanity_check_paths = {
+    'files': ['bin/glpsol', 'include/glpk.h'] +
+             ['lib/libglpk.%s' % x for x in [SHLIB_EXT, 'a']],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.34.3-foss-2015b.eb b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..04873f8e5c29cc3b399ed6a108f9f7bb6fb35515
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.34.3-foss-2015b.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'GLib'
+version = '2.34.3'
+
+homepage = 'http://www.gtk.org/'
+description = """GLib is one of the base libraries of the GTK+ project"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://ftp.gnome.org/pub/gnome/sources/glib/%(version_major_minor)s/']
+sources = ['glib-%(version)s.tar.xz']
+
+dependencies = [
+    ('libffi', '3.0.13'),
+    ('gettext', '0.18.2'),
+    ('libxml2', '2.9.1'),
+]
+builddependencies = [('Python', '2.7.10')]
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.47.5-foss-2016a.eb b/easybuild/easyconfigs/g/GLib/GLib-2.47.5-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..06841954c43c2e6a143fefa7a95dca8cab3a5ed8
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.47.5-foss-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'GLib'
+version = '2.47.5'
+
+homepage = 'http://www.gtk.org/'
+description = """GLib is one of the base libraries of the GTK+ project"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('libffi', '3.2.1'),
+    ('gettext', '0.19.6'),
+    ('libxml2', '2.9.3'),
+    ('PCRE', '8.38'),
+]
+
+builddependencies = [('Python', '2.7.11')]
+
+configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --enable-static --enable-shared"
+
+postinstallcmds = ["sed -i -e 's|#!.*python|#!/usr/bin/env python|' %(installdir)s/bin/*"]
+
+sanity_check_paths = {
+    'files': ['lib/libglib-%(version_major)s.0.a', 'lib/libglib-%%(version_major)s.0.%s' % SHLIB_EXT],
+    'dirs': ['bin', 'include'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.48.0-foss-2016a.eb b/easybuild/easyconfigs/g/GLib/GLib-2.48.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..73ce1be6d6188f150635c1a057c5e6487afda0aa
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.48.0-foss-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'GLib'
+version = '2.48.0'
+
+homepage = 'http://www.gtk.org/'
+description = """GLib is one of the base libraries of the GTK+ project"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('libffi', '3.2.1'),
+    ('gettext', '0.19.7'),
+    ('libxml2', '2.9.3'),
+    ('PCRE', '8.38'),
+]
+
+builddependencies = [('Python', '2.7.11')]
+
+configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --enable-static --enable-shared --disable-systemtap"
+
+postinstallcmds = ["sed -i -e 's|#!.*python|#!/usr/bin/env python|' %(installdir)s/bin/*"]
+
+sanity_check_paths = {
+    'files': ['lib/libglib-%(version_major)s.0.a', 'lib/libglib-%%(version_major)s.0.%s' % SHLIB_EXT],
+    'dirs': ['bin', 'include'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GLib/GLib-2.48.0-intel-2016a.eb b/easybuild/easyconfigs/g/GLib/GLib-2.48.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..918c5aec064dd5b33c8bc696eaecc1e206361584
--- /dev/null
+++ b/easybuild/easyconfigs/g/GLib/GLib-2.48.0-intel-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'GLib'
+version = '2.48.0'
+
+homepage = 'http://www.gtk.org/'
+description = """GLib is one of the base libraries of the GTK+ project"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('libffi', '3.2.1'),
+    ('gettext', '0.19.7'),
+    ('libxml2', '2.9.3'),
+    ('PCRE', '8.38'),
+]
+
+builddependencies = [('Python', '2.7.11')]
+
+configopts = "--disable-maintainer-mode --disable-silent-rules --disable-libelf --enable-static --enable-shared --disable-systemtap"
+
+postinstallcmds = ["sed -i -e 's|#!.*python|#!/usr/bin/env python|' %(installdir)s/bin/*"]
+
+sanity_check_paths = {
+    'files': ['lib/libglib-%(version_major)s.0.a', 'lib/libglib-%%(version_major)s.0.%s' % SHLIB_EXT],
+    'dirs': ['bin', 'include'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GMP/GMP-6.1.0-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/g/GMP/GMP-6.1.0-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..70b7019537c666cd2c6b4400d8be07e4d8bf5266
--- /dev/null
+++ b/easybuild/easyconfigs/g/GMP/GMP-6.1.0-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'GMP'
+version = '6.1.0'
+
+homepage = 'http://gmplib.org/'
+description = """GMP is a free library for arbitrary precision arithmetic, 
+operating on signed integers, rational numbers, and floating point numbers. """
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'pic': True, 'precise': True}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://ftp.gnu.org/gnu/gmp']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
+# enable C++ interface
+configopts = '--enable-cxx'
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libgmp.%s' % SHLIB_EXT, 'include/gmp.h'],
+    'dirs': [],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.42.0-intel-2014b.eb b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.42.0-intel-2014b.eb
index 7ae4e4f769fedf8c793c884e8311c3c622ded917..1f246a9bfc2eb62d382ca3eb928a045d92ac2488 100644
--- a/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.42.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.42.0-intel-2014b.eb
@@ -18,9 +18,11 @@ sources = [SOURCELOWER_TAR_XZ]
 dependencies = [
     ('Python', '2.7.8'),
     ('GLib', '2.40.0'),
-    ('Bison', '3.0.2'),
 ]
 
+builddependencies = [
+    ('Bison', '3.0.2'),
+]
 sanity_check_paths = {
     'files': ['bin/g-ir-%s' % x for x in ['annotation-tool', 'compiler', 'generate', 'scanner']] +
              ['lib/libgirepository-1.0.%s' % x for x in ['so', 'a']],
diff --git a/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.44.0-intel-2015a.eb b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.44.0-intel-2015a.eb
index 0461a34f5fa98e605430578afc3e2d3e52c120b6..835de46b5ba7b7765bf54d8586d2f605ea4fe992 100644
--- a/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.44.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.44.0-intel-2015a.eb
@@ -18,6 +18,9 @@ sources = [SOURCELOWER_TAR_XZ]
 dependencies = [
     ('Python', '2.7.10'),
     ('GLib', '2.44.1'),
+]
+
+builddependencies = [
     ('Bison', '3.0.4', '', ('GCC', '4.9.2')),
 ]
 
diff --git a/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-foss-2016a.eb b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ef2d0a1446a1f6dd8439d667317b98d5d3ed6cdc
--- /dev/null
+++ b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-foss-2016a.eb
@@ -0,0 +1,47 @@
+easyblock = 'ConfigureMake'
+
+name = 'GObject-Introspection'
+version = '1.47.1'
+
+homepage = 'https://wiki.gnome.org/GObjectIntrospection/'
+description = """GObject introspection is a middleware layer between C libraries
+ (using GObject) and language bindings. The C library can be scanned at
+ compile time and generate a metadata file, in addition to the actual
+ native C library. Then at runtime, language bindings can read this
+ metadata and automatically provide bindings to call into the C library."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('GLib', '2.47.5'),
+    ('libffi', '3.2.1'),
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('cairo', '1.14.6'),
+]
+
+preconfigopts = "env GI_SCANNER_DISABLE_CACHE=true "
+
+# avoid using hard-coded path to 'python' in shebang of scripts
+buildopts = "PYTHON=python"
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['bin/g-ir-%s' % x for x in ['annotation-tool', 'compiler', 'generate', 'scanner']] +
+             ['lib/libgirepository-1.0.%s' % x for x in ['so', 'a']],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-intel-2015b.eb b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-intel-2015b.eb
index 7bff36264810cc72f1a959ca49015dc90cc7c723..b1d634cd352ac482fd26e054e4060917e6948809 100644
--- a/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-intel-2015b.eb
@@ -18,9 +18,21 @@ sources = [SOURCELOWER_TAR_XZ]
 dependencies = [
     ('Python', '2.7.10'),
     ('GLib', '2.47.1'),
+    ('libffi', '3.2.1'),
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('flex', '2.6.0'),
     ('Bison', '3.0.4'),
+    ('cairo', '1.14.4'),
 ]
 
+preconfigopts = "env GI_SCANNER_DISABLE_CACHE=true "
+
+# avoid using hard-coded path to 'python' in shebang of scripts
+buildopts = "PYTHON=python"
+
 sanity_check_paths = {
     'files': ['bin/g-ir-%s' % x for x in ['annotation-tool', 'compiler', 'generate', 'scanner']] +
              ['lib/libgirepository-1.0.%s' % x for x in ['so', 'a']],
diff --git a/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-intel-2016a.eb b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-intel-2016a.eb
index eaa343080de350899c80dbdc9c5bf1f93099cb2f..7606731e757adbf0bf3a899ff2b67572169c2cd7 100644
--- a/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-intel-2016a.eb
+++ b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.47.1-intel-2016a.eb
@@ -20,15 +20,17 @@ pyver = '2.7.11'
 dependencies = [
     ('Python', pyver),
     ('GLib', '2.47.5'),
+    ('libffi', '3.2.1'),
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
     ('flex', '2.6.0'),
     ('Bison', '3.0.4'),
     ('cairo', '1.14.6'),
-    ('libffi', '3.2.1'),
 ]
 
-builddependencies = [('Autotools', '20150215')]
-
-preconfigopts = "GI_SCANNER_DISABLE_CACHE=true "
+preconfigopts = "env GI_SCANNER_DISABLE_CACHE=true "
 
 # avoid using hard-coded path to 'python' in shebang of scripts
 buildopts = "PYTHON=python"
diff --git a/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.48.0-intel-2016a.eb b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.48.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3d59c6fe7c70a2bda1d72d3452fe547620f12559
--- /dev/null
+++ b/easybuild/easyconfigs/g/GObject-Introspection/GObject-Introspection-1.48.0-intel-2016a.eb
@@ -0,0 +1,48 @@
+easyblock = 'ConfigureMake'
+
+name = 'GObject-Introspection'
+version = '1.48.0'
+
+homepage = 'https://wiki.gnome.org/GObjectIntrospection/'
+description = """GObject introspection is a middleware layer between C libraries
+ (using GObject) and language bindings. The C library can be scanned at
+ compile time and generate a metadata file, in addition to the actual
+ native C library. Then at runtime, language bindings can read this
+ metadata and automatically provide bindings to call into the C library."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+glibver = '2.48.0'
+dependencies = [
+    ('Python', '2.7.11'),
+    ('GLib', glibver),
+    ('libffi', '3.2.1'),
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('cairo', '1.14.6', '-GLib-%s' % glibver),
+]
+
+preconfigopts = "env GI_SCANNER_DISABLE_CACHE=true "
+
+# avoid using hard-coded path to 'python' in shebang of scripts
+buildopts = "PYTHON=python"
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['bin/g-ir-%s' % x for x in ['annotation-tool', 'compiler', 'generate', 'scanner']] +
+             ['lib/libgirepository-1.0.%s' % x for x in ['so', 'a']],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.06-XC-mpi.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.06-mpi.eb
similarity index 96%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.06-XC-mpi.eb
rename to easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.06-mpi.eb
index eb693a5ca3329e8ad9285c1d5d47d2ee259d3010..7fae7e2b3ff44714c71a681f1b90bfd8263ee240 100644
--- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.06-XC-mpi.eb
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.06-mpi.eb
@@ -18,7 +18,7 @@ homepage = 'http://www.gromacs.org'
 description = """GROMACS is a versatile package to perform molecular dynamics,
  i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'usempi': True}
 
 # eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.11-XC-mpi.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.11-mpi.eb
similarity index 96%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.11-XC-mpi.eb
rename to easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.11-mpi.eb
index 7d022ac778da22d274698a051f8f1ee6b38500c7..83b2732fb5a3c0509fdce3a3fb7e147696885b2b 100644
--- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.11-XC-mpi.eb
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayGNU-2015.11-mpi.eb
@@ -18,7 +18,7 @@ homepage = 'http://www.gromacs.org'
 description = """GROMACS is a versatile package to perform molecular dynamics,
  i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'usempi': True}
 
 # eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayIntel-2015.11-XC-mpi.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayIntel-2015.11-mpi.eb
similarity index 96%
rename from easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayIntel-2015.11-XC-mpi.eb
rename to easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayIntel-2015.11-mpi.eb
index 492e22626325b47ca771344dced92d37f893de71..350a3d6cfac172ec6e9c4867fa56480d697124d1 100644
--- a/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayIntel-2015.11-XC-mpi.eb
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-4.6.7-CrayIntel-2015.11-mpi.eb
@@ -18,7 +18,7 @@ homepage = 'http://www.gromacs.org'
 description = """GROMACS is a versatile package to perform molecular dynamics,
  i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
 
-toolchain = {'name': 'CrayIntel', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayIntel', 'version': '2015.11'}
 toolchainopts = {'usempi': True}
 
 # eg. ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.tar.gz
diff --git a/easybuild/easyconfigs/g/GROMACS/GROMACS-5.1.2-foss-2016a-hybrid.eb b/easybuild/easyconfigs/g/GROMACS/GROMACS-5.1.2-foss-2016a-hybrid.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e699b7dd9b16de6880d2666bd00d63a0ce3dcd9c
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMACS/GROMACS-5.1.2-foss-2016a-hybrid.eb
@@ -0,0 +1,39 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg / LCSB, Cyprus Institute / CaSToRC, Ghent University
+# Authors::   Wiktor Jurkowski <wiktor.jurkowski@uni.lu>, Fotis Georgatos <fotis.georgatos@uni.lu>, \
+#             George Tsouloupas <g.tsouloupas@cyi.ac.cy>, Kenneth Hoste
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-93.html
+#
+# Version 5.1.2
+# Author: Adam Huffman
+# The Francis Crick Institute
+##
+
+name = 'GROMACS'
+version = '5.1.2'
+versionsuffix = '-hybrid'
+
+homepage = 'http://www.gromacs.org'
+description = """GROMACS is a versatile package to perform molecular dynamics,
+ i.e. simulate the Newtonian equations of motion for systems with hundreds to millions of particles."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'openmp': True, 'usempi': True}
+
+source_urls = ['ftp://ftp.gromacs.org/pub/gromacs/']
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('libxml2', '2.9.3')
+]
+
+dependencies = [('Boost', '1.60.0')]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMOS++/GROMOS++-1.0.2211-goolf-1.5.14-openmp.eb b/easybuild/easyconfigs/g/GROMOS++/GROMOS++-1.0.2211-goolf-1.5.14-openmp.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cd7029cdae85e7c037243b23290e387c3014fcee
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMOS++/GROMOS++-1.0.2211-goolf-1.5.14-openmp.eb
@@ -0,0 +1,35 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Benjamin P. Roberts
+# New Zealand eScience Infrastructure
+# The University of Auckland, Auckland, New Zealand 
+
+easyblock = 'ConfigureMake'
+
+name = 'GROMOS++'
+version = '1.0.2211'
+versionsuffix = '-openmp'
+
+homepage = 'http://www.gromos.net/'
+description = """ GROMOS™ is an acronym of the GROningen MOlecular Simulation
+computer program package, which has been developed since 1978 for the dynamic
+modelling of (bio)molecules, until 1990 at the University of Groningen, The
+Netherlands, and since then at the ETH, the Swiss Federal Institute of
+Technology, in Zürich, Switzerland. """ 
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+toolchainopts = {'openmp': True, 'usempi': False}
+
+sources = [SOURCELOWER_TAR_BZ2]
+
+dependencies = [('GSL', '1.16')]
+
+preconfigopts = './Config.sh &&'
+configopts = '--enable-openmp'
+
+sanity_check_paths = {
+    'files': ["bin/pdb2g96", "bin/gromacs2gromos", "bin/structure_factor",
+              "lib/gromosplugin.a", "lib/libgromos.a"],
+    'dirs': ["include", "share/gromos++"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GROMOS++/GROMOS++-1.0.2211-goolf-1.5.14-serial.eb b/easybuild/easyconfigs/g/GROMOS++/GROMOS++-1.0.2211-goolf-1.5.14-serial.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2b1345c99b330dbed8db36a322dcc946664c9f9a
--- /dev/null
+++ b/easybuild/easyconfigs/g/GROMOS++/GROMOS++-1.0.2211-goolf-1.5.14-serial.eb
@@ -0,0 +1,34 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Benjamin P. Roberts
+# New Zealand eScience Infrastructure
+# The University of Auckland, Auckland, New Zealand 
+
+easyblock = 'ConfigureMake'
+
+name = 'GROMOS++'
+version = '1.0.2211'
+versionsuffix = '-serial'
+
+homepage = 'http://www.gromos.net/'
+description = """ GROMOS™ is an acronym of the GROningen MOlecular Simulation
+computer program package, which has been developed since 1978 for the dynamic
+modelling of (bio)molecules, until 1990 at the University of Groningen, The
+Netherlands, and since then at the ETH, the Swiss Federal Institute of
+Technology, in Zürich, Switzerland. """ 
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+toolchainopts = {'openmp': False, 'usempi': False}
+
+sources = [SOURCELOWER_TAR_BZ2]
+
+dependencies = [('GSL', '1.16')]
+
+preconfigopts = './Config.sh &&'
+
+sanity_check_paths = {
+    'files': ["bin/pdb2g96", "bin/gromacs2gromos", "bin/structure_factor",
+              "lib/gromosplugin.a", "lib/libgromos.a"],
+    'dirs': ["include", "share/gromos++"],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GSL/GSL-2.1-foss-2016a.eb b/easybuild/easyconfigs/g/GSL/GSL-2.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f4a28c0d8f92dacd5f35197ffc598945074e5e37
--- /dev/null
+++ b/easybuild/easyconfigs/g/GSL/GSL-2.1-foss-2016a.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'GSL'
+version = "2.1"
+
+homepage = 'http://www.gnu.org/software/gsl/'
+description = """The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers.
+ The library provides a wide range of mathematical routines such as random number generators, special functions
+ and least-squares fitting."""
+
+toolchain = {'version': '2016a', 'name': 'foss'}
+toolchainopts = {'opt': True, 'optarch': True, 'unroll': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-0.10.36-intel-2016a.eb b/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-0.10.36-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f2d1e756a585ad08874fbaab8b05643ae219879d
--- /dev/null
+++ b/easybuild/easyconfigs/g/GST-plugins-base/GST-plugins-base-0.10.36-intel-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'GST-plugins-base'
+version = '0.10.36'
+
+homepage = 'http://gstreamer.freedesktop.org/'
+description = """GStreamer is a library for constructing graphs of media-handling
+ components. The applications it supports range from simple
+ Ogg/Vorbis playback, audio/video streaming to complex audio
+ (mixing) and video (non-linear editing) processing."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://gstreamer.freedesktop.org/src/gst-plugins-base']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [('GStreamer', '0.10.36')]
+
+# does not work with Bison 3.x
+builddependencies = [
+    ('Bison', '2.7', '', True),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gst-%s-%%(version_major_minor)s' % x for x in ['discoverer', 'visualise']] +
+             ['lib/libgst%s-%%(version_major_minor)s.%s' % (x, SHLIB_EXT) for x in ['app', 'audio', 'video']],
+    'dirs': ['include', 'share']
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GStreamer/GStreamer-0.10.36-intel-2016a.eb b/easybuild/easyconfigs/g/GStreamer/GStreamer-0.10.36-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ccd3a73617c8807c50da30435911ec35ba6f42d2
--- /dev/null
+++ b/easybuild/easyconfigs/g/GStreamer/GStreamer-0.10.36-intel-2016a.eb
@@ -0,0 +1,40 @@
+easyblock = 'ConfigureMake'
+
+name = 'GStreamer'
+version = '0.10.36'
+
+homepage = 'http://gstreamer.freedesktop.org/'
+description = """GStreamer is a library for constructing graphs of media-handling
+ components. The applications it supports range from simple
+ Ogg/Vorbis playback, audio/video streaming to complex audio
+ (mixing) and video (non-linear editing) processing."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://gstreamer.freedesktop.org/src/gstreamer']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.47.5'),
+    ('GObject-Introspection', '1.47.1'),
+    ('zlib', '1.2.8'),
+]
+
+# does not work with Bison 3.x
+builddependencies = [
+    ('Bison', '2.7', '', True),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gst-%s-%%(version_major_minor)s' % x for x in ['inspect', 'typefind', 'launch']] +
+             ['lib/libgst%s-%%(version_major_minor)s.%s' % (x, SHLIB_EXT) for x in ['reamer', 'base',
+                                                                                    'controller', 'check']],
+    'dirs': ['include', 'share', 'libexec'],
+}
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GTK+/GTK+-2.24.30-intel-2016a.eb b/easybuild/easyconfigs/g/GTK+/GTK+-2.24.30-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6dfeab052692f1b9ec109d174a03a6da1d8b54d0
--- /dev/null
+++ b/easybuild/easyconfigs/g/GTK+/GTK+-2.24.30-intel-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'GTK+'
+version = '2.24.30'
+
+homepage = 'https://developer.gnome.org/gtk+/stable/'
+description = """
+ The GTK+ 2 package contains libraries used for creating graphical user interfaces for applications.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('ATK', '2.20.0'),
+    ('Gdk-Pixbuf', '2.35.1'),
+    ('Pango', '1.40.1'),
+    ('GObject-Introspection', '1.48.0'),
+]
+
+configopts = "--disable-silent-rules --disable-glibtest --enable-introspection=yes --disable-visibility "
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GTOOL/GTOOL-0.7.5.eb b/easybuild/easyconfigs/g/GTOOL/GTOOL-0.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..69e22e6cabb7feafcdee8657bd8470a6173db972
--- /dev/null
+++ b/easybuild/easyconfigs/g/GTOOL/GTOOL-0.7.5.eb
@@ -0,0 +1,26 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Ravi Tripathi
+# Email: ravi89@uab.edu
+
+easyblock = "Tarball"
+
+name = 'GTOOL'
+version = '0.7.5'
+
+homepage = 'http://www.well.ox.ac.uk/~cfreeman/software/gwas/gtool.html'
+description = """ GTOOL is a program for transforming sets of genotype data for use with 
+the programs SNPTEST and IMPUTE.  """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['http://www.well.ox.ac.uk/~cfreeman/software/gwas/']
+sources = ['gtool_v%(version)s_x86_64.tgz']
+
+modextrapaths = {'PATH': ''}
+
+sanity_check_paths = {
+    'files': ["gtool", "LICENCE"],
+    'dirs': ["example"]
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/GTS/GTS-0.7.6-foss-2016a.eb b/easybuild/easyconfigs/g/GTS/GTS-0.7.6-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cca1bedcdd3e7eae2d7df633486cea4b58ed4757
--- /dev/null
+++ b/easybuild/easyconfigs/g/GTS/GTS-0.7.6-foss-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'GTS'
+version = '0.7.6'
+
+homepage = 'http://gts.sourceforge.net/'
+description = """GTS stands for the GNU Triangulated Surface Library.
+ It is an Open Source Free Software Library intended to provide a set of useful
+ functions to deal with 3D surfaces meshed with interconnected triangles."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('GLib', '2.48.0'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libgts.%s' % SHLIB_EXT, 'bin/gts2oogl', 'bin/gtscheck'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.35.1-intel-2016a.eb b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.35.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ec51681b28d81893f02320d227c2709e028fc251
--- /dev/null
+++ b/easybuild/easyconfigs/g/Gdk-Pixbuf/Gdk-Pixbuf-2.35.1-intel-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'Gdk-Pixbuf'
+version = '2.35.1'
+
+homepage = 'https://developer.gnome.org/gdk-pixbuf/stable/'
+description = """
+ The Gdk Pixbuf is a toolkit for image loading and pixel buffer manipulation.
+ It is used by GTK+ 2 and GTK+ 3 to load and manipulate images. In the past it
+ was distributed as part of GTK+ 2 but it was split off into a separate package
+ in preparation for the change to GTK+ 3.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.48.0'),
+    ('libjpeg-turbo', '1.4.2', '-NASM-2.12.01'),
+    ('libpng', '1.6.21'),
+    ('LibTIFF', '4.0.6'),
+    ('GObject-Introspection', '1.48.0')
+]
+
+configopts = "--disable-maintainer-mode --enable-debug=no --enable-introspection=yes "
+configopts += "--disable-Bsymbolic --without-gdiplus --enable-shared --enable-static"
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/Givaro/Givaro-4.0.1-foss-2016a.eb b/easybuild/easyconfigs/g/Givaro/Givaro-4.0.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..22ad6d392a1b5c2e03a408932808d26b3a76d844
--- /dev/null
+++ b/easybuild/easyconfigs/g/Givaro/Givaro-4.0.1-foss-2016a.eb
@@ -0,0 +1,38 @@
+##
+# This file is an EasyBuild recipe; see https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright (c) 2016 Riccardo Murri <riccardo.murri@gmail.com>
+# Authors::   Riccardo Murri <riccardo.murri@gmail.com>
+# License::   GPL
+#
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Givaro'
+version = '4.0.1'
+
+homepage = 'http://givaro.forge.imag.fr/'
+description = "C++ library for arithmetic and algebraic computations"
+
+toolchain = {'version': '2016a', 'name': 'foss'}
+
+sources = ['v%(version)s.zip']
+source_urls = ['https://github.com/linbox-team/givaro/archive']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+dependencies = [
+    ('GMP', '6.1.0'),
+]
+
+preconfigopts = "env NOCONFIGURE=1 ./autogen.sh && "
+configopts = "--with-gmp=$EBROOTGMP --enable-inline"
+
+sanity_check_paths = {
+    'files': ['bin/givaro-config', 'include/givaro-config.h'],
+    'dirs': ['bin', 'include', 'lib'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.21-intel-2015b.eb b/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.21-intel-2015b.eb
index 513feabb7e000a7b4a2b1d5a84bf57b59f9c77c2..b7e2be06e2168e0ce2cc239e0e7d843e22ea99c3 100644
--- a/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.21-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.21-intel-2015b.eb
@@ -14,4 +14,6 @@ source_urls = [
 ]
 sources = [SOURCE_TAR_GZ]
 
+modextrapaths = {'CPATH': ['include/GraphicsMagick']}
+
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.23-foss-2016a.eb b/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.23-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bd06dcc28139d13a22a4af1f5da11a518128cbe2
--- /dev/null
+++ b/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.23-foss-2016a.eb
@@ -0,0 +1,37 @@
+easyblock = 'ConfigureMake'
+
+name = 'GraphicsMagick'
+version = '1.3.23'
+
+homepage = 'http://www.graphicsmagick.org/'
+description = """GraphicsMagick is the swiss army knife of image processing."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    SOURCEFORGE_SOURCE,
+    'ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/%(version_major_minor)s/',
+]
+sources = [SOURCE_TAR_GZ]
+
+builddependencies = [
+    ('libtool', '2.4.6'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('libXext', '1.3.3'),
+    ('bzip2', '1.0.6'),
+    ('freetype', '2.6.2'),
+    ('libpng', '1.6.21'),
+    ('libjpeg-turbo', '1.4.2'),
+    ('LibTIFF', '4.0.6'),
+    ('libxml2', '2.9.3'),
+    ('XZ', '5.2.2'),
+    ('zlib', '1.2.8'),
+]
+
+modextrapaths = {'CPATH': ['include/GraphicsMagick']}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.23-intel-2016a.eb b/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.23-intel-2016a.eb
index 755ecbe16c842c3116371cb112de2323e47a7f37..de4cfae31e016e49ff0181de1e9411b85f41fd18 100644
--- a/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.23-intel-2016a.eb
+++ b/easybuild/easyconfigs/g/GraphicsMagick/GraphicsMagick-1.3.23-intel-2016a.eb
@@ -7,6 +7,7 @@ homepage = 'http://www.graphicsmagick.org/'
 description = """GraphicsMagick is the swiss army knife of image processing."""
 
 toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
 
 source_urls = [
     SOURCEFORGE_SOURCE,
@@ -31,4 +32,6 @@ dependencies = [
     ('zlib', '1.2.8'),
 ]
 
+modextrapaths = {'CPATH': ['include/GraphicsMagick']}
+
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.9-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.9-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c8fb9489f25fc46b3c77f617c761abee36e6c691
--- /dev/null
+++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.9-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,30 @@
+easyblock = "PythonPackage"
+
+name = 'Greenlet'
+version = '0.4.9'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/python-greenlet/greenlet'
+description = """The greenlet package is a spin-off of Stackless, a version of CPython that
+supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single
+or a few OS-level threads) and are synchronized with data exchanges on "channels".
+A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit
+scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_ZIP]
+
+patches = ['Greenlet-0.4.2_icc_no_amd64_predefined_in_prepocessor.patch']
+
+dependencies = [('Python', '2.7.11')]
+
+sanity_check_paths = {
+    'files': ['include/python%(pyshortver)s/greenlet/greenlet.h',
+              'lib/python%(pyshortver)s/site-packages/greenlet.so'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.9-intel-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.9-intel-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..26eafeafb1d1dc4c5fcf364148b3ed6cc600df7a
--- /dev/null
+++ b/easybuild/easyconfigs/g/Greenlet/Greenlet-0.4.9-intel-2016a-Python-3.5.1.eb
@@ -0,0 +1,29 @@
+easyblock = "PythonPackage"
+
+name = 'Greenlet'
+version = '0.4.9'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/python-greenlet/greenlet'
+description = """The greenlet package is a spin-off of Stackless, a version of CPython that
+supports micro-threads called "tasklets". Tasklets run pseudo-concurrently (typically in a single
+or a few OS-level threads) and are synchronized with data exchanges on "channels".
+A "greenlet", on the other hand, is a still more primitive notion of micro-thread with no implicit
+scheduling; coroutines, in other words. This is useful when you want to control exactly when your code runs.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_ZIP]
+
+patches = ['Greenlet-0.4.2_icc_no_amd64_predefined_in_prepocessor.patch']
+
+dependencies = [('Python', '3.5.1')]
+
+sanity_check_paths = {
+    'files': ['include/python%(pyshortver)sm/greenlet/greenlet.h'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/gdist/gdist-1.0.3-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/g/gdist/gdist-1.0.3-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f6f38f5d9fe9e8d9343d9073fd17bfd225ddc705
--- /dev/null
+++ b/easybuild/easyconfigs/g/gdist/gdist-1.0.3-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'gdist'
+version = '1.0.3'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/gdist'
+description = """The gdist module is a Cython interface to a C++ library (http://code.google.com/p/geodesic/) for
+ computing geodesic distance which is the length of shortest line between two vertices on a triangulated mesh in three
+ dimensions, such that the line lies on the surface."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.18.2-foss-2015b.eb b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e7d30bfac735bde0a37a1e05bc5868106eb62311
--- /dev/null
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.18.2-foss-2015b.eb
@@ -0,0 +1,18 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.18.2'
+
+homepage = 'http://www.gnu.org/software/gettext/'
+description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+configopts = '--without-emacs'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.19.6-foss-2016a.eb b/easybuild/easyconfigs/g/gettext/gettext-0.19.6-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1fdb744032d4d3a52c2a22305425cb19a69b2a27
--- /dev/null
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.19.6-foss-2016a.eb
@@ -0,0 +1,18 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.19.6'
+
+homepage = 'http://www.gnu.org/software/gettext/'
+description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+configopts = '--without-emacs'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.19.7-foss-2015b.eb b/easybuild/easyconfigs/g/gettext/gettext-0.19.7-foss-2015b.eb
index b35aee8501687dde10f2affcce9f5eb17d3cde35..690872c686f14da3d5a18923ded8d5ea5130107e 100644
--- a/easybuild/easyconfigs/g/gettext/gettext-0.19.7-foss-2015b.eb
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.19.7-foss-2015b.eb
@@ -18,6 +18,6 @@ dependencies = [
     ('ncurses', '5.9'),
 ]
 
-configopts = '--without-emacs'
+configopts = '--without-emacs --with-libxml2-prefix=$EBROOTLIBXML2'
 
 moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.19.7-foss-2016a.eb b/easybuild/easyconfigs/g/gettext/gettext-0.19.7-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4580e48c6a96e10cf91935dae20beb9a837e0453
--- /dev/null
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.19.7-foss-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.19.7'
+
+homepage = 'http://www.gnu.org/software/gettext/'
+description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [
+    ('libxml2', '2.9.3'),
+    ('ncurses', '6.0'),
+]
+
+configopts = '--without-emacs --with-libxml2-prefix=$EBROOTLIBXML2'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gettext/gettext-0.19.7-intel-2016a.eb b/easybuild/easyconfigs/g/gettext/gettext-0.19.7-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4f86721ed0a6a07d39b8f9363a715522f20a4c2f
--- /dev/null
+++ b/easybuild/easyconfigs/g/gettext/gettext-0.19.7-intel-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'gettext'
+version = '0.19.7'
+
+homepage = 'http://www.gnu.org/software/gettext/'
+description = """GNU `gettext' is an important step for the GNU Translation Project, as it is an asset on which we may
+build many other steps. This package offers to programmers, translators, and even users, a well integrated set of tools
+and documentation"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [
+    ('libxml2', '2.9.3'),
+    ('ncurses', '6.0'),
+]
+
+configopts = '--without-emacs --with-libxml2-prefix=$EBROOTLIBXML2'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/git/git-2.2.2-GCC-4.9.2.eb b/easybuild/easyconfigs/g/git/git-2.2.2-GCC-4.9.2.eb
index 6a03e95dbafbc41d59d61b0dbcd5508c4488d4e6..1da07f9d5892b42fb844754069956d1ebf372989 100644
--- a/easybuild/easyconfigs/g/git/git-2.2.2-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/g/git/git-2.2.2-GCC-4.9.2.eb
@@ -36,7 +36,7 @@ preconfigopts = 'make configure && '
 
 # Work around git build system bug.  If LIBS contains -lpthread, then configure
 # will not append -lpthread to LDFLAGS, but Makefile ignores LIBS.
-configopts = "--with-perl=${EBPERLROOT} --enable-pthreads='-lpthread'"
+configopts = "--with-perl=${EBROOTPERL}/bin/perl --enable-pthreads='-lpthread'"
 
 sanity_check_paths = {
     'files': ['bin/git'],
diff --git a/easybuild/easyconfigs/g/git/git-2.8.0-foss-2016a.eb b/easybuild/easyconfigs/g/git/git-2.8.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..37fb210f885480a3875d6bcd8e498bc9251ca400
--- /dev/null
+++ b/easybuild/easyconfigs/g/git/git-2.8.0-foss-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'git'
+version = '2.8.0'
+
+homepage = 'http://git-scm.com/'
+description = """Git is a free and open source distributed version control system designed
+to handle everything from small to very large projects with speed and efficiency."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/git/git/archive']
+
+dependencies = [
+    ('cURL', '7.47.0'),
+    ('expat', '2.1.0'),
+    ('gettext', '0.19.7'),
+    ('Perl', '5.22.1', '-bare'),
+]
+
+preconfigopts = 'make configure && '
+
+# Work around git build system bug.  If LIBS contains -lpthread, then configure
+# will not append -lpthread to LDFLAGS, but Makefile ignores LIBS.
+configopts = "--with-perl=${EBROOTPERL}/bin/perl --enable-pthreads='-lpthread'"
+
+sanity_check_paths = {
+    'files': ['bin/git'],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goalf-1.1.0-no-OFED.eb
index f9c5e14a8e3b42f6e1a1e44e40b8f869a894ca55..4282ea773f76b22acccf14bac98fc92f9502ec21 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goalf-1.1.0-no-OFED.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goolf-1.4.10.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goolf-1.4.10.eb
index 06b846c04cf64bc56723494b711a004e9489978b..037260e4920322ce9d1cc3bc69e0afbfe9659c9c 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.0.6.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.0.6.eb
index 42dc60dd5eaa4e48e825ae00ae2c3bdb8257ac76..aebc924b142b888e8eb0453902ea3df8f2fa18ab 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.0.6.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.1.13.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.1.13.eb
index 8b99a901c9ba30ae2af29a320cbeac0cedecd3c7..cb35b322234c43a7c6e73ff8cae9fef8a14b93d8 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-4.1.13.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.3.0.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.3.0.eb
index 6ccc91bb752baaf87e6489e59b798f149c6af04e..c92de947ba38414180f79550cc132a0acf88a822 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.3.0.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.5.0.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.5.0.eb
index 256687687906470d69bdc3f6a241e0c009023571..1f4bad7112b82813ed0ba1e3d44fc0cf4309f150 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.16-ictce-5.5.0.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-foss-2016a.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..850097aee1cedf775e7ba47d48f34a9ae066bbc2
--- /dev/null
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-foss-2016a.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'glproto'
+version = '1.4.17'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = "X protocol and ancillary headers"
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_PROTO_SOURCE]
+
+sanity_check_paths = {
+    'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-gimkl-2.11.5.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-gimkl-2.11.5.eb
index 46b9bdb3243822b04a8ccc6db21b7da20405b90c..8a7667c002f7e1cc6de3be36825de2e2de99bdcb 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-gimkl-2.11.5.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015a.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015a.eb
index 4eb87a66efd1fe6b55f8d992fb6ca1fe848911ec..b28bfab5ef645b2555469ccc63e4542d7c764879 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015a.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015a.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015b.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015b.eb
index a1f9a0b9d22a071f09d996b820ddeaa372380c92..191cd512edd3fb5e8eb7daead24b9e8b96c9eb9d 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015b.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2015b.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
diff --git a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2016a.eb b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2016a.eb
index c26a1ac08ae2b86516666ce27bd7b80a2aed1908..5dd250fddb83cb74bdcd9c77717b510b4121f241 100644
--- a/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2016a.eb
+++ b/easybuild/easyconfigs/g/glproto/glproto-1.4.17-intel-2016a.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/GL/%s.h' % x for x in ['glxint', 'glxmd', 'glxproto', 'glxtokens', 'internal/glcore']],
diff --git a/easybuild/easyconfigs/g/gmpich/gmpich-2016a.eb b/easybuild/easyconfigs/g/gmpich/gmpich-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..45cf27aa8b39682528f7556cc3938071e52554b7
--- /dev/null
+++ b/easybuild/easyconfigs/g/gmpich/gmpich-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = "Toolchain"
+
+name = 'gmpich'
+version = '2016a'
+
+homepage = '(none)'
+description = """gcc and GFortran based compiler toolchain,
+ including MPICH for MPI support."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compname = 'GCC'
+compver = '4.9.3-2.25'
+comp = (compname, compver)
+
+# compiler toolchain dependencies
+dependencies = [
+    comp,
+    ('MPICH', '3.2', '', comp),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gmpolf/gmpolf-2016a.eb b/easybuild/easyconfigs/g/gmpolf/gmpolf-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d81b50276db3da4e894fbf1ae7cf63ffab437851
--- /dev/null
+++ b/easybuild/easyconfigs/g/gmpolf/gmpolf-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = "Toolchain"
+
+name = 'gmpolf'
+version = '2016a'
+
+homepage = '(none)'
+description = """gcc and GFortran based compiler toolchain,
+ MPICH for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+gccver = '4.9.3-2.25'
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.15'
+blas = '%s-%s' % (blaslib, blasver)
+blassuff = '-LAPACK-3.6.0'
+
+# toolchain used to build foss dependencies
+comp_mpi_tc_name = 'gmpich'
+comp_mpi_tc = (comp_mpi_tc_name, version)
+
+# compiler toolchain depencies
+# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain
+# because of toolchain preperation functions
+# For binutils, stick to http://wiki.osdev.org/Cross-Compiler_Successful_Builds
+dependencies = [
+    ('GCC', gccver),
+    ('MPICH', '3.2', '', ('GCC', gccver)),
+    (blaslib, blasver, blassuff, ('GCC', gccver)),
+    ('FFTW', '3.3.4', '', comp_mpi_tc),
+    ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gmvapich2/gmvapich2-2016a.eb b/easybuild/easyconfigs/g/gmvapich2/gmvapich2-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..80a9588d018d3330d0074119be07dd698d149904
--- /dev/null
+++ b/easybuild/easyconfigs/g/gmvapich2/gmvapich2-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = "Toolchain"
+
+name = 'gmvapich2'
+version = '2016a'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain,
+ including MVAPICH2 for MPI support."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compname = 'GCC'
+compver = '4.9.3-2.25'
+comp = (compname, compver)
+
+# compiler toolchain dependencies
+dependencies = [
+    comp,
+    ('MVAPICH2', '2.2b', '', comp),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gmvolf/gmvolf-2016a.eb b/easybuild/easyconfigs/g/gmvolf/gmvolf-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b9a63b2c7c98b80b64485f908204bdedae887795
--- /dev/null
+++ b/easybuild/easyconfigs/g/gmvolf/gmvolf-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'Toolchain'
+
+name = 'gmvolf'
+version = '2016a'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain, including
+ MVAPICH2 for MPI support, OpenBLAS (BLAS and LAPACK support), FFTW and ScaLAPACK."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+gccver = '4.9.3-2.25'
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.15'
+blas = '%s-%s' % (blaslib, blasver)
+blassuff = '-LAPACK-3.6.0'
+
+# toolchain used to build foss dependencies
+comp_mpi_tc_name = 'gmvapich2'
+comp_mpi_tc = (comp_mpi_tc_name, version)
+
+# compiler toolchain depencies
+# we need GCC and OpenMPI as explicit dependencies instead of gompi toolchain
+# because of toolchain preperation functions
+# For binutils, stick to http://wiki.osdev.org/Cross-Compiler_Successful_Builds
+dependencies = [
+    ('GCC', gccver),
+    ('MVAPICH2', '2.2b', '', ('GCC', gccver)),
+    (blaslib, blasver, blassuff, ('GCC', gccver)),
+    ('FFTW', '3.3.4', '', comp_mpi_tc),
+    ('ScaLAPACK', '2.0.2', '-%s%s' % (blas, blassuff), comp_mpi_tc),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gnuplot/gnuplot-5.0.3-foss-2016a.eb b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.0.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7e42e00e676c02b8b559e32f7f5a1f9ccf847ad5
--- /dev/null
+++ b/easybuild/easyconfigs/g/gnuplot/gnuplot-5.0.3-foss-2016a.eb
@@ -0,0 +1,42 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-97.html
+##
+easyblock = 'ConfigureMake'
+
+name = 'gnuplot'
+version = '5.0.3'
+
+homepage = 'http://gnuplot.sourceforge.net/'
+description = """Portable interactive, function plotting utility"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [('http://sourceforge.net/projects/gnuplot/files', 'download')]
+
+dependencies = [
+    ('cairo', '1.14.6'),
+    ('libjpeg-turbo', '1.4.2'),
+    ('libpng', '1.6.21'),
+    ('libgd', '2.1.1'),
+    ('Pango', '1.39.0'),
+    ('libcerf', '1.4'),
+    ('Qt', '4.8.7'),
+]
+
+configopts = '--with-qt=qt4 '
+
+sanity_check_paths = {
+    'files': ['bin/gnuplot'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/gnutls/gnutls-3.4.11-foss-2016a.eb b/easybuild/easyconfigs/g/gnutls/gnutls-3.4.11-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fbf5215dd85dac343dcf3b29bea87c86122734b1
--- /dev/null
+++ b/easybuild/easyconfigs/g/gnutls/gnutls-3.4.11-foss-2016a.eb
@@ -0,0 +1,40 @@
+easyblock = 'ConfigureMake'
+
+name = 'gnutls'
+version = '3.4.11'
+
+homepage = 'http://www.gnutls.org/'
+description = """GnuTLS is a secure communications library implementing the SSL, TLS
+ and DTLS protocols and technologies around them. It provides a simple
+ C language application programming interface (API) to access the secure
+ communications protocols as well as APIs to parse and write X.509, PKCS #12,
+ OpenPGP and other required structures. It is aimed to be portable
+ and efficient with focus on security and interoperability."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['ftp://ftp.gnutls.org/gcrypt/gnutls/v%(version_major_minor)s']
+sources = [SOURCE_TAR_XZ]
+
+guilever = '1.8.8'
+guileshortver = '.'.join(guilever.split('.')[:2])
+dependencies = [
+    ('GMP', '6.1.0'),
+    ('nettle', '3.1.1'),
+    ('guile', guilever),
+    ('libtasn1', '4.7'),
+    ('libidn', '1.32'),
+    ('p11-kit', '0.23.2'),
+]
+
+configopts = "--with-guile-site-dir=$EBROOTGUILE --enable-openssl-compatibility "
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['certtool', 'crywrap', 'gnutls-cli', 'gnutls-cli-debug',
+                                     'gnutls-serv', 'ocsptool', 'psktool', 'srptool']] +
+             ['lib/libgnutls%s' % x for x in ['.%s' % SHLIB_EXT, 'xx.%s' % SHLIB_EXT, '-openssl.%s' % SHLIB_EXT]] +
+             ['lib/guile/%s/guile-gnutls-v-2.so' % guileshortver],
+    'dirs': ['include/gnutls'],
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/g/gompi/gompi-2016.04.eb b/easybuild/easyconfigs/g/gompi/gompi-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b978fd902aac939edf1cf5c558427ceb444ca4cd
--- /dev/null
+++ b/easybuild/easyconfigs/g/gompi/gompi-2016.04.eb
@@ -0,0 +1,20 @@
+easyblock = "Toolchain"
+
+name = 'gompi'
+version = '2016.04'
+
+homepage = '(none)'
+description = """GNU Compiler Collection (GCC) based compiler toolchain,
+ including OpenMPI for MPI support."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+gccver = '5.3.0-2.26'
+
+# compiler toolchain dependencies
+dependencies = [
+    ('GCC', gccver),  # includes both GCC 5.3.0 and binutils 2.26
+    ('OpenMPI', '1.10.2', '', ('GCC', gccver)),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/g/gperf/gperf-3.0.4-foss-2016a.eb b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0547875020f632eeefda1c796e94284fd75495d3
--- /dev/null
+++ b/easybuild/easyconfigs/g/gperf/gperf-3.0.4-foss-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'gperf'
+version = '3.0.4'
+
+homepage = 'http://www.gnu.org/software/gperf/'
+description = """GNU gperf is a perfect hash function generator. For a given list of strings, it produces a hash
+ function and hash table, in form of C or C++ code, for looking up a value depending on the input string. The hash
+ function is perfect, which means that the hash table has no collisions, and the hash table lookup needs a single
+ string comparison only."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/gperf'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/g/grace/grace-5.1.25-intel-2016a.eb b/easybuild/easyconfigs/g/grace/grace-5.1.25-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e538b0ca3bf00d6bb07f2f98833ae6014128d26c
--- /dev/null
+++ b/easybuild/easyconfigs/g/grace/grace-5.1.25-intel-2016a.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'grace'
+version = '5.1.25'
+
+homepage = 'http://freecode.com/projects/grace'
+description = """Grace is a WYSIWYG 2D plotting tool for X Windows System and Motif."""
+
+source_urls = ['ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable']
+sources = [SOURCE_TAR_GZ]
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+dependencies = [
+    ('motif', '2.3.5'),
+    ('netCDF', '4.4.0'),
+]
+
+runtest = 'tests'
+
+# we also need to run make links right before or after make install.
+installopts = 'links'
+
+sanity_check_paths = {
+    'files': ['bin/xmgrace'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-goolf-1.4.10.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-goolf-1.4.10.eb
index ffd2e3a7a6b38b432a606ae0ca844c3666297fc2..4bcdb9773bc5cc8533adf9e74dafc202c5a8cdd1 100644
--- a/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-goolf-1.4.10.eb
@@ -17,7 +17,7 @@ dependencies = [
     ('JasPer', '1.900.1'),
 ]
 
-preconfigopts = 'FC=$F90'
+preconfigopts = 'env FC=$F90'
 configopts = '--with-jasper=$EBROOTJASPER'
 
 parallel = 1
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-4.1.13.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-4.1.13.eb
index 8f6396f5b825af5b944ed1efd5cd7b3d38d88220..7a4d21e07884792b52abbb24072dbcc1b3b89d5c 100644
--- a/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-4.1.13.eb
@@ -17,7 +17,7 @@ dependencies = [
     ('JasPer', '1.900.1'),
 ]
 
-preconfigopts = 'FC=$F90'
+preconfigopts = 'env FC=$F90'
 configopts = '--with-jasper=$EBROOTJASPER'
 
 parallel = 1
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-5.3.0.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-5.3.0.eb
index ee472aa37273fd21f272bb51b379cb99473f1c33..4e298ad677bbc0638c9480f2b113772a2fc6c294 100644
--- a/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.10.0-ictce-5.3.0.eb
@@ -17,7 +17,7 @@ dependencies = [
     ('JasPer', '1.900.1'),
 ]
 
-preconfigopts = 'FC=$F90'
+preconfigopts = 'env FC=$F90'
 configopts = '--with-jasper=$EBROOTJASPER'
 
 parallel = 1
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goalf-1.1.0-no-OFED.eb
index ef2423ee53111d75fd2653ca06cfe8861c3f8a75..4b6a000d122ba0c8f56dfa5689107496a566dbf3 100644
--- a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goalf-1.1.0-no-OFED.eb
@@ -17,7 +17,7 @@ dependencies = [
     ('JasPer', '1.900.1'),
 ]
 
-preconfigopts = 'FC=$F90'
+preconfigopts = 'env FC=$F90'
 configopts = '--with-jasper=$EBROOTJASPER'
 
 parallel = 1
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goolf-1.4.10.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goolf-1.4.10.eb
index c0f9f1c6d84ab72e71f15f13bb063ed8b4e3fa5c..9445690c859c10978249a3faabe7996bdf3976b3 100644
--- a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-goolf-1.4.10.eb
@@ -16,7 +16,7 @@ dependencies = [
     ('JasPer', '1.900.1'),
 ]
 
-preconfigopts = 'FC=$F90'
+preconfigopts = 'env FC=$F90'
 configopts = '--with-jasper=$EBROOTJASPER'
 
 parallel = 1
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-4.1.13.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-4.1.13.eb
index 384aa93ebf4a83eb860f32ea75f465dc46ba0e19..1f66eb79d751de87e71563d9b875c9ce977ae5af 100644
--- a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-4.1.13.eb
@@ -17,7 +17,7 @@ dependencies = [
     ('JasPer', '1.900.1'),
 ]
 
-preconfigopts = 'FC=$F90'
+preconfigopts = 'env FC=$F90'
 configopts = '--with-jasper=$EBROOTJASPER'
 
 parallel = 1
diff --git a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-5.3.0.eb b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-5.3.0.eb
index 048ac9570d3e78b0aeadcc9724ae231d1ea0b0de..8bc580fd829ce5af4240ebe32edf7d07ee27bd93 100644
--- a/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/g/grib_api/grib_api-1.9.18-ictce-5.3.0.eb
@@ -18,7 +18,7 @@ dependencies = [
     ('JasPer', '1.900.1'),
 ]
 
-preconfigopts = 'FC=$F90'
+preconfigopts = 'env FC=$F90'
 configopts = '--with-jasper=$EBROOTJASPER'
 
 parallel = 1
diff --git a/easybuild/easyconfigs/g/gromosXX/gromosXX-1.0.1737-goolf-1.5.14-mpi.eb b/easybuild/easyconfigs/g/gromosXX/gromosXX-1.0.1737-goolf-1.5.14-mpi.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3020c00623d6bbd1bf5dab519d23790332dd2d34
--- /dev/null
+++ b/easybuild/easyconfigs/g/gromosXX/gromosXX-1.0.1737-goolf-1.5.14-mpi.eb
@@ -0,0 +1,34 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Benjamin P. Roberts
+# New Zealand eScience Infrastructure
+# The University of Auckland, Auckland, New Zealand 
+
+easyblock = 'ConfigureMake'
+
+name = 'gromosXX'
+version = '1.0.1737'
+versionsuffix = '-mpi'
+
+homepage = 'http://www.gromos.net/'
+description = """ GROMOS™ is an acronym of the GROningen MOlecular Simulation
+computer program package, which has been developed since 1978 for the dynamic
+modelling of (bio)molecules, until 1990 at the University of Groningen, The
+Netherlands, and since then at the ETH, the Swiss Federal Institute of
+Technology, in Zürich, Switzerland. """ 
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+toolchainopts = {'openmp': False, 'usempi': True}
+
+sources = ['%(name)s-%(version)s.tar.bz2']
+
+dependencies = [('GSL', '1.16')]
+
+preconfigopts = './Config.sh &&'
+configopts = '--enable-mpi'
+
+sanity_check_paths = {
+    'files': ["bin/md", "bin/md_mpi", "lib/libmdpp.a"],
+    'dirs': ['include/md++'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/gromosXX/gromosXX-1.0.1737-goolf-1.5.14-openmp.eb b/easybuild/easyconfigs/g/gromosXX/gromosXX-1.0.1737-goolf-1.5.14-openmp.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8cae45f338cf3debf8b0fb4de4cf883e26c957a3
--- /dev/null
+++ b/easybuild/easyconfigs/g/gromosXX/gromosXX-1.0.1737-goolf-1.5.14-openmp.eb
@@ -0,0 +1,34 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Benjamin P. Roberts
+# New Zealand eScience Infrastructure
+# The University of Auckland, Auckland, New Zealand 
+
+easyblock = 'ConfigureMake'
+
+name = 'gromosXX'
+version = '1.0.1737'
+versionsuffix = '-openmp'
+
+homepage = 'http://www.gromos.net/'
+description = """ GROMOS™ is an acronym of the GROningen MOlecular Simulation
+computer program package, which has been developed since 1978 for the dynamic
+modelling of (bio)molecules, until 1990 at the University of Groningen, The
+Netherlands, and since then at the ETH, the Swiss Federal Institute of
+Technology, in Zürich, Switzerland. """ 
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+toolchainopts = {'openmp': True, 'usempi': False}
+
+sources = ['%(name)s-%(version)s.tar.bz2']
+
+dependencies = [('GSL', '1.16')]
+
+preconfigopts = './Config.sh &&'
+configopts = '--enable-openmp'
+
+sanity_check_paths = {
+    'files': ["bin/md", "bin/md_mpi", "lib/libmdpp.a"],
+    'dirs': ['include/md++'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/gromosXX/gromosXX-1.0.1737-goolf-1.5.14-serial.eb b/easybuild/easyconfigs/g/gromosXX/gromosXX-1.0.1737-goolf-1.5.14-serial.eb
new file mode 100644
index 0000000000000000000000000000000000000000..075812f642abe8ddb2da3b48cd79018f0ea324d4
--- /dev/null
+++ b/easybuild/easyconfigs/g/gromosXX/gromosXX-1.0.1737-goolf-1.5.14-serial.eb
@@ -0,0 +1,33 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Benjamin P. Roberts
+# New Zealand eScience Infrastructure
+# The University of Auckland, Auckland, New Zealand 
+
+easyblock = 'ConfigureMake'
+
+name = 'gromosXX'
+version = '1.0.1737'
+versionsuffix = '-serial'
+
+homepage = 'http://www.gromos.net/'
+description = """ GROMOS™ is an acronym of the GROningen MOlecular Simulation
+computer program package, which has been developed since 1978 for the dynamic
+modelling of (bio)molecules, until 1990 at the University of Groningen, The
+Netherlands, and since then at the ETH, the Swiss Federal Institute of
+Technology, in Zürich, Switzerland. """ 
+
+toolchain = {'name': 'goolf', 'version': '1.5.14'}
+toolchainopts = {'openmp': False, 'usempi': False}
+
+sources = ['%(name)s-%(version)s.tar.bz2']
+
+dependencies = [('GSL', '1.16')]
+
+preconfigopts = './Config.sh &&'
+
+sanity_check_paths = {
+    'files': ["bin/md", "bin/md_mpi", "lib/libmdpp.a"],
+    'dirs': ['include/md++'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/g/guile/guile-1.8.8-foss-2016a.eb b/easybuild/easyconfigs/g/guile/guile-1.8.8-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..132fe56abfc7e866b853a4eaec1542c5df9c9117
--- /dev/null
+++ b/easybuild/easyconfigs/g/guile/guile-1.8.8-foss-2016a.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'guile'
+version = '1.8.8'
+
+homepage = 'http://www.gnu.org/software/guile'
+description = """Guile is the GNU Ubiquitous Intelligent Language for Extensions,
+ the official extension language for the GNU operating system."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [
+    ('libtool', '2.4.6'),
+    ('GMP', '6.1.0'),
+    ('libunistring', '0.9.3'),
+    ('pkg-config', '0.29'),
+    ('libffi', '3.2.1'),
+    ('libreadline', '6.3'),
+]
+
+configopts = " --enable-error-on-warning=no"
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["guile", 'guile-config', 'guile-snarf', 'guile-tools']] +
+             ["lib/libguile.a", "include/libguile.h"],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/h/HDF/HDF-4.2.11-intel-2016a.eb b/easybuild/easyconfigs/h/HDF/HDF-4.2.11-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..28e5e6ad3626ad60b49496476b9887f442feb4cd
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF/HDF-4.2.11-intel-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'HDF'
+version = '4.2.11'
+
+homepage = 'http://www.hdfgroup.org/products/hdf4/'
+description = """HDF (also known as HDF4) is a library and multi-object file format for storing and managing data between machines."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.hdfgroup.org/ftp/HDF/releases/HDF%(version)s/src/']
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+]
+dependencies = [
+    ('Szip', '2.1'),
+    ('libjpeg-turbo', '1.4.2'),
+]
+
+configopts = "--with-szlib=$EBROOTSZIP --includedir=%(installdir)s/include/%(namelower)s"
+
+modextrapaths = {'CPATH': 'include/hdf'}
+
+sanity_check_paths = {
+    'files': ['lib/libdf.a', 'lib/libhdf4.settings', 'lib/libmfhdf.a'],
+    'dirs': ['bin', 'include/hdf'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-foss-2016a-serial.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-foss-2016a-serial.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2936e9795e141ba85e0e29bb22751f0d526812c1
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-foss-2016a-serial.eb
@@ -0,0 +1,22 @@
+name = 'HDF5'
+version = '1.8.16'
+versionsuffix = '-serial'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True, 'usempi': False}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['configure_libtool.patch']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d1c17ce30e587c89343aa470163633f0c3eba61a
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.16-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,26 @@
+name = 'HDF5'
+version = '1.8.16'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'optarch': True, 'pic': True, 'usempi': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'HDF5-1.8.15_configure_intel.patch',
+    'configure_libtool.patch',
+]
+
+buildopts = 'CXXFLAGS="$CXXFLAGS -DMPICH_IGNORE_CXX_SEEK"'
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-goolf-1.5.16.eb b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-goolf-1.5.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..46dd3d15ada97e5cf7db37e6ebaada9010c1606b
--- /dev/null
+++ b/easybuild/easyconfigs/h/HDF5/HDF5-1.8.9-goolf-1.5.16.eb
@@ -0,0 +1,21 @@
+name = 'HDF5'
+version = '1.8.9'
+
+homepage = 'http://www.hdfgroup.org/HDF5/'
+description = """HDF5 is a unique technology suite that makes possible the management of 
+ extremely large and complex data collections."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+toolchainopts = {'optarch': True, 'usempi': True, 'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = ['configure_libtool.patch']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Szip', '2.1'),
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/h/HISAT2/HISAT2-2.0.3-beta-intel-2016a.eb b/easybuild/easyconfigs/h/HISAT2/HISAT2-2.0.3-beta-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ab9ee05adb88df725d57f5a0114e5a51c83cffae
--- /dev/null
+++ b/easybuild/easyconfigs/h/HISAT2/HISAT2-2.0.3-beta-intel-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'MakeCp'
+
+name = 'HISAT2'
+version = '2.0.3-beta'
+
+homepage = 'https://ccb.jhu.edu/software/hisat2/index.shtml'
+description = """HISAT2 is a fast and sensitive alignment program for mapping next-generation sequencing reads
+ (both DNA and RNA) against the general human population (as well as against a single reference genome)."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = ['%(namelower)s-%(version)s-source.zip']
+source_urls = ['ftp://ftp.ccb.jhu.edu/pub/infphilo/%(namelower)s/downloads/']
+
+checksums = ['deb29e32e48045b2f970fb999946b411']
+
+dependencies = [
+    ('NGS', '1.2.3'),
+    ('ncbi-vdb', '2.5.8-1'),
+]
+
+buildopts = "USE_SRA=1 NCBI_NGS_DIR=$EBROOTNGS NCBI_VDB_DIR=$EBROOTNCBIMINVDB"
+
+executables = ['hisat2', 'hisat2-align-l', 'hisat2-align-s', 'hisat2-build', 'hisat2-build-l', 'hisat2-build-s',
+               'hisat2-inspect', 'hisat2-inspect-s', 'hisat2-inspect-l']
+files_to_copy = [(executables, 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in executables],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.06-XC.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.06.eb
similarity index 91%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.06-XC.eb
rename to easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.06.eb
index 845802b50453459a0037378e23af09ca6ad9405d..934cc8d3eba6ae6200d69b2ef55398b3975cb5f8 100644
--- a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.06-XC.eb
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.06.eb
@@ -6,7 +6,7 @@ description = """HPL is a software package that solves a (random) dense linear s
  on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
  High Performance Computing Linpack Benchmark."""
 
-toolchain = {'name': 'CrayCCE', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayCCE', 'version': '2015.06'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.11-XC.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.11.eb
similarity index 91%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.11-XC.eb
rename to easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.11.eb
index f4a0256f792ccb59850cab642b040dcce744c346..7a8e5a0800a1066a62c4d21c3218e1ef6c225782 100644
--- a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.11-XC.eb
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayCCE-2015.11.eb
@@ -6,7 +6,7 @@ description = """HPL is a software package that solves a (random) dense linear s
  on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
  High Performance Computing Linpack Benchmark."""
 
-toolchain = {'name': 'CrayCCE', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayCCE', 'version': '2015.11'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.06.eb
similarity index 91%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.06.eb
index fe0de8812c09e89270bcd9e93f493d9b8d9857a9..4f4dbfc813e7bb2c067516570a5e6a6b23b7002c 100644
--- a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.06.eb
@@ -6,7 +6,7 @@ description = """HPL is a software package that solves a (random) dense linear s
  on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
  High Performance Computing Linpack Benchmark."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.11.eb
similarity index 91%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.11.eb
index ecd5998b8d6a52014e0fb7fed6fd9d0e03cae82d..455f495e6effbee37ed41d4de3bd31a548ab2196 100644
--- a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayGNU-2015.11.eb
@@ -6,7 +6,7 @@ description = """HPL is a software package that solves a (random) dense linear s
  on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
  High Performance Computing Linpack Benchmark."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.06-XC.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.06.eb
similarity index 91%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.06-XC.eb
rename to easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.06.eb
index 32e943a8d6e9be4c4dad2d6db3c6c23d6857d5ef..00ee4facc9deb07e6e72a87f7a53cdfe19e45f36 100644
--- a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.06-XC.eb
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.06.eb
@@ -6,7 +6,7 @@ description = """HPL is a software package that solves a (random) dense linear s
  on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
  High Performance Computing Linpack Benchmark."""
 
-toolchain = {'name': 'CrayIntel', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayIntel', 'version': '2015.06'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.11-XC.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.11.eb
similarity index 91%
rename from easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.11-XC.eb
rename to easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.11.eb
index 370ce49b4cf7cb051b02d4f1763140117941e9ce..651ae824ba838e35c74049fb2a3e6ef2a1b29fa0 100644
--- a/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.11-XC.eb
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-CrayIntel-2015.11.eb
@@ -6,7 +6,7 @@ description = """HPL is a software package that solves a (random) dense linear s
  on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
  High Performance Computing Linpack Benchmark."""
 
-toolchain = {'name': 'CrayIntel', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayIntel', 'version': '2015.11'}
 toolchainopts = {'optarch': True, 'usempi': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-foss-2016.04.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-foss-2016.04.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e65fa73edae405813768602c29b28c43f3f096b5
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-foss-2016.04.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.1'
+
+homepage = 'http://www.netlib.org/benchmark/hpl/'
+description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
+ on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
+ High Performance Computing Linpack Benchmark."""
+
+toolchain = {'name': 'foss', 'version': '2016.04'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+# fix Make dependencies, so parallel build also works
+patches = ['HPL_parallel-make.patch']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-gmpolf-2016a.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-gmpolf-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ae8a971cbf82e4e5053e35466e3bbdde03f12219
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-gmpolf-2016a.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.1'
+
+homepage = 'http://www.netlib.org/benchmark/hpl/'
+description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
+ on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
+ High Performance Computing Linpack Benchmark."""
+
+toolchain = {'name': 'gmpolf', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+# fix Make dependencies, so parallel build also works
+patches = ['HPL_parallel-make.patch']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-gmvolf-2016a.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-gmvolf-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d581afc6f7e9572c10e24cb327bcbc8c4a82c106
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-gmvolf-2016a.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.1'
+
+homepage = 'http://www.netlib.org/benchmark/hpl/'
+description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
+ on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
+ High Performance Computing Linpack Benchmark."""
+
+toolchain = {'name': 'gmvolf', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+# fix Make dependencies, so parallel build also works
+patches = ['HPL_parallel-make.patch']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..977c7d487d17b2770aec1bfd1f5449799864b0b8
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.1'
+
+homepage = 'http://www.netlib.org/benchmark/hpl/'
+description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
+ on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
+ High Performance Computing Linpack Benchmark."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+# fix Make dependencies, so parallel build also works
+patches = ['HPL_parallel-make.patch']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-2016.02-GCC-5.3.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-2016.02-GCC-5.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ffa453cdb4c22027945f80f38f679b2b266c405d
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-2016.02-GCC-5.3.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.1'
+
+homepage = 'http://www.netlib.org/benchmark/hpl/'
+description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
+ on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
+ High Performance Computing Linpack Benchmark."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-5.3'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+# fix Make dependencies, so parallel build also works
+patches = ['HPL_parallel-make.patch']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-2016.03-GCC-5.3.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-2016.03-GCC-5.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7eaca67c162c11e2ba28214466a4f616ff575c9b
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-intel-2016.03-GCC-5.3.eb
@@ -0,0 +1,18 @@
+name = 'HPL'
+version = '2.1'
+
+homepage = 'http://www.netlib.org/benchmark/hpl/'
+description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
+ on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
+ High Performance Computing Linpack Benchmark."""
+
+toolchain = {'name': 'intel', 'version': '2016.03-GCC-5.3'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+# fix Make dependencies, so parallel build also works
+patches = ['HPL_parallel-make.patch']
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HPL/HPL-2.1-pomkl-2016.03.eb b/easybuild/easyconfigs/h/HPL/HPL-2.1-pomkl-2016.03.eb
new file mode 100644
index 0000000000000000000000000000000000000000..73bc06cddb32595cbc83eaa0cd7f59879cf046e5
--- /dev/null
+++ b/easybuild/easyconfigs/h/HPL/HPL-2.1-pomkl-2016.03.eb
@@ -0,0 +1,23 @@
+name = 'HPL'
+version = '2.1'
+
+homepage = 'http://www.netlib.org/benchmark/hpl/'
+description = """HPL is a software package that solves a (random) dense linear system in double precision (64 bits) arithmetic 
+ on distributed-memory computers. It can thus be regarded as a portable as well as freely available implementation of the 
+ High Performance Computing Linpack Benchmark."""
+
+toolchain = {'name': 'pomkl', 'version': '2016.03'}
+toolchainopts = {'optarch': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.netlib.org/benchmark/%(namelower)s']
+
+# fix Make dependencies, so parallel build also works
+patches = ['HPL_parallel-make.patch']
+
+# needs to include -ldl or else we get
+# .../libmkl_core.a(mkl_memory_patched.o): undefined reference to symbol 'dlsym@@GLIBC_2.2.5'
+import os
+os.environ['LIBS'] = '-ldl'
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/h/HTSlib/HTSlib-1.3-foss-2016a.eb b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..93d7d3c6dfeabd1ac3bce9afa692144f79f315ab
--- /dev/null
+++ b/easybuild/easyconfigs/h/HTSlib/HTSlib-1.3-foss-2016a.eb
@@ -0,0 +1,27 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = 'ConfigureMake'
+
+name = 'HTSlib'
+version = '1.3'
+
+homepage = "http://www.htslib.org/"
+description = """A C library for reading/writing high-throughput sequencing data.
+ This package includes the utilities bgzip and tabix"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/samtools/%(namelower)s/releases/download/%(version)s/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+dependencies = [('zlib', '1.2.8')]
+
+sanity_check_paths = {
+    'files': ["bin/bgzip", "bin/tabix", "lib/libhts.%s" % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.3-foss-2016a.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..91db4cfacdf229a5e1d9681230ce31f4d690f986
--- /dev/null
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.1.3-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'HarfBuzz'
+version = '1.1.3'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/HarfBuzz'
+description = """HarfBuzz is an OpenType text shaping engine."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.freedesktop.org/software/harfbuzz/release/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+glibver = '2.47.5'
+dependencies = [
+    ('GLib', glibver),
+    ('cairo', '1.14.6'),
+    ('freetype', '2.6.2'),
+    ('GObject-Introspection', '1.47.1')
+]
+
+configopts = "--enable-introspection=yes --with-gobject=yes --enable-static --enable-shared --with-cairo "
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['lib/libharfbuzz.%s' % SHLIB_EXT, 'bin/hb-view'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.2.7-intel-2016a.eb b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.2.7-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..23c2924fab3f5bbd4215203264ad6d8d5fa728b2
--- /dev/null
+++ b/easybuild/easyconfigs/h/HarfBuzz/HarfBuzz-1.2.7-intel-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'HarfBuzz'
+version = '1.2.7'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/HarfBuzz'
+description = """HarfBuzz is an OpenType text shaping engine."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://www.freedesktop.org/software/harfbuzz/release/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+glibver = '2.48.0'
+dependencies = [
+    ('GLib', glibver),
+    ('cairo', '1.14.6', '-GLib-%s' % glibver),
+    ('freetype', '2.6.3'),
+    ('GObject-Introspection', '1.48.0')
+]
+
+configopts = "--enable-introspection=yes --with-gobject=yes --enable-static --enable-shared --with-cairo "
+
+modextrapaths = {
+    'GI_TYPELIB_PATH': 'share',
+    'XDG_DATA_DIRS': 'share',
+}
+
+sanity_check_paths = {
+    'files': ['lib/libharfbuzz.%s' % SHLIB_EXT, 'bin/hb-view'],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5a122dc9232ce0cec021780bca8f0fcf0e780fd4
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-GCC-5.3.0-2.26.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'hwloc'
+version = '1.11.3'
+
+homepage = 'http://www.open-mpi.org/projects/hwloc/'
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction
+ (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including
+ NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various
+ system attributes such as cache and memory information as well as the locality of I/O devices such as
+ network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
+ information about modern computing hardware so as to exploit it accordingly and efficiently."""
+
+toolchain = {'name': 'GCC', 'version': '5.3.0-2.26'}
+
+source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('numactl', '2.0.11')]
+
+configopts = "--enable-libnuma=$EBROOTNUMACTL"
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-PGI-16.3-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-PGI-16.3-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..54ea46766a7c8b0279408c9dc9f2c8fed2e90d72
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-PGI-16.3-GCC-4.9.3-2.25.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'hwloc'
+version = '1.11.3'
+
+homepage = 'http://www.open-mpi.org/projects/hwloc/'
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction
+ (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including
+ NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various
+ system attributes such as cache and memory information as well as the locality of I/O devices such as
+ network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
+ information about modern computing hardware so as to exploit it accordingly and efficiently."""
+
+toolchain = {'name': 'PGI', 'version': '16.3-GCC-4.9.3-2.25'}
+
+source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+
+# numactl is a direct dependency of PGI
+configopts = "--enable-libnuma=$EBROOTNUMACTL"
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-intel-2016a.eb b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..aad28dd23b6cb27ba76824d625504cb0a129658b
--- /dev/null
+++ b/easybuild/easyconfigs/h/hwloc/hwloc-1.11.3-intel-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'hwloc'
+version = '1.11.3'
+
+homepage = 'http://www.open-mpi.org/projects/hwloc/'
+description = """The Portable Hardware Locality (hwloc) software package provides a portable abstraction
+ (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including
+ NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various
+ system attributes such as cache and memory information as well as the locality of I/O devices such as
+ network interfaces, InfiniBand HCAs or GPUs. It primarily aims at helping applications with gathering
+ information about modern computing hardware so as to exploit it accordingly and efficiently."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://www.open-mpi.org/software/hwloc/v%(version_major_minor)s/downloads/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('numactl', '2.0.11')]
+
+configopts = "--enable-libnuma=$EBROOTNUMACTL"
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/i/IGVTools/IGVTools-2.3.72-Java-1.7.0_80.eb b/easybuild/easyconfigs/i/IGVTools/IGVTools-2.3.72-Java-1.7.0_80.eb
new file mode 100644
index 0000000000000000000000000000000000000000..af0616b491d09844d250c58a3543147372e99fad
--- /dev/null
+++ b/easybuild/easyconfigs/i/IGVTools/IGVTools-2.3.72-Java-1.7.0_80.eb
@@ -0,0 +1,38 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics
+# Modified by Adam Huffman
+# The Francis Crick Institute 
+
+easyblock = 'Tarball'
+
+name = 'IGVTools'
+version = '2.3.72'
+
+homepage = 'http://www.broadinstitute.org/software/igv/'
+description = """ This package contains command line utilities for preprocessing, 
+ computing feature count density (coverage),  sorting, and indexing data files.
+ See also http://www.broadinstitute.org/software/igv/igvtools_commandline. """
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://data.broadinstitute.org/igv/projects/downloads/']
+sources = ['%(namelower)s_%(version)s.zip']
+
+java = 'Java'
+javaver = '1.7.0_80'
+versionsuffix = '-%s-%s' % (java, javaver)
+dependencies = [(java, javaver)]
+
+# add the installation dir to PATH
+modextrapaths = { 
+    'PATH': '',
+}
+
+sanity_check_paths = {
+    'files': ["igvtools.jar", "igvtools"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/i/IPython/IPython-3.2.1-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/i/IPython/IPython-3.2.1-intel-2015a-Python-2.7.10.eb
index 4c966b0d8aa55b12cf8fad541c67d26de4513414..92dcaa700c62d90dbe1ba3fe6d630d4bd779eb1e 100644
--- a/easybuild/easyconfigs/i/IPython/IPython-3.2.1-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/i/IPython/IPython-3.2.1-intel-2015a-Python-2.7.10.eb
@@ -25,7 +25,6 @@ dependencies = [
 
 # this is a bundle of Python packages
 exts_defaultclass = 'PythonPackage'
-exts_filter = ("python -c 'import %(ext_name)s'", '')
 
 exts_list = [
     ('pysqlite', '2.7.0', {
diff --git a/easybuild/easyconfigs/i/IPython/IPython-3.2.3-foss-2015a-Python-2.7.11.eb b/easybuild/easyconfigs/i/IPython/IPython-3.2.3-foss-2015a-Python-2.7.11.eb
index 6a2901ff52a1797d22ba3a8af5a5ae668b2fb4d5..59f875819a2bc60d49f98174c1beb7da97bd545d 100644
--- a/easybuild/easyconfigs/i/IPython/IPython-3.2.3-foss-2015a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/i/IPython/IPython-3.2.3-foss-2015a-Python-2.7.11.eb
@@ -2,6 +2,7 @@ easyblock = 'Bundle'
 
 name = 'IPython'
 version = '3.2.3'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://ipython.org/index.html'
 description = """IPython provides a rich architecture for interactive computing with:
@@ -13,19 +14,13 @@ description = """IPython provides a rich architecture for interactive computing
 
 toolchain = {'name': 'foss', 'version': '2015a'}
 
-python = 'Python'
-pyver = '2.7.11'
-pyshortver = '.'.join(pyver.split('.')[:2])
-versionsuffix = '-%s-%s' % (python, pyver)
-
 dependencies = [
-    (python, pyver),
+    ('Python', '2.7.11'),
     ('PyZMQ', '15.2.0', '%s-zmq4' % versionsuffix),
 ]
 
 # this is a bundle of Python packages
 exts_defaultclass = 'PythonPackage'
-exts_filter = ("python -c 'import %(ext_name)s'", '')
 
 exts_list = [
     ('pysqlite', '2.8.1', {
@@ -53,9 +48,18 @@ exts_list = [
     ('tornado', '4.3', {
         'source_urls': ['https://pypi.python.org/packages/source/t/tornado/'],
     }),
+    ('MarkupSafe', '0.23', {
+        'source_urls': ['https://pypi.python.org/packages/source/M/MarkupSafe/'],
+    }),
     ('Jinja2', '2.8', {
         'source_urls': ['https://pypi.python.org/packages/source/J/Jinja2/'],
     }),
+    ('vcversioner', '2.16.0.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/v/vcversioner/'],
+    }),
+    ('functools32', '3.2.3-2', {
+        'source_urls': ['https://pypi.python.org/packages/source/f/functools32/'],
+    }),
     ('jsonschema', '2.5.1', {
         'source_urls': ['https://pypi.python.org/packages/source/j/jsonschema/'],
     }),
@@ -74,11 +78,11 @@ exts_list = [
     }),
 ]
 
-modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyshortver]}
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
 
 sanity_check_paths = {
     'files': ['bin/ipython'],
-    'dirs': ['lib/python%s/site-packages/IPython' % pyshortver],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/IPython'],
 }
 
 sanity_check_commands = [
diff --git a/easybuild/easyconfigs/i/IPython/IPython-3.2.3-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/i/IPython/IPython-3.2.3-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5a7a6fc6ee332041aa8a21312e0badb06d14e52a
--- /dev/null
+++ b/easybuild/easyconfigs/i/IPython/IPython-3.2.3-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,94 @@
+easyblock = 'Bundle'
+
+name = 'IPython'
+version = '3.2.3'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://ipython.org/index.html'
+description = """IPython provides a rich architecture for interactive computing with:
+ Powerful interactive shells (terminal and Qt-based).
+ A browser-based notebook with support for code, text, mathematical expressions, inline plots and other rich media.
+ Support for interactive data visualization and use of GUI toolkits.
+ Flexible, embeddable interpreters to load into your own projects.
+ Easy to use, high performance tools for parallel computing."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('PyZMQ', '15.2.0', '%s-zmq4' % versionsuffix),
+]
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+exts_list = [
+    ('pysqlite', '2.8.1', {
+        'modulename': 'pysqlite2',
+        'source_urls': ['https://pypi.python.org/packages/source/p/pysqlite/'],
+    }),
+    ('requests', '2.9.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/r/requests/'],
+    }),
+    ('Pygments', '2.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/P/Pygments/'],
+    }),
+    ('singledispatch', '3.4.0.3', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/singledispatch/'],
+    }),
+    ('backports.ssl_match_hostname', '3.5.0.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/backports.ssl_match_hostname/'],
+    }),
+    ('certifi', '2015.11.20.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/c/certifi/'],
+    }),
+    ('backports_abc', '0.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/backports_abc/'],
+    }),
+    ('tornado', '4.3', {
+        'source_urls': ['https://pypi.python.org/packages/source/t/tornado/'],
+    }),
+    ('MarkupSafe', '0.23', {
+        'source_urls': ['https://pypi.python.org/packages/source/M/MarkupSafe/'],
+    }),
+    ('Jinja2', '2.8', {
+        'source_urls': ['https://pypi.python.org/packages/source/J/Jinja2/'],
+    }),
+    ('vcversioner', '2.16.0.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/v/vcversioner/'],
+    }),
+    ('functools32', '3.2.3-2', {
+        'source_urls': ['https://pypi.python.org/packages/source/f/functools32/'],
+    }),
+    ('jsonschema', '2.5.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/j/jsonschema/'],
+    }),
+    ('mistune', '0.7.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/m/mistune/'],
+    }),
+    ('ptyprocess', '0.5', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/ptyprocess/'],
+    }),
+    ('terminado', '0.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/t/terminado/'],
+    }),
+    ('ipython', version, {
+        'source_urls': ['https://pypi.python.org/packages/source/i/ipython/'],
+        'modulename': 'IPython',
+    }),
+]
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+sanity_check_paths = {
+    'files': ['bin/ipython'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/IPython'],
+}
+
+sanity_check_commands = [
+    ('ipython -h', ''),
+    ('ipython notebook --help', ''),
+    ('iptest', ''),
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/i/IPython/IPython-3.2.3-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/i/IPython/IPython-3.2.3-intel-2015b-Python-2.7.10.eb
index fd3e839da8d3eb686b8b3de324ca76daf1b04802..4c8be19f1d3b7d404fb6bbeb1a783ac1990b1af5 100644
--- a/easybuild/easyconfigs/i/IPython/IPython-3.2.3-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/i/IPython/IPython-3.2.3-intel-2015b-Python-2.7.10.eb
@@ -2,6 +2,7 @@ easyblock = 'Bundle'
 
 name = 'IPython'
 version = '3.2.3'
+versionsuffix = '-Python-%(pyver)s'
 
 homepage = 'http://ipython.org/index.html'
 description = """IPython provides a rich architecture for interactive computing with:
@@ -13,19 +14,13 @@ description = """IPython provides a rich architecture for interactive computing
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-python = 'Python'
-pyver = '2.7.10'
-pyshortver = '.'.join(pyver.split('.')[:2])
-versionsuffix = '-%s-%s' % (python, pyver)
-
 dependencies = [
-    (python, pyver),
+    ('Python', '2.7.10'),
     ('PyZMQ', '15.1.0', '%s-zmq4' % versionsuffix),
 ]
 
 # this is a bundle of Python packages
 exts_defaultclass = 'PythonPackage'
-exts_filter = ("python -c 'import %(ext_name)s'", '')
 
 exts_list = [
     ('pysqlite', '2.8.1', {
@@ -53,9 +48,18 @@ exts_list = [
     ('tornado', '4.3', {
         'source_urls': ['https://pypi.python.org/packages/source/t/tornado/'],
     }),
+    ('MarkupSafe', '0.23', {
+        'source_urls': ['https://pypi.python.org/packages/source/M/MarkupSafe/'],
+    }),
     ('Jinja2', '2.8', {
         'source_urls': ['https://pypi.python.org/packages/source/J/Jinja2/'],
     }),
+    ('vcversioner', '2.16.0.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/v/vcversioner/'],
+    }),
+    ('functools32', '3.2.3-2', {
+        'source_urls': ['https://pypi.python.org/packages/source/f/functools32/'],
+    }),
     ('jsonschema', '2.5.1', {
         'source_urls': ['https://pypi.python.org/packages/source/j/jsonschema/'],
     }),
@@ -74,11 +78,11 @@ exts_list = [
     }),
 ]
 
-modextrapaths = {'PYTHONPATH': ['lib/python%s/site-packages' % pyshortver]}
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
 
 sanity_check_paths = {
     'files': ['bin/ipython'],
-    'dirs': ['lib/python%s/site-packages/IPython' % pyshortver],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/IPython'],
 }
 
 sanity_check_commands = [
diff --git a/easybuild/easyconfigs/i/ISL/ISL-0.16-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/ISL/ISL-0.16-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6b38a91f39ee72a74dd68ba78fe266d1d76e9dbc
--- /dev/null
+++ b/easybuild/easyconfigs/i/ISL/ISL-0.16-GCC-4.9.3-2.25.eb
@@ -0,0 +1,21 @@
+easyblock = 'ConfigureMake'
+
+name = 'ISL'
+version = '0.16'
+
+homepage = 'http://isl.gforge.inria.fr/'
+description = """isl is a library for manipulating sets and relations of integer points bounded by linear constraints."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+source_urls = ['http://isl.gforge.inria.fr/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+dependencies = [('GMP', '6.1.0')]
+
+sanity_check_paths = {
+    'files': ['lib/libisl.%s' % SHLIB_EXT, 'lib/libisl.a'],
+    'dirs': ['include/isl']
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/i/i-PI/i-PI-1.0-20160213-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/i/i-PI/i-PI-1.0-20160213-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a0ac2c0885e18b579609756bf050f20b90bc0439
--- /dev/null
+++ b/easybuild/easyconfigs/i/i-PI/i-PI-1.0-20160213-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,27 @@
+easyblock = 'PythonPackage'
+
+name  ='i-PI'
+version = '1.0-20160213'
+commit = '2a09a6d'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/i-pi/i-pi'
+description = """A Python wrapper for (ab initio) (path integrals) molecular dynamics"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://github.com/i-pi/i-pi/archive/']
+sources = ['%s.tar.gz' % commit]
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+options = {'modulename': 'ipi'}
+
+sanity_check_paths = {
+    'files': ['bin/i-pi'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/i/icc/icc-2016.0.109-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/icc/icc-2016.0.109-GCC-4.9.3-2.25.eb
index 4ec5788f7fdff6ec2071dfef95b8dfdce4b6aac8..32978c0fbefda3cf7eba628d0d7627109bce171e 100644
--- a/easybuild/easyconfigs/i/icc/icc-2016.0.109-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2016.0.109-GCC-4.9.3-2.25.eb
@@ -21,6 +21,7 @@ dependencies = [
     ('binutils', binutilsver, '', ('GCCcore', gccver)),
 ]
 
+# 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?_']
diff --git a/easybuild/easyconfigs/i/icc/icc-2016.0.109.eb b/easybuild/easyconfigs/i/icc/icc-2016.0.109.eb
index c6144a5afd71b431b272866a66443c471a2c78e3..e56edba4dbd114128b90d96e06a41e1083cc9fe4 100644
--- a/easybuild/easyconfigs/i/icc/icc-2016.0.109.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2016.0.109.eb
@@ -12,6 +12,7 @@ sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_cpp.tgz']
 
 checksums = ['f57a892fb494db3c80f20a88aa3e901f']
 
+# 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?_']
diff --git a/easybuild/easyconfigs/i/icc/icc-2016.1.150-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/icc/icc-2016.1.150-GCC-4.9.3-2.25.eb
index 2a840e4a5b01583ad4b9547930a707cce737e556..9d56289dfcdb4fe2dbbe093232f3f1d04cd4f600 100644
--- a/easybuild/easyconfigs/i/icc/icc-2016.1.150-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/i/icc/icc-2016.1.150-GCC-4.9.3-2.25.eb
@@ -21,6 +21,7 @@ dependencies = [
     ('binutils', binutilsver, '', ('GCCcore', gccver)),
 ]
 
+# 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?_']
diff --git a/easybuild/easyconfigs/i/icc/icc-2016.2.181-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/icc/icc-2016.2.181-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4d0d75afae2914f5acf4739922f5a6cff60b7b99
--- /dev/null
+++ b/easybuild/easyconfigs/i/icc/icc-2016.2.181-GCC-4.9.3-2.25.eb
@@ -0,0 +1,33 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'icc'
+version = '2016.2.181'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "C and C++ compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_cpp_update%(version_minor)s.tgz']
+
+checksums = ['d6f8529a44231e427219c8e025dec3b2']
+
+gccver = '4.9.3'
+binutilsver = '2.25'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+]
+
+# 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?_']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2016.2.181-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/i/icc/icc-2016.2.181-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5c1c6d97c5481d9ba12f629bd7d636fd54c343f1
--- /dev/null
+++ b/easybuild/easyconfigs/i/icc/icc-2016.2.181-GCC-5.3.0-2.26.eb
@@ -0,0 +1,33 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'icc'
+version = '2016.2.181'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "C and C++ compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_cpp_update%(version_minor)s.tgz']
+
+checksums = ['d6f8529a44231e427219c8e025dec3b2']
+
+gccver = '5.3.0'
+binutilsver = '2.26'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+]
+
+# 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?_']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/icc/icc-2016.3.210-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/i/icc/icc-2016.3.210-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2192bcc50619f64c1cd66b857a5b8172002b118a
--- /dev/null
+++ b/easybuild/easyconfigs/i/icc/icc-2016.3.210-GCC-5.3.0-2.26.eb
@@ -0,0 +1,33 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'icc'
+version = '2016.3.210'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "C and C++ compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_cpp_update%(version_minor)s.tgz']
+
+checksums = ['b256c5573d4bba3692c9c4a6ac994d1c']
+
+gccver = '5.3.0'
+binutilsver = '2.26'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+]
+
+# 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?_']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2016.2.181-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/iccifort/iccifort-2016.2.181-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..871fae395a716b77de72c776de28e2125b8f5f7d
--- /dev/null
+++ b/easybuild/easyconfigs/i/iccifort/iccifort-2016.2.181-GCC-4.9.3-2.25.eb
@@ -0,0 +1,18 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+easyblock = "Toolchain"
+
+name = 'iccifort'
+version = '2016.2.181'
+versionsuffix = '-GCC-4.9.3-2.25'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and fortran compilers, Intel MPI and Intel MKL"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('icc', version, versionsuffix),
+    ('ifort', version, versionsuffix),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2016.2.181-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/i/iccifort/iccifort-2016.2.181-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e07e4371a20e3d6d836330d7dfb2f21d088c286c
--- /dev/null
+++ b/easybuild/easyconfigs/i/iccifort/iccifort-2016.2.181-GCC-5.3.0-2.26.eb
@@ -0,0 +1,18 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+easyblock = "Toolchain"
+
+name = 'iccifort'
+version = '2016.2.181'
+versionsuffix = '-GCC-5.3.0-2.26'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and fortran compilers, Intel MPI and Intel MKL"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('icc', version, versionsuffix),
+    ('ifort', version, versionsuffix),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/iccifort/iccifort-2016.3.210-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/i/iccifort/iccifort-2016.3.210-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a1f40c75aed8a2894454f626f2b3588b032f4e82
--- /dev/null
+++ b/easybuild/easyconfigs/i/iccifort/iccifort-2016.3.210-GCC-5.3.0-2.26.eb
@@ -0,0 +1,18 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+easyblock = "Toolchain"
+
+name = 'iccifort'
+version = '2016.3.210'
+versionsuffix = '-GCC-5.3.0-2.26'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and fortran compilers, Intel MPI and Intel MKL"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+dependencies = [
+    ('icc', version, versionsuffix),
+    ('ifort', version, versionsuffix),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2016.0.109-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/ifort/ifort-2016.0.109-GCC-4.9.3-2.25.eb
index 930a3dc326c96245d2e4e712421822273ba855bf..d331cd8e4a550d99529d4e4a37f49a48f78c78c8 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2016.0.109-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2016.0.109-GCC-4.9.3-2.25.eb
@@ -21,6 +21,7 @@ dependencies = [
     ('binutils', binutilsver, '', ('GCCcore', gccver)),
 ]
 
+# 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-fcomp', 'intel-ifort', 'intel-openmp', 'intel-ipsf?_']
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2016.0.109.eb b/easybuild/easyconfigs/i/ifort/ifort-2016.0.109.eb
index b01714a6f586ff92646cf1f5a8f73660fdc578b7..c64470205a7a7123fbab6c4b14f5a796823c83ad 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2016.0.109.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2016.0.109.eb
@@ -12,6 +12,7 @@ sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_fortran.tg
 
 checksums = ['bce7f6a71f7e44f67956197501d00b7c']
 
+# 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-fcomp', 'intel-ifort', 'intel-openmp', 'intel-ipsf?_']
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2016.1.150-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/ifort/ifort-2016.1.150-GCC-4.9.3-2.25.eb
index dd3cee42fa29a7920144a99e0b66e7e9c2d78a77..aee6ae915ef9191c408fb4fd85bf073126ccaf67 100644
--- a/easybuild/easyconfigs/i/ifort/ifort-2016.1.150-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/i/ifort/ifort-2016.1.150-GCC-4.9.3-2.25.eb
@@ -21,6 +21,7 @@ dependencies = [
     ('binutils', binutilsver, '', ('GCCcore', gccver)),
 ]
 
+# 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-fcomp', 'intel-ifort', 'intel-openmp', 'intel-ipsf?_']
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2016.2.181-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/ifort/ifort-2016.2.181-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ffe995c4ac47d86db8e0533cf7a81485c97c4801
--- /dev/null
+++ b/easybuild/easyconfigs/i/ifort/ifort-2016.2.181-GCC-4.9.3-2.25.eb
@@ -0,0 +1,33 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'ifort'
+version = '2016.2.181'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "C and C++ compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_fortran_update%(version_minor)s.tgz']
+
+checksums = ['70e88db11efc59b1d8ff8b5aadf50f7f']
+
+gccver = '4.9.3'
+binutilsver = '2.25'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+]
+
+# 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-fcomp', 'intel-ifort', 'intel-openmp', 'intel-ipsf?_']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2016.2.181-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/i/ifort/ifort-2016.2.181-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5844c8abd9ac08bf0718250d6390280218d0942d
--- /dev/null
+++ b/easybuild/easyconfigs/i/ifort/ifort-2016.2.181-GCC-5.3.0-2.26.eb
@@ -0,0 +1,33 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'ifort'
+version = '2016.2.181'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "C and C++ compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_fortran_update%(version_minor)s.tgz']
+
+checksums = ['70e88db11efc59b1d8ff8b5aadf50f7f']
+
+gccver = '5.3.0'
+binutilsver = '2.26'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+]
+
+# 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-fcomp', 'intel-ifort', 'intel-openmp', 'intel-ipsf?_']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/ifort/ifort-2016.3.210-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/i/ifort/ifort-2016.3.210-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b354753609298ae005d9a9487b713c908a940db3
--- /dev/null
+++ b/easybuild/easyconfigs/i/ifort/ifort-2016.3.210-GCC-5.3.0-2.26.eb
@@ -0,0 +1,33 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'ifort'
+version = '2016.3.210'
+
+homepage = 'http://software.intel.com/en-us/intel-compilers/'
+description = "C and C++ compiler from Intel"
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_fortran_update%(version_minor)s.tgz']
+
+checksums = ['70cf1ea91280e3e8ba4bc216bae63e4a']
+
+gccver = '5.3.0'
+binutilsver = '2.26'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+]
+
+# 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-fcomp', 'intel-ifort', 'intel-openmp', 'intel-ipsf?_']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-2016.02-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/iimpi/iimpi-2016.02-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3d1b98171457ee844aefd8a184fffccbde677e37
--- /dev/null
+++ b/easybuild/easyconfigs/i/iimpi/iimpi-2016.02-GCC-4.9.3-2.25.eb
@@ -0,0 +1,22 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+easyblock = "Toolchain"
+
+name = 'iimpi'
+version = '2016.02'
+versionsuffix = '-GCC-4.9.3-2.25'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel C/C++ and Fortran compilers, alongside Intel MPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+suff = '2.181'
+compver = '2016.%s' % suff
+
+dependencies = [
+    ('icc', compver, versionsuffix),
+    ('ifort', compver, versionsuffix),
+    ('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (compver, versionsuffix))),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-2016.02-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/i/iimpi/iimpi-2016.02-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9e93414ff173b03c012148d861570bd55e52ae9c
--- /dev/null
+++ b/easybuild/easyconfigs/i/iimpi/iimpi-2016.02-GCC-5.3.0-2.26.eb
@@ -0,0 +1,22 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+easyblock = "Toolchain"
+
+name = 'iimpi'
+version = '2016.02'
+versionsuffix = '-GCC-5.3.0-2.26'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel C/C++ and Fortran compilers, alongside Intel MPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+suff = '2.181'
+compver = '2016.%s' % suff
+
+dependencies = [
+    ('icc', compver, versionsuffix),
+    ('ifort', compver, versionsuffix),
+    ('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (compver, versionsuffix))),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/iimpi/iimpi-2016.03-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/i/iimpi/iimpi-2016.03-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8e5a35ceef5afc05d3bde68106758613257a709d
--- /dev/null
+++ b/easybuild/easyconfigs/i/iimpi/iimpi-2016.03-GCC-5.3.0-2.26.eb
@@ -0,0 +1,20 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+easyblock = "Toolchain"
+
+name = 'iimpi'
+version = '2016.03'
+versionsuffix = '-GCC-5.3.0-2.26'
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel C/C++ and Fortran compilers, alongside Intel MPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '2016.3.210'
+dependencies = [
+    ('icc', compver, versionsuffix),
+    ('ifort', compver, versionsuffix),
+    ('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (compver, versionsuffix))),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/imake/imake-1.0.7-intel-2016a.eb b/easybuild/easyconfigs/i/imake/imake-1.0.7-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dd473f56b968fdf75202906b98ed67825bd157af
--- /dev/null
+++ b/easybuild/easyconfigs/i/imake/imake-1.0.7-intel-2016a.eb
@@ -0,0 +1,21 @@
+easyblock = 'ConfigureMake'
+
+name = 'imake'
+version = '1.0.7'
+
+homepage = 'http://www.x.org/'
+description = """imake is a Makefile-generator that is intended to make it easier to develop software
+ portably for multiple systems."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['ftp://artfiles.org/x.org/pub/individual/util/']
+
+sanity_check_paths = {
+    'files': ['bin/%s' % binfile for binfile in ['ccmakedep', 'cleanlinks', 'imake', 'makeg', 'mergelib',
+                                                 'mkdirhier', 'mkhtmlindex', 'revpath', 'xmkmf']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.3.2.181-iimpi-2016.02-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/imkl/imkl-11.3.2.181-iimpi-2016.02-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..91dcce3df94b6e4ee8feecb70628d5940be2877a
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.3.2.181-iimpi-2016.02-GCC-4.9.3-2.25.eb
@@ -0,0 +1,36 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'imkl'
+version = '11.3.2.181'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
+
+toolchain = {'name': 'iimpi', 'version': '2016.02-GCC-4.9.3-2.25'}
+
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['536dbd82896d6facc16de8f961d17d65']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+interfaces = True
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_mic.tgz -C %(installdir)s/mkl/examples/'
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.3.2.181-iimpi-2016.02-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/i/imkl/imkl-11.3.2.181-iimpi-2016.02-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d1edf0b015abf516ebe2cd76890a1b34685b41a4
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.3.2.181-iimpi-2016.02-GCC-5.3.0-2.26.eb
@@ -0,0 +1,36 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'imkl'
+version = '11.3.2.181'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
+
+toolchain = {'name': 'iimpi', 'version': '2016.02-GCC-5.3.0-2.26'}
+
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['536dbd82896d6facc16de8f961d17d65']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+interfaces = True
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_mic.tgz -C %(installdir)s/mkl/examples/'
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.3.2.181-pompi-2016.03.eb b/easybuild/easyconfigs/i/imkl/imkl-11.3.2.181-pompi-2016.03.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ac3a95728c618ceefe9b60177420a7d1e02e4ef1
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.3.2.181-pompi-2016.03.eb
@@ -0,0 +1,36 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'imkl'
+version = '11.3.2.181'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
+
+toolchain = {'name': 'pompi', 'version': '2016.03'}
+
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['536dbd82896d6facc16de8f961d17d65']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+interfaces = True
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_mic.tgz -C %(installdir)s/mkl/examples/'
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/imkl/imkl-11.3.3.210-iimpi-2016.03-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/i/imkl/imkl-11.3.3.210-iimpi-2016.03-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..09806746b295042be535ed42ff06b174f1d104ba
--- /dev/null
+++ b/easybuild/easyconfigs/i/imkl/imkl-11.3.3.210-iimpi-2016.03-GCC-5.3.0-2.26.eb
@@ -0,0 +1,36 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'imkl'
+version = '11.3.3.210'
+
+homepage = 'http://software.intel.com/en-us/intel-mkl/'
+description = """Intel Math Kernel Library is a library of highly optimized,
+ extensively threaded math routines for science, engineering, and financial
+ applications that require maximum performance. Core math functions include
+ BLAS, LAPACK, ScaLAPACK, Sparse Solvers, Fast Fourier Transforms, Vector Math, and more."""
+
+toolchain = {'name': 'iimpi', 'version': '2016.03-GCC-5.3.0-2.26'}
+
+sources = ['l_mkl_%(version)s.tgz']
+checksums = ['f72546df27f5ebb0941b5d21fd804e34']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+interfaces = True
+
+postinstallcmds = [
+    # extract the examples
+    'tar xvzf %(installdir)s/mkl/examples/examples_cluster.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_c.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_core_f.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_f95.tgz -C %(installdir)s/mkl/examples/',
+    'tar xvzf %(installdir)s/mkl/examples/examples_mic.tgz -C %(installdir)s/mkl/examples/'
+]
+
+modextravars = {
+    'MKL_EXAMPLES': '%(installdir)s/mkl/examples/',
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/i/impi/impi-5.1.3.181-iccifort-2016.2.181-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/i/impi/impi-5.1.3.181-iccifort-2016.2.181-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..845f7631f8464ecaf93c49c7ece224008c0897ec
--- /dev/null
+++ b/easybuild/easyconfigs/i/impi/impi-5.1.3.181-iccifort-2016.2.181-GCC-4.9.3-2.25.eb
@@ -0,0 +1,33 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'impi'
+version = '5.1.3.181'
+
+homepage = 'http://software.intel.com/en-us/intel-mpi-library/'
+description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message
+ passing library based on ANL MPICH2 and OSU MVAPICH2. The Intel MPI Library for
+ Linux OS implements the Message Passing Interface, version 2 (MPI-2) specification."""
+
+toolchain = {'name': 'iccifort', 'version': '2016.2.181-GCC-4.9.3-2.25'}
+
+sources = ['l_mpi_p_%(version)s.tgz']
+
+checksums = ['1c14656859d48bf8b90c71dace2a977b']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+# set up all the mpi commands to default to intel compilers
+# set_mpi_wrappers_all = 'True'
+
+postinstallcmds = [
+    'ln -s %(installdir)s/lib64/libmpi.so  %(installdir)s/lib64/libmpich.so',
+    'ln -s %(installdir)s/lib64/libmpigc4.so  %(installdir)s/lib64/libmpichcxx.so',
+    'ln -s %(installdir)s/lib64/libmpigf.so %(installdir)s/lib64/libfmpich.so',
+    'ln -s %(installdir)s/lib64/libmpigf.so %(installdir)s/lib64/libmpichf90.so',
+    'ln -s %(installdir)s/lib64/libmpi.so %(installdir)s/lib64/libmpl.so',
+    'ln -s %(installdir)s/lib64/libmpi.so %(installdir)s/lib64/libopa.so'
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/impi/impi-5.1.3.181-iccifort-2016.2.181-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/i/impi/impi-5.1.3.181-iccifort-2016.2.181-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eaf9a3b7a7f8919345981dd160591167eb6dc260
--- /dev/null
+++ b/easybuild/easyconfigs/i/impi/impi-5.1.3.181-iccifort-2016.2.181-GCC-5.3.0-2.26.eb
@@ -0,0 +1,33 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'impi'
+version = '5.1.3.181'
+
+homepage = 'http://software.intel.com/en-us/intel-mpi-library/'
+description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message
+ passing library based on ANL MPICH2 and OSU MVAPICH2. The Intel MPI Library for
+ Linux OS implements the Message Passing Interface, version 2 (MPI-2) specification."""
+
+toolchain = {'name': 'iccifort', 'version': '2016.2.181-GCC-5.3.0-2.26'}
+
+sources = ['l_mpi_p_%(version)s.tgz']
+
+checksums = ['1c14656859d48bf8b90c71dace2a977b']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+# set up all the mpi commands to default to intel compilers
+# set_mpi_wrappers_all = 'True'
+
+postinstallcmds = [
+    'ln -s %(installdir)s/lib64/libmpi.so  %(installdir)s/lib64/libmpich.so',
+    'ln -s %(installdir)s/lib64/libmpigc4.so  %(installdir)s/lib64/libmpichcxx.so',
+    'ln -s %(installdir)s/lib64/libmpigf.so %(installdir)s/lib64/libfmpich.so',
+    'ln -s %(installdir)s/lib64/libmpigf.so %(installdir)s/lib64/libmpichf90.so',
+    'ln -s %(installdir)s/lib64/libmpi.so %(installdir)s/lib64/libmpl.so',
+    'ln -s %(installdir)s/lib64/libmpi.so %(installdir)s/lib64/libopa.so'
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/impi/impi-5.1.3.181-iccifort-2016.3.210-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/i/impi/impi-5.1.3.181-iccifort-2016.3.210-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cc0d58235f6186c6d5a9fe81c45943e0287deaa1
--- /dev/null
+++ b/easybuild/easyconfigs/i/impi/impi-5.1.3.181-iccifort-2016.3.210-GCC-5.3.0-2.26.eb
@@ -0,0 +1,33 @@
+# This is an easyconfig file for EasyBuild, see http://hpcugent.github.io/easybuild
+
+name = 'impi'
+version = '5.1.3.181'
+
+homepage = 'http://software.intel.com/en-us/intel-mpi-library/'
+description = """The Intel(R) MPI Library for Linux* OS is a multi-fabric message
+ passing library based on ANL MPICH2 and OSU MVAPICH2. The Intel MPI Library for
+ Linux OS implements the Message Passing Interface, version 2 (MPI-2) specification."""
+
+toolchain = {'name': 'iccifort', 'version': '2016.3.210-GCC-5.3.0-2.26'}
+
+sources = ['l_mpi_p_%(version)s.tgz']
+
+checksums = ['1c14656859d48bf8b90c71dace2a977b']
+
+dontcreateinstalldir = 'True'
+
+license_file = HOME + '/licenses/intel/license.lic'
+
+# set up all the mpi commands to default to intel compilers
+# set_mpi_wrappers_all = 'True'
+
+postinstallcmds = [
+    'ln -s %(installdir)s/lib64/libmpi.so  %(installdir)s/lib64/libmpich.so',
+    'ln -s %(installdir)s/lib64/libmpigc4.so  %(installdir)s/lib64/libmpichcxx.so',
+    'ln -s %(installdir)s/lib64/libmpigf.so %(installdir)s/lib64/libfmpich.so',
+    'ln -s %(installdir)s/lib64/libmpigf.so %(installdir)s/lib64/libmpichf90.so',
+    'ln -s %(installdir)s/lib64/libmpi.so %(installdir)s/lib64/libmpl.so',
+    'ln -s %(installdir)s/lib64/libmpi.so %(installdir)s/lib64/libopa.so'
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-foss-2014b.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-foss-2014b.eb
index 3297e8dea09165c14f6698d6219d142ec5e0fe47..ce9480d3aab34d69213d7f402c7e5217d137aad4 100644
--- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-foss-2014b.eb
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-foss-2014b.eb
@@ -9,7 +9,7 @@ description = """X.org InputProto protocol headers."""
 toolchain = {'name': 'foss', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.4.10.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.4.10.eb
index 1e1be175b1ca661d8c30acd4896a8a0520ccde15..475b25485eaf4bbd40edba958fd8fc527652883b 100644
--- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ description = """X.org InputProto protocol headers."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.5.14.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.5.14.eb
index 56a7e864e0e45e6c60b8ed68302e7c32bfc1638b..7ae3e0efff6490868088fc5cbe4ffe0ecef7eca1 100644
--- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-goolf-1.5.14.eb
@@ -9,7 +9,7 @@ description = """X.org InputProto protocol headers."""
 toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb
index 75a9c42cf7dbf238bfec04445049cf31312d6732..9931bbca58940676d7653ab7ca738281ac0191fc 100644
--- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ description = """X.org InputProto protocol headers."""
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-5.3.0.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-5.3.0.eb
index 804a25ce18b2749c7c2cecbfd4818fa3998c42bb..19917b0ef7a46ad8164749234fe55ae0bd8c8adb 100644
--- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-ictce-5.3.0.eb
@@ -9,7 +9,7 @@ description = """X.org InputProto protocol headers."""
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-intel-2014b.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-intel-2014b.eb
index e307d5deb42a98db29f4a8ab594137d2f41d8642..eb95b2f34ad69b2e4846861a9cd2a0e71a90e61c 100644
--- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-intel-2014b.eb
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-intel-2014b.eb
@@ -9,7 +9,7 @@ description = """X.org InputProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-intel-2015a.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-intel-2015a.eb
index 0437a042dbb3891fc9d8440e099ce18063758faa..d652aba38761ae5fd2e0ea36858831b00645a566 100644
--- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3-intel-2015a.eb
@@ -9,7 +9,7 @@ description = """X.org InputProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-foss-2016a.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cad6b846e63049c686d5093064bc0147f7078d1f
--- /dev/null
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-foss-2016a.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'inputproto'
+version = '2.3.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X.org InputProto protocol headers."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_PROTO_SOURCE]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-gimkl-2.11.5.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-gimkl-2.11.5.eb
index 1a5db1eefa851137f32ffb3816e9e4af1dfe1c69..b26cb202221b665bd81f703f70d0661012e528d9 100644
--- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-gimkl-2.11.5.eb
@@ -9,7 +9,7 @@ description = """X.org InputProto protocol headers."""
 toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-goolf-1.5.14.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-goolf-1.5.14.eb
index 66fc05b6d48e235bd1eb2786b2664004c30d9e28..6a557da522dc83287aa7d83a71196b134fff5541 100644
--- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-goolf-1.5.14.eb
@@ -9,7 +9,7 @@ description = """X.org InputProto protocol headers."""
 toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2015a.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2015a.eb
index 21d5d376d510549336698e88bb30a242a93995e9..512fcad71516a14cdca671ed83b918db0baba312 100644
--- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2015a.eb
@@ -9,7 +9,7 @@ description = """X.org InputProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2015b.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2015b.eb
index 83bc32fc03af99e8eddbd87fbb25b347c2a2ea8a..00ad73c8ec6e2729f5a1d6d2c3eeeb8ce51c391f 100644
--- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2015b.eb
@@ -9,7 +9,7 @@ description = """X.org InputProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
diff --git a/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2016a.eb b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2016a.eb
index 323816dd0b58c3ada562ced00e0ad65885aeced6..f40968ca7adab37d947e251cb4564c6a8c7df3d1 100644
--- a/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2016a.eb
+++ b/easybuild/easyconfigs/i/inputproto/inputproto-2.3.1-intel-2016a.eb
@@ -9,7 +9,7 @@ description = """X.org InputProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2016a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XI2.h', 'XI.h',  'XIproto.h', 'XI2proto.h']],
diff --git a/easybuild/easyconfigs/i/intel/intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/i/intel/intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..41552f25a96abc21a8c1ddb116a54f7dc59303b0
--- /dev/null
+++ b/easybuild/easyconfigs/i/intel/intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,26 @@
+easyblock = 'Toolchain'
+
+name = 'intel'
+version = '2016.02'
+gcc_maj_min = '4.9'
+versionsuffix = '-GCC-%s' % gcc_maj_min
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '2016.2.181'
+gccver = '%s.3' % gcc_maj_min
+binutilsver = '2.25'
+gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '-GCCcore-%s' % gccver),
+    ('icc', compver, gccsuff),
+    ('ifort', compver, gccsuff),
+    ('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (compver, gccsuff))),
+    ('imkl', '11.3.2.181', '', ('iimpi', '%s%s' % (version, gccsuff))),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/intel/intel-2016.02-GCC-5.3.eb b/easybuild/easyconfigs/i/intel/intel-2016.02-GCC-5.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4d1e0dddac5b2974f4488b8ced16d846c81657dc
--- /dev/null
+++ b/easybuild/easyconfigs/i/intel/intel-2016.02-GCC-5.3.eb
@@ -0,0 +1,26 @@
+easyblock = 'Toolchain'
+
+name = 'intel'
+version = '2016.02'
+gcc_maj_min = '5.3'
+versionsuffix = '-GCC-%s' % gcc_maj_min
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '2016.2.181'
+gccver = '%s.0' % gcc_maj_min
+binutilsver = '2.26'
+gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '-GCCcore-%s' % gccver),
+    ('icc', compver, gccsuff),
+    ('ifort', compver, gccsuff),
+    ('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (compver, gccsuff))),
+    ('imkl', '11.3.2.181', '', ('iimpi', '%s%s' % (version, gccsuff))),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/intel/intel-2016.03-GCC-5.3.eb b/easybuild/easyconfigs/i/intel/intel-2016.03-GCC-5.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3de185ca6388eb7dc8032ea2e1e6595a7caf6f9f
--- /dev/null
+++ b/easybuild/easyconfigs/i/intel/intel-2016.03-GCC-5.3.eb
@@ -0,0 +1,26 @@
+easyblock = 'Toolchain'
+
+name = 'intel'
+version = '2016.03'
+gcc_maj_min = '5.3'
+versionsuffix = '-GCC-%s' % gcc_maj_min
+
+homepage = 'http://software.intel.com/en-us/intel-cluster-toolkit-compiler/'
+description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '2016.3.210'
+gccver = '%s.0' % gcc_maj_min
+binutilsver = '2.26'
+gccsuff = '-GCC-%s-%s' % (gccver, binutilsver)
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '-GCCcore-%s' % gccver),
+    ('icc', compver, gccsuff),
+    ('ifort', compver, gccsuff),
+    ('impi', '5.1.3.181', '', ('iccifort', '%s%s' % (compver, gccsuff))),
+    ('imkl', '11.3.3.210', '', ('iimpi', '%s%s' % (version, gccsuff))),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/i/intltool/intltool-0.51.0-foss-2016a-Perl-5.22.1.eb b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-foss-2016a-Perl-5.22.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e0b8aa4117cd46777e80796d29c1cc0cdff1a90d
--- /dev/null
+++ b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-foss-2016a-Perl-5.22.1.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'intltool'
+version = '0.51.0'
+versionsuffix = '-Perl-5.22.1'
+
+homepage = 'http://freedesktop.org/wiki/Software/intltool/'
+description = """intltool is a set of tools to centralize translation of
+ many different file formats using GNU gettext-compatible PO files."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://launchpad.net/intltool/trunk/%(version)s/+download/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('XML-Parser', '2.44', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['bin/intltool%s' % x for x in ['-extract', '-merge', '-prepare', '-update', 'ize']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/i/intltool/intltool-0.51.0-intel-2016a-Perl-5.22.1.eb b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-intel-2016a-Perl-5.22.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0b9db08cffb0e74087cd214b8dbf8979dec7449e
--- /dev/null
+++ b/easybuild/easyconfigs/i/intltool/intltool-0.51.0-intel-2016a-Perl-5.22.1.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'intltool'
+version = '0.51.0'
+versionsuffix = '-Perl-5.22.1'
+
+homepage = 'http://freedesktop.org/wiki/Software/intltool/'
+description = """intltool is a set of tools to centralize translation of
+ many different file formats using GNU gettext-compatible PO files."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://launchpad.net/intltool/trunk/%(version)s/+download/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('XML-Parser', '2.44', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['bin/intltool%s' % x for x in ['-extract', '-merge', '-prepare', '-update', 'ize']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/i/itac/itac-9.0.3.051.eb b/easybuild/easyconfigs/i/itac/itac-9.0.3.051.eb
new file mode 100644
index 0000000000000000000000000000000000000000..42551d67c61cbe07655d8e131ffebaf6c7cf032c
--- /dev/null
+++ b/easybuild/easyconfigs/i/itac/itac-9.0.3.051.eb
@@ -0,0 +1,21 @@
+name = 'itac'
+version = '9.0.3.051'
+
+homepage = 'http://software.intel.com/en-us/intel-trace-analyzer/'
+description = """The Intel Trace Collector is a low-overhead tracing library that performs
+ event-based tracing in applications. The Intel Trace Analyzer provides a convenient way to monitor application
+ activities gathered by the Intel Trace Collector through graphical displays. """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['l_itac_p_%(version)s.tgz']
+
+dontcreateinstalldir = 'True'
+
+preferredmpi = 'impi5'
+
+# license file
+import os
+license_file = os.path.join(os.getenv('HOME'), "licenses", "intel", "license.lic")
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/j/JAGS/JAGS-4.2.0-intel-2016a.eb b/easybuild/easyconfigs/j/JAGS/JAGS-4.2.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1474dde18b67235d6ad742edac1b6185daa4e4bd
--- /dev/null
+++ b/easybuild/easyconfigs/j/JAGS/JAGS-4.2.0-intel-2016a.eb
@@ -0,0 +1,32 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = 'ConfigureMake'
+
+name = 'JAGS'
+version = '4.2.0'
+
+homepage = 'http://mcmc-jags.sourceforge.net/'
+description = """JAGS is Just Another Gibbs Sampler.  It is a program for analysis 
+ of Bayesian hierarchical models using Markov Chain Monte Carlo (MCMC) simulation  """
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [('http://sourceforge.net/projects/mcmc-jags/files/JAGS/%(version_major)s.x/Source/', 'download')]
+sources = [SOURCE_TAR_GZ]
+
+configopts = ' --with-blas="-lmkl" --with-lapack="-lmkl" '
+
+sanity_check_paths = {
+    'files': ["bin/jags", "libexec/jags-terminal", "lib/libjags.%s" % SHLIB_EXT],
+    'dirs': []
+}
+
+modextrapaths = {
+    'JAGS_INCLUDE': 'include/JAGS',
+    'JAGS_LIB': 'lib',
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayGNU-2015.06.eb
similarity index 90%
rename from easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayGNU-2015.06.eb
index b3d235faba5503d382fbb74229d517b70325e45c..274dc4609367291579a08b08d75d91d28ab4e8e5 100644
--- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayGNU-2015.06.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.ece.uvic.ca/~frodo/jasper/'
 description = """The JasPer Project is an open-source initiative to provide a free
  software-based reference implementation of the codec specified in the JPEG-2000 Part-1 standard."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_ZIP]
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayGNU-2015.11.eb
similarity index 90%
rename from easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayGNU-2015.11.eb
index 057b6423c3e3539141a6b95ce97c57bba6bcfaa1..1a379efce9dd944327171300a09d95e55ab69c02 100644
--- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayGNU-2015.11.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.ece.uvic.ca/~frodo/jasper/'
 description = """The JasPer Project is an open-source initiative to provide a free
  software-based reference implementation of the codec specified in the JPEG-2000 Part-1 standard."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_ZIP]
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayIntel-2015.11-XC.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayIntel-2015.11.eb
similarity index 90%
rename from easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayIntel-2015.11-XC.eb
rename to easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayIntel-2015.11.eb
index 45bc1007dd052501612f3e1ce547e9f996349cf1..3cd71b46bfdd32e92b5f847dcdb48bad18396e92 100644
--- a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayIntel-2015.11-XC.eb
+++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-CrayIntel-2015.11.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.ece.uvic.ca/~frodo/jasper/'
 description = """The JasPer Project is an open-source initiative to provide a free
  software-based reference implementation of the codec specified in the JPEG-2000 Part-1 standard."""
 
-toolchain = {'name': 'CrayIntel', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayIntel', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
 sources = [SOURCELOWER_ZIP]
diff --git a/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-intel-2016a.eb b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ea3c5924273ee2707de04ad3305063ae1fc5deb3
--- /dev/null
+++ b/easybuild/easyconfigs/j/JasPer/JasPer-1.900.1-intel-2016a.eb
@@ -0,0 +1,21 @@
+easyblock = 'ConfigureMake'
+
+name = 'JasPer'
+version = '1.900.1'
+
+homepage = 'http://www.ece.uvic.ca/~frodo/jasper/'
+description = """The JasPer Project is an open-source initiative to provide a free
+ software-based reference implementation of the codec specified in the JPEG-2000 Part-1 standard."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_ZIP]
+source_urls = ['http://www.ece.uvic.ca/~frodo/jasper/software/']
+
+sanity_check_paths = {
+    'files': ["bin/jasper", "lib/libjasper.a"],
+    'dirs': ["include"],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/j/Java/Java-1.8.0_77.eb b/easybuild/easyconfigs/j/Java/Java-1.8.0_77.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fa48d66cd4810cd690dedd16d86c25e37556fd33
--- /dev/null
+++ b/easybuild/easyconfigs/j/Java/Java-1.8.0_77.eb
@@ -0,0 +1,15 @@
+name = 'Java'
+version = '1.8.0_77'
+
+homepage = 'http://java.com/'
+description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
+ Java applications on desktops and servers."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
+(vp, vs) = version.split('_')
+altver = '%su%s' % (vp.split('.')[1], vs)
+sources = ['jdk-%s-linux-x64.tar.gz' % altver]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/j/Jellyfish/Jellyfish-1.1.11-foss-2016a.eb b/easybuild/easyconfigs/j/Jellyfish/Jellyfish-1.1.11-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8e2a518511e709daf5f8565c76a99578c30538ca
--- /dev/null
+++ b/easybuild/easyconfigs/j/Jellyfish/Jellyfish-1.1.11-foss-2016a.eb
@@ -0,0 +1,25 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+easyblock = 'ConfigureMake'
+
+name = 'Jellyfish'
+version = '1.1.11'
+
+homepage = 'http://www.cbcb.umd.edu/software/jellyfish/'
+description = """ Jellyfish is a tool for fast, memory-efficient counting of k-mers in DNA."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.cbcb.umd.edu/software/jellyfish/']
+sources = [SOURCELOWER_TAR_GZ]
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/jellyfish'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/j/jemalloc/jemalloc-4.1.0-intel-2016a.eb b/easybuild/easyconfigs/j/jemalloc/jemalloc-4.1.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7bee41cdcd56b03d3650179a1c339f1bcc029bf6
--- /dev/null
+++ b/easybuild/easyconfigs/j/jemalloc/jemalloc-4.1.0-intel-2016a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'jemalloc'
+version = '4.1.0'
+
+homepage = 'http://www.canonware.com/jemalloc'
+description = """jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and
+ scalable concurrency support."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://github.com/jemalloc/jemalloc/archive']
+sources = ['%(version)s.tar.gz']
+
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = "./autogen.sh && "
+prebuildopts = "make dist && "
+
+sanity_check_paths = {
+    'files': ['bin/jeprof', 'lib/libjemalloc.a', 'lib/libjemalloc_pic.a', 'lib/libjemalloc.%s' % SHLIB_EXT,
+              'include/jemalloc/jemalloc.h'],
+    'dirs': ['share'],
+}
+
+modextrapaths = {'LD_PRELOAD': ['lib/libjemalloc.%s' % SHLIB_EXT]}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/k/Kraken/Kraken-0.10.5-beta-foss-2016a-Perl-5.22.1.eb b/easybuild/easyconfigs/k/Kraken/Kraken-0.10.5-beta-foss-2016a-Perl-5.22.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4bb09cbfe2ae21d6675f245aff4201cd39948460
--- /dev/null
+++ b/easybuild/easyconfigs/k/Kraken/Kraken-0.10.5-beta-foss-2016a-Perl-5.22.1.eb
@@ -0,0 +1,44 @@
+easyblock = 'PackedBinary'
+
+name = 'Kraken'
+version = '0.10.5-beta'
+versionsuffix='-Perl-%(perlver)s'
+
+homepage = 'http://ccb.jhu.edu/software/kraken/'
+description = """Kraken is a system for assigning taxonomic labels to short DNA sequences,
+ usually obtained through metagenomic studies. Previous attempts by other
+ bioinformatics software to accomplish this task have often used sequence
+ alignment or machine learning techniques that were quite slow, leading to
+ the development of less sensitive but much faster abundance estimation
+ programs. Kraken aims to achieve high sensitivity and high speed by
+ utilizing exact alignments of k-mers and a novel classification algorithm."""
+
+#Part is compiled with CXX, the rest is in Perl
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'openmp': True}
+
+source_urls = ['http://ccb.jhu.edu/software/kraken/dl/']
+sources = [SOURCELOWER_TGZ]
+
+patches = ['Kraken_%(version)s_makefile.patch']
+
+dependencies = [
+    ('Perl', '5.22.1'),
+    ('Jellyfish', '1.1.11'),
+    ('wget', '1.17.1'),
+]
+
+install_cmd = 'cd %(builddir)s/%(namelower)s-%(version)s && '
+install_cmd += './install_kraken.sh %(installdir)s'
+
+sanity_check_paths = {
+    'files': ['add_to_library.sh', 'build_kraken_db.sh', 'check_for_jellyfish.sh', 'classify', 'clean_db.sh',
+              'cp_into_tempfile.pl', 'db_shrink', 'db_sort', 'download_genomic_library.sh',
+              'download_taxonomy.sh', 'kraken', 'kraken-build', 'kraken-filter', 'krakenlib.pm',
+              'kraken-mpa-report', 'kraken-report', 'kraken-translate', 'make_seqid_to_taxid_map',
+              'read_merger.pl', 'report_gi_numbers.pl', 'set_lcas', 'shrink_db.sh',
+              'standard_installation.sh', 'upgrade_db.sh', 'verify_gi_numbers.pl'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/k/Kraken/Kraken_0.10.5-beta_makefile.patch b/easybuild/easyconfigs/k/Kraken/Kraken_0.10.5-beta_makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4a0bc26aa6fd4d0feffa14a21078a8399e5c5449
--- /dev/null
+++ b/easybuild/easyconfigs/k/Kraken/Kraken_0.10.5-beta_makefile.patch
@@ -0,0 +1,12 @@
+#Pick CXX and CXXFLAGS from EasyBuild via pre-defined variables
+#May 11th 2016 by B. Hajgato (Free Uninrrsity Brussels, VUB)
+--- kraken-0.10.5-beta/src/Makefile.orig	2015-02-18 12:38:00.000000000 +0100
++++ kraken-0.10.5-beta/src/Makefile	2016-05-11 13:33:39.370016057 +0200
+@@ -1,5 +1,5 @@
+-CXX = g++
+-CXXFLAGS = -Wall -fopenmp -O3
++CXX ?= g++
++CXXFLAGS ?= -Wall -fopenmp -O3
+ PROGS = db_sort set_lcas classify make_seqid_to_taxid_map db_shrink
+ 
+ .PHONY: all install clean
diff --git a/easybuild/easyconfigs/k/kallisto/kallisto-0.42.5-foss-2016a.eb b/easybuild/easyconfigs/k/kallisto/kallisto-0.42.5-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2287c59cc6394473d2b0b126d907e20a5015712d
--- /dev/null
+++ b/easybuild/easyconfigs/k/kallisto/kallisto-0.42.5-foss-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'CMakeMake'
+
+name = 'kallisto'
+version = '0.42.5'
+
+homepage = 'http://pachterlab.github.io/kallisto/'
+description = """kallisto is a program for quantifying abundances of transcripts from RNA-Seq data, or more generally
+ of target sequences using high-throughput sequencing reads."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/pachterlab/kallisto/archive/']
+sources = ['v%(version)s.tar.gz']
+
+builddependencies = [('CMake', '3.4.3')]
+dependencies = [('HDF5', '1.8.16', '-serial')]
+
+separate_build_dir = True
+
+sanity_check_paths = {
+    'files': ['bin/kallisto'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-foss-2014b.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-foss-2014b.eb
index 7482053f6fbc7c8dc9feff3ce3991b03353d2fb2..30967e9fe4abed96f90d52bf179820f781afba2a 100644
--- a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-foss-2014b.eb
+++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-foss-2014b.eb
@@ -9,7 +9,7 @@ description = """X.org KBProto protocol headers."""
 toolchain = {'name': 'foss', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h',  'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']],
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb
index e54e5f74c9e153b886de8c7ea6c5337bab14ee22..7e3ad5f572220a5fdc898699caaf985fba9f04b3 100644
--- a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ description = """X.org KBProto protocol headers."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h',  'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']],
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb
index 3790a57f153907bf8b8db691991fad9941bf0df0..ee1d8ab5ad55532412bf84cff5f1df1b0a5d59ad 100644
--- a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ description = """X.org KBProto protocol headers."""
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h',  'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']],
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-5.3.0.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-5.3.0.eb
index 664996727e1b7fa8466ecd087f0e09c0f1f0b09d..48cbc77814c28b90be3186e1559dd2201f65bae7 100644
--- a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-ictce-5.3.0.eb
@@ -9,7 +9,7 @@ description = """X.org KBProto protocol headers."""
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h',  'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']],
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-intel-2014b.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-intel-2014b.eb
index 31cb837d0f63198bf32e19f04b5ed2fce9f5bcb6..2393fe61dcce30ef59a0f22fd44c867c55b04cae 100644
--- a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-intel-2014b.eb
+++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-intel-2014b.eb
@@ -9,7 +9,7 @@ description = """X.org KBProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h',  'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']],
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-intel-2015a.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-intel-2015a.eb
index 2d16cb0b139c8a45182b87fcc39e93290e476cd1..295d7b8f948bab9c1ec9349516b83652f21b0e7e 100644
--- a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-intel-2015a.eb
+++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.6-intel-2015a.eb
@@ -9,7 +9,7 @@ description = """X.org KBProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h',  'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']],
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-foss-2016a.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..86f8eb23deab5d8ecf18f05b9112073eb106751a
--- /dev/null
+++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-foss-2016a.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'kbproto'
+version = '1.0.7'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X.org KBProto protocol headers."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_PROTO_SOURCE]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h',  'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-gimkl-2.11.5.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-gimkl-2.11.5.eb
index 050b2bda557dd00f1e93ba730e6af188f9f48449..a2add0de300401cf9e5aae6aae4e4adf5f6ad8c5 100644
--- a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-gimkl-2.11.5.eb
@@ -9,7 +9,7 @@ description = """X.org KBProto protocol headers."""
 toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h',  'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']],
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2015a.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2015a.eb
index 62923f260f75b2e09b1850a3cba8f59e1c2c4838..13dbd2eb082b9a415d0f71aed6e10934c0ae761c 100644
--- a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2015a.eb
+++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2015a.eb
@@ -9,7 +9,7 @@ description = """X.org KBProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h',  'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']],
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2015b.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2015b.eb
index d692faf3931201d1a5d698a4205e08b48976fc71..9a5a48c48021938d165be20e0cfacaaccbd5c00f 100644
--- a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2015b.eb
+++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2015b.eb
@@ -9,7 +9,7 @@ description = """X.org KBProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h',  'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']],
diff --git a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2016a.eb b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2016a.eb
index 29d6a6987afc6b9f25d2a4204ea8d31df8204b6d..e5d229774cb855a940a5dfddae98e54b8fa30cb7 100644
--- a/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2016a.eb
+++ b/easybuild/easyconfigs/k/kbproto/kbproto-1.0.7-intel-2016a.eb
@@ -9,7 +9,7 @@ description = """X.org KBProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2016a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['XKBgeom.h', 'XKB.h',  'XKBproto.h', 'XKBsrv.h', 'XKBstr.h']],
diff --git a/easybuild/easyconfigs/l/LAME/LAME-3.99.5-foss-2015a.eb b/easybuild/easyconfigs/l/LAME/LAME-3.99.5-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a1da0d2c9035d2f509ed1ae8512dea8d60d94a80
--- /dev/null
+++ b/easybuild/easyconfigs/l/LAME/LAME-3.99.5-foss-2015a.eb
@@ -0,0 +1,30 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Author:    Stephane Thiell <sthiell@stanford.edu>
+###
+
+easyblock = 'ConfigureMake'
+
+name = 'LAME'
+version = '3.99.5'
+
+homepage = 'http://lame.sourceforge.net/'
+description = """LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['https://sourceforge.net/projects/lame/files/lame/%(version_major_minor)s/']
+
+dependencies = [('ncurses', '5.9')]
+
+# configure is broken: add workaround to find libncurses...
+configure_cmd_prefix = "FRONTEND_LDADD='-L${EBROOTNCURSES}/lib' "
+
+sanity_check_paths = {
+    'files': ['bin/lame', 'include/lame/lame.h', 'lib/libmp3lame.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/l/LASTZ/LASTZ-1.02.00-foss-2016a.eb b/easybuild/easyconfigs/l/LASTZ/LASTZ-1.02.00-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..10dacf3472931bf7fb63aa00f358858c17335bf6
--- /dev/null
+++ b/easybuild/easyconfigs/l/LASTZ/LASTZ-1.02.00-foss-2016a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'LASTZ'
+version = '1.02.00'
+
+homepage = 'http://www.bx.psu.edu/~rsharris/lastz/'
+description = """ LASTZ is a program for aligning DNA sequences, a pairwise aligner. Originally designed to handle
+ sequences the size of human chromosomes and from different species, it is also useful for sequences produced by NGS 
+ sequencing technologies such as Roche 454.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.bx.psu.edu/miller_lab/dist/']
+
+patches = ['LASTZ-%(version)s_Makefile.patch']
+
+skipsteps = ['configure']
+
+installopts = 'installDir=%(installdir)s/bin'
+
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ["lastz", "lastz_D"]],
+    'dirs': ["bin"]
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/l/LASTZ/LASTZ-1.02.00_Makefile.patch b/easybuild/easyconfigs/l/LASTZ/LASTZ-1.02.00_Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..39bfb5c65520110c97734c69bfa56d97b984d7d1
--- /dev/null
+++ b/easybuild/easyconfigs/l/LASTZ/LASTZ-1.02.00_Makefile.patch
@@ -0,0 +1,15 @@
+# Remove use of -Werror because Werror is not used (discussed in http://seqanswers.com/forums/showthread.php?t=20113). 
+# Using -Werror gives warnings which result in a failure of the installation.
+# Author: Fokke Dijkstra - Rijksuniversiteit Groningen (RUG)
+--- lastz-distrib-1.02.00/src/Makefile	2010-01-13 18:00:09.000000000 +0100
++++ lastz-distrib-1.02.00/src/Makefile	2015-02-09 17:22:41.030256461 +0100
+@@ -28,7 +28,7 @@
+ #
+ #---------
+ 
+-definedForAll = -Wall -Wextra -Werror -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++definedForAll = -Wall -Wextra -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ 
+ 
+ VERSION_FLAGS= \
+
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.8.0-foss-2016a.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.8.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fc0af540c128df6179fa4443bdd92f6760b5a482
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.8.0-foss-2016a.eb
@@ -0,0 +1,41 @@
+easyblock = 'CMakeMake'
+
+name = 'LLVM'
+version = '3.8.0'
+
+homepage = "http://llvm.org/"
+description = """The LLVM Core libraries provide a modern source- and target-independent
+ optimizer, along with code generation support for many popular CPUs
+ (as well as some less common ones!) These libraries are built around a well
+ specified code representation known as the LLVM intermediate representation
+ ("LLVM IR"). The LLVM Core libraries are well documented, and it is
+ particularly easy to invent your own language (or port an existing compiler)
+ to use LLVM as an optimizer and code generator."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'cstd': 'gnu++11'}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = ["llvm-%(version)s.src.tar.xz"]
+
+builddependencies = [
+    ('CMake', '3.5.2'),
+    ('Python', '2.7.11'),
+]
+
+dependencies = [
+    ('ncurses', '6.0'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON '
+# required to install extra tools in bin/
+configopts += "-DLLVM_INSTALL_UTILS=ON"
+
+sanity_check_paths = {
+    'files': ['bin/llvm-ar', 'bin/FileCheck'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
+}
+
+separate_build_dir = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/l/LLVM/LLVM-3.8.0-intel-2016a.eb b/easybuild/easyconfigs/l/LLVM/LLVM-3.8.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7a9543d2601c5863d6636ad210ffd33fc637db33
--- /dev/null
+++ b/easybuild/easyconfigs/l/LLVM/LLVM-3.8.0-intel-2016a.eb
@@ -0,0 +1,41 @@
+easyblock = 'CMakeMake'
+
+name = 'LLVM'
+version = '3.8.0'
+
+homepage = "http://llvm.org/"
+description = """The LLVM Core libraries provide a modern source- and target-independent
+ optimizer, along with code generation support for many popular CPUs
+ (as well as some less common ones!) These libraries are built around a well
+ specified code representation known as the LLVM intermediate representation
+ ("LLVM IR"). The LLVM Core libraries are well documented, and it is
+ particularly easy to invent your own language (or port an existing compiler)
+ to use LLVM as an optimizer and code generator."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'cstd': 'gnu++11'}
+
+source_urls = ["http://llvm.org/releases/%(version)s"]
+sources = ["llvm-%(version)s.src.tar.xz"]
+
+builddependencies = [
+    ('CMake', '3.5.1'),
+    ('Python', '2.7.11'),
+]
+
+dependencies = [
+    ('ncurses', '6.0'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=ON -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -shared-intel" '
+# required to install extra tools in bin/
+configopts += "-DLLVM_INSTALL_UTILS=ON"
+
+sanity_check_paths = {
+    'files': ['bin/llvm-ar', 'bin/FileCheck'],
+    'dirs': ['include/llvm', 'include/llvm-c'],
+}
+
+separate_build_dir = True
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.6-foss-2016a.eb b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.6-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d7aa3b2df4bd6dcc6ecb234794f355d42815bd74
--- /dev/null
+++ b/easybuild/easyconfigs/l/LibTIFF/LibTIFF-4.0.6-foss-2016a.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>, Alan O'Cais (JSC)
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+easyblock = 'ConfigureMake'
+
+name = 'LibTIFF'
+version = '4.0.6'
+
+homepage = 'http://www.remotesensing.org/libtiff/'
+description = "tiff: Library and tools for reading and writing TIFF data files"
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [
+    'http://download.osgeo.org/libtiff/',
+    'ftp://ftp.remotesensing.org/pub/libtiff/',
+]
+sources = ['tiff-%(version)s.tar.gz']
+
+sanity_check_paths = {
+    'files': ['bin/tiffinfo'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-CrayGNU-2015.06.eb
similarity index 93%
rename from easybuild/easyconfigs/l/Libint/Libint-1.1.4-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/l/Libint/Libint-1.1.4-CrayGNU-2015.06.eb
index 8c50a3c76663a9a59af1e22330ab069ae7131e94..173c7dbd1eabf1c02320c0a86e2eb4978944a812 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-CrayGNU-2015.06.eb
@@ -5,7 +5,7 @@ homepage = 'https://sourceforge.net/p/libint/'
 description = """Libint library is used to evaluate the traditional (electron repulsion) and certain novel two-body
  matrix elements (integrals) over Cartesian Gaussian functions used in modern atomic and molecular theory."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'opt': True, 'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-CrayGNU-2015.11.eb
similarity index 93%
rename from easybuild/easyconfigs/l/Libint/Libint-1.1.4-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/l/Libint/Libint-1.1.4-CrayGNU-2015.11.eb
index ba7eabefb47f123a89805401b19bb9da7ec00c43..ef47d32bbf871beac14ce45ed1a199c5eb653442 100644
--- a/easybuild/easyconfigs/l/Libint/Libint-1.1.4-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/l/Libint/Libint-1.1.4-CrayGNU-2015.11.eb
@@ -5,7 +5,7 @@ homepage = 'https://sourceforge.net/p/libint/'
 description = """Libint library is used to evaluate the traditional (electron repulsion) and certain novel two-body
  matrix elements (integrals) over Cartesian Gaussian functions used in modern atomic and molecular theory."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'opt': True, 'pic': True}
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/LinBox/LinBox-1.4.0-foss-2016a.eb b/easybuild/easyconfigs/l/LinBox/LinBox-1.4.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f0951b2b358a8a861db8e1aab7a8f0f02d723a0e
--- /dev/null
+++ b/easybuild/easyconfigs/l/LinBox/LinBox-1.4.0-foss-2016a.eb
@@ -0,0 +1,39 @@
+##
+# This file is an EasyBuild recipe; see https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright (c) 2016 Riccardo Murri <riccardo.murri@gmail.com>
+# Authors::   Riccardo Murri <riccardo.murri@gmail.com>
+# License::   GPL
+#
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'LinBox'
+version = '1.4.0'
+
+homepage = 'http://linalg.org/'
+description = "C++ library for exact, high-performance linear algebra"
+
+toolchain = {'version': '2016a', 'name': 'foss'}
+
+sources = ['v%(version)s.zip']
+source_urls = ['https://github.com/linbox-team/linbox/archive']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+dependencies = [
+    ('FFLAS-FFPACK', '2.2.0'),
+    ('Givaro', '4.0.1'),
+]
+
+preconfigopts = "env NOCONFIGURE=1 ./autogen.sh && "
+configopts = "--with-givaro=$EBROOTGIVARO --with-fflas-ffpack=$EBROOTFFLASMINFFPACK --enable-openmp"
+
+sanity_check_paths = {
+    'files': ['bin/linbox-config', 'include/linbox/linbox-config.h', 'lib/liblinbox.a'],
+    'dirs': ['bin', 'include', 'lib'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-foss-2016a-Mesa-11.2.1.eb b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-foss-2016a-Mesa-11.2.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..38c8310594fa7615f7936e6db4e9394c1f2f6be3
--- /dev/null
+++ b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-foss-2016a-Mesa-11.2.1.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'libGLU'
+version = '9.0.0'
+
+homepage = 'ftp://ftp.freedesktop.org/pub/mesa/glu/'
+description = """The OpenGL Utility Library (GLU) is a computer graphics library for OpenGL. """
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/glu/']
+sources = ['glu-%(version)s.tar.bz2']
+
+mesa_ver = '11.2.1'
+versionsuffix = '-Mesa-%s' % mesa_ver
+
+dependencies = [
+    ('Mesa', mesa_ver),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libGLU.so.1'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-foss-2016a.eb b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..087bd589cbe5e211bd341b68d36ac6702444145c
--- /dev/null
+++ b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-foss-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libGLU'
+version = '9.0.0'
+
+homepage = 'ftp://ftp.freedesktop.org/pub/mesa/glu/'
+description = """The OpenGL Utility Library (GLU) is a computer graphics library for OpenGL. """
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/glu/']
+sources = ['glu-%(version)s.tar.bz2']
+
+dependencies = [
+    ('Mesa', '11.1.2'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libGLU.so.1'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2016a-Mesa-11.2.1.eb b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2016a-Mesa-11.2.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fe3cfb14d679d516d2baf16d42fb5484d646b37b
--- /dev/null
+++ b/easybuild/easyconfigs/l/libGLU/libGLU-9.0.0-intel-2016a-Mesa-11.2.1.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'libGLU'
+version = '9.0.0'
+
+homepage = 'ftp://ftp.freedesktop.org/pub/mesa/glu/'
+description = """The OpenGL Utility Library (GLU) is a computer graphics library for OpenGL. """
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = ['ftp://ftp.freedesktop.org/pub/mesa/glu/']
+sources = ['glu-%(version)s.tar.bz2']
+
+mesaver = '11.2.1'
+versionsuffix = '-Mesa-%s' % mesaver
+
+dependencies = [
+    ('Mesa', mesaver),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libGLU.so.1'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-intel-2014b.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-intel-2014b.eb
index bb3839e6a656332beb122593752b4cd2aaaf64ef..ff2702cd71881b7dde43aeb1a7b8990a8dcd273d 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.8-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.8-intel-2014b.eb
@@ -9,7 +9,7 @@ description = """X Inter-Client Exchange library for freedesktop.org"""
 toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xtrans', '1.3.4'),
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-foss-2016a.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..78420c88a590034de06fce4417ca4bad9af04eba
--- /dev/null
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-foss-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'libICE'
+version = '1.0.9'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X Inter-Client Exchange library for freedesktop.org"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('xtrans', '1.3.5'),
+]
+
+builddependencies = [
+    ('xproto', '7.0.28'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/ICE/ICE%s.h' % x for x in ['', 'conn', 'lib', 'msg', 'proto', 'util']],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-gimkl-2.11.5.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-gimkl-2.11.5.eb
index 407ce4845dc4fff3083f3e082fbf5c26cd488777..b63222e9d8bccccab6121f685160a848907fb9a7 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-gimkl-2.11.5.eb
@@ -9,7 +9,7 @@ description = """X Inter-Client Exchange library for freedesktop.org"""
 toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xtrans', '1.3.5'),
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015a.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015a.eb
index 0fb685525a9ab458f3e046a77cddb9c6b605bd98..1bd7511944cae10a9cae63bd8c43a79759d91fa2 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015a.eb
@@ -9,7 +9,7 @@ description = """X Inter-Client Exchange library for freedesktop.org"""
 toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xtrans', '1.3.5'),
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015b.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015b.eb
index d28d3a6e76598182c9fe359a02891d3a95faa57f..2f28c257c5ee52f7d17ed4162e99aeae158775d1 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2015b.eb
@@ -9,7 +9,7 @@ description = """X Inter-Client Exchange library for freedesktop.org"""
 toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xtrans', '1.3.5'),
diff --git a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2016a.eb b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2016a.eb
index 0038b410475db16b6328d9f2f9a843091352091a..bd5ecc8bcd8f1d04a11ffc308d7a8573d32fe62d 100644
--- a/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2016a.eb
+++ b/easybuild/easyconfigs/l/libICE/libICE-1.0.9-intel-2016a.eb
@@ -9,7 +9,7 @@ description = """X Inter-Client Exchange library for freedesktop.org"""
 toolchain = {'name': 'intel', 'version': '2016a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xtrans', '1.3.5'),
diff --git a/easybuild/easyconfigs/l/libQGLViewer/libQGLViewer-2.6.3-foss-2016a-Mesa-11.2.1.eb b/easybuild/easyconfigs/l/libQGLViewer/libQGLViewer-2.6.3-foss-2016a-Mesa-11.2.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3f7a781e6b096180de6243a4dfb320f6f226b137
--- /dev/null
+++ b/easybuild/easyconfigs/l/libQGLViewer/libQGLViewer-2.6.3-foss-2016a-Mesa-11.2.1.eb
@@ -0,0 +1,23 @@
+name = 'libQGLViewer'
+version = '2.6.3'
+
+homepage = 'http://libqglviewer.com/'
+description = "libQGLViewer is a C++ library based on Qt that eases the creation of OpenGL 3D viewers."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.libqglviewer.com/src/']
+sources = [SOURCE_TAR_GZ]
+
+mesa_ver = '11.2.1'
+versionsuffix = '-Mesa-%s' % mesa_ver
+
+dependencies = [
+    ('libGLU', '9.0.0', versionsuffix),
+]
+
+builddependencies = [('Qt', '4.8.7', '-GLib-2.48.0')]
+
+start_dir = '%(builddir)s/libQGLViewer-%(version)s/QGLViewer'
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libQGLViewer/libQGLViewer-2.6.3-foss-2016a.eb b/easybuild/easyconfigs/l/libQGLViewer/libQGLViewer-2.6.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7bcbf378aab6b483017fccaf56fe76839e80933b
--- /dev/null
+++ b/easybuild/easyconfigs/l/libQGLViewer/libQGLViewer-2.6.3-foss-2016a.eb
@@ -0,0 +1,20 @@
+name = 'libQGLViewer'
+version = '2.6.3'
+
+homepage = 'http://libqglviewer.com/'
+description = "libQGLViewer is a C++ library based on Qt that eases the creation of OpenGL 3D viewers."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.libqglviewer.com/src/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('libGLU', '9.0.0'),
+]
+
+builddependencies = [('Qt', '4.8.7')]
+
+start_dir = '%(builddir)s/libQGLViewer-%(version)s/QGLViewer'
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-intel-2014b.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-intel-2014b.eb
index a15bba69ef0ac314ec20b4812bcab675c87addf0..30a7625681691bd6ab3533acb8c4bf792103c2d2 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.1-intel-2014b.eb
@@ -10,7 +10,7 @@ description = """X11 Session Management library, which allows for applications t
 toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libICE', '1.0.8'),
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-foss-2016a.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..289966eec9e12f3ff0c65cbc9c1c96f9d35878e0
--- /dev/null
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-foss-2016a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'libSM'
+version = '1.2.2'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X11 Session Management library, which allows for applications to both manage sessions,
+ and make use of session managers to save and restore their state for later use."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('libICE', '1.0.9'),
+]
+builddependencies = [
+    ('xproto', '7.0.28'),
+    ('xtrans', '1.3.5'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/SM/%s' % x for x in ['SM.h', 'SMlib.h', 'SMproto.h']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-gimkl-2.11.5.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-gimkl-2.11.5.eb
index 580ce7f28a1dc19dbbf6c92fba8c3b7cd163bc6e..a8d0c1fc5507025fcb002a8f4e74f6c20d7a55ca 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-gimkl-2.11.5.eb
@@ -10,7 +10,7 @@ description = """X11 Session Management library, which allows for applications t
 toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libICE', '1.0.9'),
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015a.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015a.eb
index 2a2391d84707047a1c92746781d8beb9550b813f..c3a28914e6b1c3b46eebb46b211b2506c21ec0ae 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015a.eb
@@ -10,7 +10,7 @@ description = """X11 Session Management library, which allows for applications t
 toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libICE', '1.0.9'),
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015b.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015b.eb
index 641ea444768c8466cb450155f6ba31748e645a4c..503006a89b3aa433b3af2bf8aaa17791a3e7105b 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2015b.eb
@@ -10,7 +10,7 @@ description = """X11 Session Management library, which allows for applications t
 toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libICE', '1.0.9'),
diff --git a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2016a.eb b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2016a.eb
index b34ef0db3325dbe5bd1ef75cfabd5d6e96472b8d..1bab5701feb9f0dd86b8630edad1b63106a22873 100644
--- a/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2016a.eb
+++ b/easybuild/easyconfigs/l/libSM/libSM-1.2.2-intel-2016a.eb
@@ -10,7 +10,7 @@ description = """X11 Session Management library, which allows for applications t
 toolchain = {'name': 'intel', 'version': '2016a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libICE', '1.0.9'),
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-intel-2014b.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-intel-2014b.eb
index 3522b7de999bcd34f1608722b5ebd4d85ca5cd52..3a034255d64a7b39a43e87c2b1212102acaae51a 100644
--- a/easybuild/easyconfigs/l/libX11/libX11-1.6.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.1-intel-2014b.eb
@@ -9,7 +9,7 @@ description = """X11 client-side library"""
 toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 pythonversion = '-Python-2.7.8'
 builddependencies = [
diff --git a/easybuild/easyconfigs/l/libX11/libX11-1.6.3-foss-2016a.eb b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7bbdcf2dc4fb174924175df615f4b5c21a6f131f
--- /dev/null
+++ b/easybuild/easyconfigs/l/libX11/libX11-1.6.3-foss-2016a.eb
@@ -0,0 +1,37 @@
+easyblock = 'ConfigureMake'
+
+name = 'libX11'
+version = '1.6.3'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X11 client-side library"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('xextproto', '7.3.0'),
+    ('xcb-proto', '1.11', '', True),
+    ('inputproto', '2.3.1'),
+    ('xproto', '7.0.28'),
+    ('libpthread-stubs', '0.3'),
+    ('kbproto', '1.0.7'),
+    ('xtrans', '1.3.5'),
+]
+
+dependencies = [
+    ('libxcb', '1.11.1'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/%s' % x for x in [
+        'cursorfont.h', 'ImUtil.h', 'Xcms.h', 'XKBlib.h', 'XlibConf.h', 'Xlib.h', 'Xlibint.h', 'Xlib-xcb.h',
+        'Xlocale.h', 'Xregion.h', 'Xresource.h', 'Xutil.h',
+    ]
+    ],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-foss-2016a.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9f49697147bae9290a9a921ea3c702f77639b874
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-foss-2016a.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXau'
+version = '1.0.8'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """The libXau package contains a library implementing the X11 Authorization Protocol.
+This is useful for restricting client access to the display."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('pkg-config', '0.29'),
+    ('xproto', '7.0.28'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXau.a', 'lib/libXau.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-gimkl-2.11.5.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-gimkl-2.11.5.eb
index 2e88286d07dd5193b4a6c78cba93a27eb278570c..934e207665c7f6f71fbdd4162db4783b19c40130 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-gimkl-2.11.5.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.28'),
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.5.14.eb
index f1bc2bfb36875150420155b91c7a9d1722f124cd..bd0254a3352dc7a87d065bbb9e85f42500fd18de 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-goolf-1.5.14.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xproto', '7.0.27'),
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2014b.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2014b.eb
index 22bf8016cf0fdc86c152fe18f46913fd5eee4b88..afa4166c18f76f1bea52d47b9935e641a3e3f976 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2014b.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'intel', 'version': '2014b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xproto', '7.0.26'),
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015a.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015a.eb
index 408dc4aede5be980d0830bd718f95963e3351909..1accebb77fe4d857550ecfaac4d70bbb82ddcb27 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015a.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xproto', '7.0.27'),
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015b.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015b.eb
index 9304d0fc7923a5a9e3a090ac67aed9a4dfd402c5..dafc84e4632ae5b3cec558a2b80043f972c873a6 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2015b.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('xproto', '7.0.28'),
diff --git a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2016a.eb b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2016a.eb
index 243dbd6f22b4c08fdf9b93aec56d036ffc025ea3..8003dc09d5d3cd0b349f966978efd6969b40fcfe 100644
--- a/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2016a.eb
+++ b/easybuild/easyconfigs/l/libXau/libXau-1.0.8-intel-2016a.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.28'),
diff --git a/easybuild/easyconfigs/l/libXcursor/libXcursor-1.1.14-foss-2016a.eb b/easybuild/easyconfigs/l/libXcursor/libXcursor-1.1.14-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1fc949ad4e5cd2e60767ee593359b56e2cb6de9d
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXcursor/libXcursor-1.1.14-foss-2016a.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXcursor'
+version = '1.1.14'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X Cursor management library"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('fixesproto', '5.0'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('libXfixes', '5.0.1'),
+    ('libXrender', '0.9.9'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/Xcursor/Xcursor.h', 'lib/libXcursor.%s' % SHLIB_EXT, 'lib/libXcursor.a'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-foss-2016a.eb b/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..19c75463d3f65c4878f29968c1535732cd8292ca
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXdamage/libXdamage-1.1.4-foss-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXdamage'
+version = '1.1.4'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X Damage extension library"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('libxcb', '1.11.1'),
+    ('libXau', '1.0.8'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/Xdamage.h', 'lib/libXdamage.%s' % SHLIB_EXT, 'lib/libXdamage.a'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.1-intel-2014b.eb b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.1-intel-2014b.eb
index 735a0391abffd08d8c9c8d6a79dd8bcaea45739d..efb7a8e46c3fc806dfb3e504c1df354dc2889d9e 100644
--- a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.1-intel-2014b.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'intel', 'version': '2014b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.26'),
diff --git a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-foss-2016a.eb b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..09bc32a4bba3ae5d7f9bea473fc2c4be2f39f331
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-foss-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXdmcp'
+version = '1.1.2'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """The libXdmcp package contains a library implementing the X Display Manager Control Protocol. This is
+useful for allowing clients to interact with the X Display Manager.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('pkg-config', '0.29'),
+    ('xproto', '7.0.28'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/%(name)s.a', 'lib/%%(name)s.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-gimkl-2.11.5.eb b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-gimkl-2.11.5.eb
index 9233da540e70d56efd4f9d04c138dba19857dc4e..395760652d78ee240234c25ab2d2f1228415029e 100644
--- a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-gimkl-2.11.5.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.28'),
diff --git a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-goolf-1.5.14.eb
index cc513f2315aedf275183f042cf6dd839d6626ad8..599620e265d8e9c31e34abb9e53844feb4fcf9f5 100644
--- a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-goolf-1.5.14.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.27'),
diff --git a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2015a.eb b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2015a.eb
index 79416debddbfd359a5066c65424137059358e1f9..0912eb03113c9f6e18fad7914685309cdc4c3020 100644
--- a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2015a.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.27'),
diff --git a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2015b.eb b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2015b.eb
index 93de3908f000986abdaeb6fc0ad9ccfd0341ebfb..1639916a6f8d952f18c5791e007a117ce3046100 100644
--- a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2015b.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.28'),
diff --git a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2016a.eb b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2016a.eb
index 24fc239d5ebde295fab3546a4a1a758b9600c629..6ec7ecf45d88d64d24fa159f1350cf2a3c7f0cef 100644
--- a/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2016a.eb
+++ b/easybuild/easyconfigs/l/libXdmcp/libXdmcp-1.1.2-intel-2016a.eb
@@ -12,7 +12,7 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.28'),
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-intel-2014b.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-intel-2014b.eb
index 1eeae06c66d2b5b79961527fc7b1668ffcd3b04a..b642948a1ba44534488bae2bf2fea97ecc0b282a 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.2-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.2-intel-2014b.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2014b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libX11', '1.6.1'),
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-foss-2016a.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0a0acbe42bf70074256a9de37d354bb918784788
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXext'
+version = '1.3.3'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """Common X Extensions library"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('xproto', '7.0.28'),
+    ('xextproto', '7.3.0'),
+    ('libpthread-stubs', '0.3'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/%s' % x for x in [
+        'dpms.h', 'extutil.h', 'MITMisc.h', 'multibuf.h', 'security.h', 'shape.h', 'sync.h', 'Xag.h', 'Xcup.h',
+        'Xdbe.h', 'XEVI.h', 'Xext.h', 'Xge.h', 'XLbx.h', 'XShm.h', 'xtestext1.h',
+    ]
+    ],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-gimkl-2.11.5.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-gimkl-2.11.5.eb
index 9ce9ef676fe9465303638102fd43833d395d947b..388076a4983eadc943f7bfe5e05f8aca4713c82e 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-gimkl-2.11.5.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.28'),
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-goolf-1.5.14.eb
index f5d31320ddbee49261ed4016dcf4f41c24f5c000..e0c74eaaa7fe52d58ddcc63d5ec72e239ed1fc3b 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-goolf-1.5.14.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.27'),
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a-Python-2.7.10.eb
index fea0b330b99710ce3e39220e175ae7aaf70974ac..59f66ccd07df0f164d8f711b45730815ebda667e 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a-Python-2.7.10.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.27'),
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a.eb
index c076690abe4da871c64288d82729c17c1924848b..3b9f118decc98974da5179a39d364465ae79b403 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015a.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.27'),
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b-Python-2.7.11.eb
index 23544e2ee33727185a21dda798561a31e8754b36..7c257d0a2f52971e5e7f6f3501da39c745a78f2c 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b-Python-2.7.11.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.28'),
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b.eb
index 93ffb79a95543fc3edab3697f6d404b61a979720..3751e0a221fbd5c750d78b75a5ba6b865e81e08c 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2015b.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.28'),
diff --git a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2016a.eb b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2016a.eb
index 3e89327b588652cdf88285d9f631460b8e3b4eb4..2d93058e5e8b822d4af7a1fb10549da9bd12706b 100644
--- a/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2016a.eb
+++ b/easybuild/easyconfigs/l/libXext/libXext-1.3.3-intel-2016a.eb
@@ -10,11 +10,12 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 builddependencies = [
     ('xproto', '7.0.28'),
     ('xextproto', '7.3.0'),
+    ('libpthread-stubs', '0.3'),
 ]
 
 dependencies = [
diff --git a/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-foss-2016a.eb b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..aa11951f76a4627bd897f4b8978f517b9a556a97
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXfixes/libXfixes-5.0.1-foss-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXfixes'
+version = '5.0.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X Fixes extension library"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('fixesproto', '5.0'),
+    ('xextproto', '7.3.0'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/Xfixes.h', 'lib/libXfixes.a', 'lib/libXfixes.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-foss-2016a-freetype-2.6.3.eb b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-foss-2016a-freetype-2.6.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..63d5bbf4440b3e813fb24e839ddb9f45fb026c7a
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-foss-2016a-freetype-2.6.3.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXfont'
+version = '1.5.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X font libary"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+freetype_ver = '2.6.3'
+versionsuffix = '-freetype-%s' % freetype_ver
+
+builddependencies = [
+    ('fontsproto', '2.1.3'),
+    ('xproto', '7.0.28'),
+    ('xtrans', '1.3.5'),
+    ('xorg-macros', '1.19.0'),
+    ('libfontenc', '1.1.3'),
+]
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('freetype', freetype_ver),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXfont.%s' % SHLIB_EXT, 'lib/libXfont.a'],
+    'dirs': ['include/X11/fonts'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-foss-2016a.eb b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b62ce08a63a7ce8cd23bc4e1681f04abfe2ccc1a
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-foss-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXfont'
+version = '1.5.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X font libary"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('fontsproto', '2.1.3'),
+    ('xproto', '7.0.28'),
+    ('xtrans', '1.3.5'),
+    ('xorg-macros', '1.19.0'),
+    ('libfontenc', '1.1.3'),
+]
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('freetype', '2.6.2'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXfont.%s' % SHLIB_EXT, 'lib/libXfont.a'],
+    'dirs': ['include/X11/fonts'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2016a-freetype-2.6.3.eb b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2016a-freetype-2.6.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..45a31bc1bd1db238ed8ffef5a33588a265e99c55
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXfont/libXfont-1.5.1-intel-2016a-freetype-2.6.3.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXfont'
+version = '1.5.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X font libary"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+freetype_ver = '2.6.3'
+versionsuffix = '-freetype-%s' % freetype_ver
+
+builddependencies = [
+    ('fontsproto', '2.1.3'),
+    ('xproto', '7.0.28'),
+    ('xtrans', '1.3.5'),
+    ('xorg-macros', '1.19.0'),
+    ('libfontenc', '1.1.3'),
+]
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('freetype', freetype_ver),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXfont.%s' % SHLIB_EXT, 'lib/libXfont.a'],
+    'dirs': ['include/X11/fonts'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXft/libXft-2.3.2-foss-2016a.eb b/easybuild/easyconfigs/l/libXft/libXft-2.3.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1a968a5adaeef52cd3170d1f441505b873c67ae9
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXft/libXft-2.3.2-foss-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXft'
+version = '2.3.2'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X11 client-side library"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('kbproto', '1.0.7'),
+    ('renderproto', '0.11'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('libXrender', '0.9.9'),
+    ('freetype', '2.6.2'),
+    ('fontconfig', '2.11.94'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXft.a'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015a.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015a.eb
index 6943d3e084c3390e2243d96887d7cf344f1a29c5..68589245d1f3450dd0cbc0777d51fa734e804d1d 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015a.eb
@@ -1,4 +1,5 @@
 easyblock = 'ConfigureMake'
+
 name = 'libXi'
 version = '1.7.4'
 
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b-Python-2.7.11.eb
index eaa232fe89b5623e244200c86516ddb54de93610..cd973d2ea0b74d22c5fbe732b0e1985eb5596838 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b-Python-2.7.11.eb
@@ -1,4 +1,5 @@
 easyblock = 'ConfigureMake'
+
 name = 'libXi'
 version = '1.7.4'
 versionsuffix = '-Python-2.7.11'
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b.eb
index 0ed8e42a2078618241a5c260eead5a7814d8ef01..60cd626d31f6380b26c3d664c8cde29a1c284192 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.4-intel-2015b.eb
@@ -1,4 +1,5 @@
 easyblock = 'ConfigureMake'
+
 name = 'libXi'
 version = '1.7.4'
 
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.6-foss-2016a.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.6-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c94df236e015e156d9b1a069c959cf1e4eb42496
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.6-foss-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXi'
+version = '1.7.6'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """LibXi provides an X Window System client interface to the XINPUT extension to the X protocol."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('xproto', '7.0.28'),
+    ('xextproto', '7.3.0'),
+    ('inputproto', '2.3.1'),
+    ('xorg-macros', '1.19.0'),
+]
+
+dependencies = [
+    ('libXext', '1.3.3'),
+    ('libXfixes', '5.0.1'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/XInput.h', 'include/X11/extensions/XInput2.h', 'lib/libXi.%s' % SHLIB_EXT, 'lib/libXi.a'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXi/libXi-1.7.6-intel-2016a.eb b/easybuild/easyconfigs/l/libXi/libXi-1.7.6-intel-2016a.eb
index 265985f5e5de76edaf2cca81ea7bd08f1697dcf4..5e9d4cb87a9181d5ba3d50c5a01659c2484d6181 100644
--- a/easybuild/easyconfigs/l/libXi/libXi-1.7.6-intel-2016a.eb
+++ b/easybuild/easyconfigs/l/libXi/libXi-1.7.6-intel-2016a.eb
@@ -1,4 +1,5 @@
 easyblock = 'ConfigureMake'
+
 name = 'libXi'
 version = '1.7.6'
 
diff --git a/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-foss-2016a.eb b/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e0a2e3d206ef13162384e489b00dbf8340a2fdf6
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXinerama/libXinerama-1.1.3-foss-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXinerama'
+version = '1.1.3'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """Xinerama multiple monitor library"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('kbproto', '1.0.7'),
+    ('xineramaproto', '1.2.1'),
+    ('xextproto', '7.3.0'),
+    ('xproto', '7.0.28'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('libXext', '1.3.3'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXinerama.a'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-foss-2016a.eb b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c219eeb168131241503dc9c13206753ea390174e
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXmu/libXmu-1.1.2-foss-2016a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXmu'
+version = '1.1.2'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """libXmu provides a set of miscellaneous utility convenience functions for X libraries to use.
+ libXmuu is a lighter-weight version that does not depend on libXt or libXext"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+dependencies = [
+    ('libXt', '1.1.5'),
+    ('libXpm', '3.5.11'),
+]
+sanity_check_paths = {
+    'files': ['lib/%s' % x for x in ['%(name)s.a', '%%(name)s.%s' % SHLIB_EXT]],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-foss-2016a.eb b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1cc567cb363b01f220b0bdaf4e1aac8e8a0c0469
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXpm/libXpm-3.5.11-foss-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXpm'
+version = '3.5.11'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """libXp provides the X print library."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [('gettext', '0.19.6')]
+
+sanity_check_paths = {
+    'files': ['lib/%s' % x for x in ['libXpm.a', 'libXpm.%s' % SHLIB_EXT]],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXrandr/libXrandr-1.5.0-foss-2016a.eb b/easybuild/easyconfigs/l/libXrandr/libXrandr-1.5.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b6614e79e7fc4785f278a783d5d1771dcdf785a2
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXrandr/libXrandr-1.5.0-foss-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXrandr'
+version = '1.5.0'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X Resize, Rotate and Reflection extension library"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('randrproto', '1.5.0'),
+    ('renderproto', '0.11'),
+    ('xextproto', '7.3.0'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+    ('libXext', '1.3.3'),
+    ('libXrender', '0.9.9'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXrandr.%s' % SHLIB_EXT, 'lib/libXrandr.a'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXrender/libXrender-0.9.9-foss-2016a.eb b/easybuild/easyconfigs/l/libXrender/libXrender-0.9.9-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1e63340752407e5ab7b4abfa4fe7878a4c47fa69
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXrender/libXrender-0.9.9-foss-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXrender'
+version = '0.9.9'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X11 client-side library"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('kbproto', '1.0.7'),
+    ('renderproto', '0.11'),
+    ('libpthread-stubs', '0.3'),
+    ('xorg-macros', '1.19.0'),
+    ('xproto', '7.0.28')
+]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libXrender.a'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2014b.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2014b.eb
index 6f7913580175e47fb1fdc3415c4a5831f52773a5..4646632358335e1bb325e533531dedfdc591ae1f 100644
--- a/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.4-intel-2014b.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'intel', 'version': '2014b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+source_urls = [XORG_LIB_SOURCE]
 
 dependencies = [
     ('libSM', '1.2.1'),
diff --git a/easybuild/easyconfigs/l/libXt/libXt-1.1.5-foss-2016a.eb b/easybuild/easyconfigs/l/libXt/libXt-1.1.5-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e37e36b1f5b4cfc120c6b3f86aa181a8d4cbef97
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXt/libXt-1.1.5-foss-2016a.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXt'
+version = '1.1.5'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """libXt provides the X Toolkit Intrinsics, an abstract widget library upon which other toolkits are
+ based. Xt is the basis for many toolkits, including the Athena widgets (Xaw), and LessTif (a Motif implementation)."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('xproto', '7.0.28'),
+    ('kbproto', '1.0.7'),
+]
+
+dependencies = [
+    ('libSM', '1.2.2'),
+    ('libICE', '1.0.9'),
+    ('libX11', '1.6.3'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/%s' % x for x in [
+        'CallbackI.h', 'CompositeP.h', 'Constraint.h', 'Core.h', 'CreateI.h', 'HookObjI.h', 'Intrinsic.h',
+        'IntrinsicP.h', 'ObjectP.h', 'RectObj.h', 'ResConfigP.h', 'SelectionI.h', 'ShellI.h', 'StringDefs.h',
+        'TranslateI.h', 'Vendor.h', 'Xtos.h', 'Composite.h', 'ConstrainP.h', 'ConvertI.h', 'CoreP.h', 'EventI.h',
+        'InitialI.h', 'IntrinsicI.h', 'Object.h', 'PassivGraI.h', 'RectObjP.h', 'ResourceI.h', 'Shell.h', 'ShellP.h',
+        'ThreadsI.h', 'VarargsI.h', 'VendorP.h',
+    ]
+    ],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libXxf86vm/libXxf86vm-1.1.4-intel-2016a.eb b/easybuild/easyconfigs/l/libXxf86vm/libXxf86vm-1.1.4-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..873ae3da80b4e0b797043e11aeb81eae0251f2ae
--- /dev/null
+++ b/easybuild/easyconfigs/l/libXxf86vm/libXxf86vm-1.1.4-intel-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'libXxf86vm'
+version = '1.1.4'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X11 XFree86 video mode extension library"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://xorg.freedesktop.org/archive/individual/lib/']
+
+builddependencies = [
+    ('xf86vidmodeproto', '2.3.1'),
+    ('xorg-macros', '1.19.0'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/xf86vmode.h']+
+             ['lib/libXxf86vm.%s' % x for x in ['a', SHLIB_EXT]],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/l/libcerf/libcerf-1.4-foss-2016a.eb b/easybuild/easyconfigs/l/libcerf/libcerf-1.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4f3471b4f66aa55aca5038c82d48649ed813b807
--- /dev/null
+++ b/easybuild/easyconfigs/l/libcerf/libcerf-1.4-foss-2016a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'libcerf'
+version = '1.4'
+
+homepage = 'http://gnuplot.sourceforge.net/'
+description = """libcerf is a self-contained numeric library that provides an efficient and accurate
+ implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TGZ]
+source_urls = [
+    'http://apps.jcns.fz-juelich.de/src/libcerf/',
+    'http://apps.jcns.fz-juelich.de/src/libcerf/old',
+]
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('libtool', '2.4.6'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libcerf.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.67-foss-2016a.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.67-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..93d87d95336cce4c98418ec9cca5883577a6389c
--- /dev/null
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.67-foss-2016a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'libdrm'
+version = '2.4.67'
+
+homepage = 'http://dri.freedesktop.org'
+description = """Direct Rendering Manager runtime library."""
+
+source_urls = ['http://dri.freedesktop.org/libdrm/']
+sources = [SOURCELOWER_TAR_GZ]
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+builddependencies = [
+    ('libpthread-stubs', '0.3'),
+]
+
+dependencies = [
+    ('libpciaccess', '0.13.4'),
+]
+
+sanity_check_paths = {
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+              'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
+    'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.68-foss-2016a.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.68-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..68f8a6be8998abb2cf0e67dd219866f517bf7919
--- /dev/null
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.68-foss-2016a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'libdrm'
+version = '2.4.68'
+
+homepage = 'http://dri.freedesktop.org'
+description = """Direct Rendering Manager runtime library."""
+
+source_urls = ['http://dri.freedesktop.org/libdrm/']
+sources = [SOURCELOWER_TAR_GZ]
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+builddependencies = [
+    ('libpthread-stubs', '0.3'),
+]
+
+dependencies = [
+    ('libpciaccess', '0.13.4'),
+]
+
+sanity_check_paths = {
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+              'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
+    'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libdrm/libdrm-2.4.68-intel-2016a.eb b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.68-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e64ac66c51a1d7428c076fdf5a7a55df0e6a3f41
--- /dev/null
+++ b/easybuild/easyconfigs/l/libdrm/libdrm-2.4.68-intel-2016a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'libdrm'
+version = '2.4.68'
+
+homepage = 'http://dri.freedesktop.org'
+description = """Direct Rendering Manager runtime library."""
+
+source_urls = ['http://dri.freedesktop.org/libdrm/']
+sources = [SOURCELOWER_TAR_GZ]
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+builddependencies = [
+    ('libpthread-stubs', '0.3'),
+]
+
+dependencies = [
+    ('libpciaccess', '0.13.4'),
+]
+
+sanity_check_paths = {
+    'files': ['include/xf86drm.h', 'include/xf86drmMode.h', 'lib/libdrm_intel.%s' % SHLIB_EXT,
+              'lib/libdrm_radeon.%s' % SHLIB_EXT, 'lib/libdrm.%s' % SHLIB_EXT, 'lib/libkms.%s' % SHLIB_EXT],
+    'dirs': ['include/libdrm', 'include/libkms', 'lib/pkgconfig'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libdwarf/libdwarf-20140805-GCC-4.9.2.eb b/easybuild/easyconfigs/l/libdwarf/libdwarf-20140805-GCC-4.9.2.eb
index cc9e86a7d03a48197779f067635ad063ca4d8da0..8c554c3e242e8b69228275318ae25b933c0d4e92 100644
--- a/easybuild/easyconfigs/l/libdwarf/libdwarf-20140805-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/l/libdwarf/libdwarf-20140805-GCC-4.9.2.eb
@@ -15,7 +15,7 @@ source_urls = ['http://www.prevanders.net']
 dependencies = [('libelf', '0.8.13')]
 
 with_configure = True
-preconfigopts = 'CFLAGS="-fPIC $CFLAGS" '
+preconfigopts = 'env CFLAGS="-fPIC $CFLAGS" '
 configopts = "--enable-shared "
 
 # This is dirty but libdwarf cannot find it's own library in the build process...
diff --git a/easybuild/easyconfigs/l/libevent/libevent-2.0.22-GCCcore-4.9.3.eb b/easybuild/easyconfigs/l/libevent/libevent-2.0.22-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2de9d3663c6cbc00a42adadc0789cb496578f69b
--- /dev/null
+++ b/easybuild/easyconfigs/l/libevent/libevent-2.0.22-GCCcore-4.9.3.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libevent'
+version = '2.0.22'
+
+homepage = 'http://libevent.org/'
+description = """The libevent API provides a mechanism to execute a callback function when a specific
+ event occurs on a file descriptor or after a timeout has been reached.
+ Furthermore, libevent also support callbacks due to signals or regular timeouts."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+
+source_urls = [
+    'https://github.com/downloads/%(name)s/%(name)s/',
+    'https://sourceforge.net/projects/levent/files/%(name)s/%(name)s-%(version_major_minor)s/',
+]
+sources = ['%(name)s-%(version)s-stable.tar.gz']
+
+builddependencies = [
+    # use same binutils version that was used when building GCCcore toolchain
+    ('binutils', '2.25', '', True),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libffi/libffi-3.2.1-foss-2016a.eb b/easybuild/easyconfigs/l/libffi/libffi-3.2.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c7c638b6fa058bde0d773dc12d165c00b3d208b2
--- /dev/null
+++ b/easybuild/easyconfigs/l/libffi/libffi-3.2.1-foss-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'libffi'
+version = '3.2.1'
+
+homepage = 'http://sourceware.org/libffi/'
+description = """The libffi library provides a portable, high level programming interface to various calling
+conventions. This allows a programmer to call any function specified by a call interface description at run-time."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [
+    'ftp://sourceware.org/pub/libffi/',
+    'http://www.mirrorservice.org/sites/sourceware.org/pub/libffi/',
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': [('lib/libffi.%s' % SHLIB_EXT, 'lib64/libffi.%s' % SHLIB_EXT), ('lib/libffi.a', 'lib64/libffi.a')],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libfontenc/libfontenc-1.1.3-foss-2016a.eb b/easybuild/easyconfigs/l/libfontenc/libfontenc-1.1.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b21fd6654ef5273b817c42258a2d78b40bbf78a6
--- /dev/null
+++ b/easybuild/easyconfigs/l/libfontenc/libfontenc-1.1.3-foss-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'libfontenc'
+version = '1.1.3'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/xlibs/'
+description = """X11 font encoding library"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('xproto', '7.0.28'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/fonts/fontenc.h', 'lib/libfontenc.%s' % SHLIB_EXT, 'lib/libfontenc.a'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libgd/libgd-2.1.1-foss-2016a.eb b/easybuild/easyconfigs/l/libgd/libgd-2.1.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b645a0059566931c64a35dbcae8b6b7a7564f97b
--- /dev/null
+++ b/easybuild/easyconfigs/l/libgd/libgd-2.1.1-foss-2016a.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libgd'
+version = '2.1.1'
+
+homepage = 'http://libgd.bitbucket.org/'
+description = "GD is an open source code library for the dynamic creation of images by programmers."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://bitbucket.org/libgd/gd-libgd/downloads']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('fontconfig', '2.11.94'),
+    ('libjpeg-turbo', '1.4.2'),
+    ('libpng', '1.6.21'),
+    ('zlib', '1.2.8'),
+]
+
+sanity_check_paths = {
+    'files': ["lib/libgd.a", "lib/libgd.%s" % SHLIB_EXT],
+    'dirs': ["bin", "include"],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.7-foss-2016a.eb b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.7-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c1b5b27e46314bb614b18bfed50044e1690acde6
--- /dev/null
+++ b/easybuild/easyconfigs/l/libgtextutils/libgtextutils-0.7-foss-2016a.eb
@@ -0,0 +1,32 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'libgtextutils'
+version = '0.7'
+
+homepage = 'http://hannonlab.cshl.edu/fastx_toolkit/'
+description = """ligtextutils is a dependency of fastx-toolkit and is provided via the same upstream"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/agordon/libgtextutils/releases/download/%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['lib/libgtextutils.so', 'lib/libgtextutils.a'],
+    'dirs': ['lib/pkgconfig']
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libidn/libidn-1.32-foss-2016a.eb b/easybuild/easyconfigs/l/libidn/libidn-1.32-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..be095e8cc212757aa1b6dc5aaf35227874ce8da2
--- /dev/null
+++ b/easybuild/easyconfigs/l/libidn/libidn-1.32-foss-2016a.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'libidn'
+version = '1.32'
+
+homepage = 'http://www.gnu.org/software/libidn'
+description = """GNU Libidn is a fully documented implementation of the Stringprep, Punycode and IDNA specifications.
+Libidn's purpose is to encode and decode internationalized domain names."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/idn', 'lib/libidn.%s' % SHLIB_EXT],
+    'dirs': ['include'],
+}
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-intel-2016a-NASM-2.12.01.eb b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-intel-2016a-NASM-2.12.01.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c1f7d100e0771d507e49b0fe723e48d16f0f2447
--- /dev/null
+++ b/easybuild/easyconfigs/l/libjpeg-turbo/libjpeg-turbo-1.4.2-intel-2016a-NASM-2.12.01.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'libjpeg-turbo'
+version = '1.4.2'
+
+homepage = 'http://sourceforge.net/projects/libjpeg-turbo/'
+description = """libjpeg-turbo is a fork of the original IJG libjpeg which uses SIMD to accelerate baseline JPEG
+compression and decompression. libjpeg is a library that implements JPEG image encoding, decoding and transcoding.
+"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+nasmver = '2.12.01'
+versionsuffix = '-NASM-%s' % nasmver
+
+dependencies = [
+    ('NASM', nasmver),
+]
+
+configopts = "--with-jpeg8"
+runtest = "test"
+
+sanity_check_paths = {
+    'files': ['bin/cjpeg', 'bin/djpeg', 'bin/jpegtran', 'bin/rdjpgcom', 'bin/tjbench', 'bin/wrjpgcom',
+              'lib/libjpeg.a', 'lib/libjpeg.%s' % SHLIB_EXT, 'lib/libturbojpeg.a', 'lib/libturbojpeg.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-GCC-4.7.2.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-GCC-4.7.2.eb
index 6ac9b7d5c3de3333b3efa4a1e6726f967d608b83..01c9c7b5d722b432caebcbf661f7cea578632820 100644
--- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-GCC-4.7.2.eb
@@ -16,7 +16,7 @@ builddependencies = [
     ('xorg-macros', '1.17'),
 ]
 
-preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
 
 sanity_check_paths = {
     'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb
index a021127537b826548d71320914b00d825ffb4e44..3c63b8747026f31463e89e7ebdccfa88fa8403e5 100644
--- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goalf-1.1.0-no-OFED.eb
@@ -16,7 +16,7 @@ builddependencies = [
     ('xorg-macros', '1.17'),
 ]
 
-preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
 
 sanity_check_paths = {
     'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goolf-1.4.10.eb
index 11090d4b7a795f4bbba096076fd4be56bb88f3b0..437954d342ed05ae7676c59467ef56059030ecc1 100644
--- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-goolf-1.4.10.eb
@@ -16,7 +16,7 @@ builddependencies = [
     ('xorg-macros', '1.17'),
 ]
 
-preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
 
 sanity_check_paths = {
     'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.0.6.eb
index f66aff6454aa0fdea7f45ee0d7dc803b40153dad..f0291301fc3cee91301038c0a2e8c8aa5e21554d 100644
--- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.0.6.eb
@@ -16,7 +16,7 @@ builddependencies = [
     ('xorg-macros', '1.17'),
 ]
 
-preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
 
 sanity_check_paths = {
     'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.1.13.eb
index f03e2b9b6023073fe14bd15b50427f193fb428bb..e43c36e89ce9dac706dc33af28e5b842f657df8f 100644
--- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-4.1.13.eb
@@ -16,7 +16,7 @@ builddependencies = [
     ('xorg-macros', '1.17'),
 ]
 
-preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
 
 sanity_check_paths = {
     'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-5.3.0.eb
index 33c34a406a067a1c3fff444753e8f1c30e35f248..834a292992b6924848156c8e604b2ee28dbd66aa 100644
--- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-5.3.0.eb
@@ -16,7 +16,7 @@ builddependencies = [
     ('xorg-macros', '1.17'),
 ]
 
-preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
 
 sanity_check_paths = {
     'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-5.5.0.eb
index 7e3d115240e3b7d820bb882469644c1c147046e1..c3e51b68546d76a1dec9c53b3a6706e565d0cfe3 100644
--- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-ictce-5.5.0.eb
@@ -16,7 +16,7 @@ builddependencies = [
     ('xorg-macros', '1.17'),
 ]
 
-preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
 
 sanity_check_paths = {
     'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-intel-2015a.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-intel-2015a.eb
index ce77f3502c1b3bfd484cc33b8b316d852459faab..8f259d339afe094a2d29a189e1a67108c19f7912 100644
--- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.1-intel-2015a.eb
@@ -16,7 +16,7 @@ builddependencies = [
     ('xorg-macros', '1.17'),
 ]
 
-preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
 
 sanity_check_paths = {
     'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.3-intel-2015a.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.3-intel-2015a.eb
index e28f16cff6c3aedfb3731be4ae131774dafbe438..5f22d77a36b0bd54932e7b09e6d37ec94ab33505 100644
--- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.3-intel-2015a.eb
@@ -16,7 +16,7 @@ builddependencies = [
     ('xorg-macros', '1.19.0'),
 ]
 
-preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
 
 sanity_check_paths = {
     'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-foss-2016a.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c39482e40cf6f7a4a9da00a233f83b8497dc6de9
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-foss-2016a.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'libpciaccess'
+version = '0.13.4'
+
+homepage = 'http://cgit.freedesktop.org/xorg/lib/libpciaccess/'
+description = """Generic PCI access library."""
+
+source_urls = ['http://cgit.freedesktop.org/xorg/lib/libpciaccess/snapshot']
+sources = [SOURCE_TAR_GZ]
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('xorg-macros', '1.19.0'),
+]
+
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+
+sanity_check_paths = {
+    'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-gimkl-2.11.5.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-gimkl-2.11.5.eb
index 2a5e9c8d05e635d50f0be873bf2197031d7f2d89..ea05edccedb37f6684b81ce4d5d747cad15b573e 100644
--- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-gimkl-2.11.5.eb
@@ -16,7 +16,7 @@ builddependencies = [
     ('xorg-macros', '1.19.0'),
 ]
 
-preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
 
 sanity_check_paths = {
     'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-intel-2015b.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-intel-2015b.eb
index 4281029487a9cdf3fd79dc289fecba45bcd26153..1af83efe6669d154e184893ea443ed883e59367b 100644
--- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-intel-2015b.eb
@@ -16,7 +16,7 @@ builddependencies = [
     ('xorg-macros', '1.19.0'),
 ]
 
-preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
 
 sanity_check_paths = {
     'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
diff --git a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-intel-2016a.eb b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-intel-2016a.eb
index 2ac72299c577f48e9860b484aa069709f9638e9f..c0a23d9702e9d266c112a6df21943bc50ac9877c 100644
--- a/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-intel-2016a.eb
+++ b/easybuild/easyconfigs/l/libpciaccess/libpciaccess-0.13.4-intel-2016a.eb
@@ -16,7 +16,7 @@ builddependencies = [
     ('xorg-macros', '1.19.0'),
 ]
 
-preconfigopts = "ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
+preconfigopts = "env ACLOCAL='aclocal -I $EBROOTXORGMINMACROS/share/aclocal' ./autogen.sh && "
 
 sanity_check_paths = {
     'files': ['include/pciaccess.h', 'lib/libpciaccess.a'],
diff --git a/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-foss-2016a.eb b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fcb767cfdbf67a88c1f959932d14d30be69c7b11
--- /dev/null
+++ b/easybuild/easyconfigs/l/libpthread-stubs/libpthread-stubs-0.3-foss-2016a.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'libpthread-stubs'
+version = '0.3'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
+latency hiding, direct access to the protocol, improved threading support, and extensibility."""
+
+source_urls = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sanity_check_paths = {
+    'files': ['lib/pkgconfig/pthread-stubs.pc'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
index 17ca0fce10780c03c992cf8f78ff36459e4eab0e..084f6453704ab55c45cad9b9c0662f2d695f8c34 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmpolf-1.1.6.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9-20130406')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
index 8d2ea29b4ccb46917e2fb6b1aba8bb3791c309ae..f0751a5aa27e8d291e7609b0c3f3f393d9becc9c 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.1.12rc1.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9-20130406')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb
index aea7099ee49367d5d3ac4f4284a74fd2900710a0..0ae01c0783960e8bea817e7c1bfa8f808bdc1c55 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgmvolf-1.2.7.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9-20130406')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
index 7216c9ca1c0b1062947134f1b0e5a45aae88e03a..39cc8963117309d04a09291179038c097c099e1d 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-cgoolf-1.1.7.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9-20130406')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-foss-2015b.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9a9c4dd1a0957579f22127b048218cc88d6b3a0f
--- /dev/null
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-foss-2015b.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'libreadline'
+version = '6.2'
+
+homepage = 'http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html'
+description = """The GNU Readline library provides a set of functions for use by applications that
+ allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available.
+ The Readline library includes additional functions to maintain a list of previously-entered command lines,
+ to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+sources = ['readline-%(version)s.tar.gz']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
+
+dependencies = [('ncurses', '5.9')]
+
+# for the termcap symbols, use EB ncurses
+preconfigopts = "env LDFLAGS='-lncurses'"
+
+sanity_check_paths = {
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb
index a36ac06d7496201adeb72f7268a69c7caa5aaa53..245f1b2b64442219efd1ac036378239ed7684715 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmpolf-1.4.8.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb
index 44256963645070ebc9397f8f754f7a7c06e64003..8e8d97c9af7c05b9f42b610f4b9df0b07a90d70b 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9-20130406')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
index 8892dfc907e2ffe7fec8ea376d8bc81dd23d936a..0e2ab07ab0fddaa4cd6c368ce92d019734097e27 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gmvolf-1.7.12rc1.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9-20130406')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
index 7778abffff5dda0354515b41f0432ed3a473929e..c6a66c33d9c60f73f9ac283f11f2360365b94468 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.1.0-no-OFED.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb
index 157a15b6bbc87d4d5911bffeccfcdcbcca0a8598..f765c408885c159af688d500780c53e1b8fe1bc0 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goalf-1.5.12-no-OFED.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb
index 6a9bcf9cdd20df999f2d5d4e5eb7d9757f482b44..f13cdef9581dd4137af0d4de86ef17ee6fd99de3 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-gompi-1.4.12-no-OFED.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb
index c5324cbad17bf175b5edf389d2d1137c3b7cd8d2..f5f1c5bd47560f2210f06bef15ae0e8be6be751a 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.4.10.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.5.14.eb
index b07b7634b9378a6e3cc51067addf0af43f2682f2..5c9d193cce6420adf0f583c17e6959e5d07f9fa4 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-goolf-1.5.14.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
index 853816b19b74252c39cd4f68750b6a32c459a7d2..596222a189a166f7a9a7ecf79f2a10f33a0b288b 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.10.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
index 26cadb84b9a2e811c060b66e5287914f7b23480c..2ed024170ca02b6f8a715505d6922a6a51fb3469 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.0.6.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
index 055d457da0daf5dcb7f56dcfe9ea760607859dbd..fd8d7fabf043e3e7e37b687e151d6dd92f35379f 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-4.1.13.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb
index 6f9a153abf6d4091831d18e02db1b0a2cc1ed77b..35b967c78dbe0f0e79740a763dbb2ee3278e9d72 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.2.0.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb
index a4bce470a581a429d2db91ccbd4dfb427d16ecc2..54fd902c426f311cfd0b1e8a7084e079c23d973d 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.3.0.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.4.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.4.0.eb
index 8003f03676c67211eddf93fa2cfb6f4fa325002c..12e011a8ed784f28fc302e0897afc9a56185dde2 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.4.0.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.4.0.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb
index 15a227218e589f36cad4c80cfe1033487c5775a9..18ebd1a1e7d1e4cb5a3b49a4e6381189f0744d9c 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-ictce-5.5.0.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-intel-2015a.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-intel-2015a.eb
index 9236fd84d0e29a2f4e2c0d827be11f8afe2eed1e..cdb4bf6f5a9e6c274c70cd6b5bdc84eb724439f8 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-intel-2015a.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
index 7435fb5029668831e02b53a1b22fe8729a85e617..0f7e91280563b57bbe7c81774641b47d6e033d12 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iomkl-4.6.13.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb
index a669b4f5be98d4f4d08ca6e5f4b73cc1d3cf987e..27560c2cd2d8fb11c3d964940d828abc2d24152e 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-3.7.3.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb
index a120dd43072133e15932f1ecc39c22507677fd92..7ca975dc767da4f95511cf46c0642323ce6ee4b3 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.2-iqacml-4.4.13.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-CrayGNU-2015.06.eb
similarity index 91%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.3-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/l/libreadline/libreadline-6.3-CrayGNU-2015.06.eb
index 9f6f591568a4b93d96818b3004837bcc5e0c9ab4..b30099a7751350afcec12c8dcd903e62f1252fd2 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-CrayGNU-2015.06.eb
@@ -9,7 +9,7 @@ description = """The GNU Readline library provides a set of functions for use by
  The Readline library includes additional functions to maintain a list of previously-entered command lines,
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-CrayGNU-2015.11.eb
similarity index 91%
rename from easybuild/easyconfigs/l/libreadline/libreadline-6.3-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/l/libreadline/libreadline-6.3-CrayGNU-2015.11.eb
index 86d953546093074483e92d1bdae54f37a3b5ece0..712eabaeda38c127a2347ead22a1b9816b2ac56c 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-CrayGNU-2015.11.eb
@@ -9,7 +9,7 @@ description = """The GNU Readline library provides a set of functions for use by
  The Readline library includes additional functions to maintain a list of previously-entered command lines,
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files' : ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.2.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.2.eb
index 252a86c5272777c1e73cb40a1b2157a44f522ec0..667201ed1aeb92e18f90b8d9bdaa3f1890982d9a 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.8.2.eb
@@ -17,7 +17,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.9.2.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.9.2.eb
index afd0f9f313dd4937045b4ab3c5509f01bca1ba7b..55974b6b67f2fa1a92d1e5cc763faddc96761b81 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCC-4.9.2.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCCcore-4.9.3.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCCcore-4.9.3.eb
index 46e89b5a9631cb5358043e3ac5817d97f33b546b..68d5cccacb0d4cb9bb745c206094e46905386a1b 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCCcore-4.9.3.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GCCcore-4.9.3.eb
@@ -19,7 +19,7 @@ builddependencies = [('binutils', '2.25')]
 dependencies = [('ncurses', '6.0')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GNU-4.9.3-2.25.eb
index 05d84769350f732f669f87267245163622ce84c2..d726fb4329a6b700510fde5d7f62b23842335461 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-GNU-4.9.3-2.25.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2014b.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2014b.eb
index 362df4f9bdb1c527421254122e94a0d4d0d33f98..2745ab85571e0ccbae0ff6520c09b6adbfff2163 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2014b.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2014b.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015.05.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015.05.eb
index 763ccd948895bc5c2f4a8bf79edce3ed7bcbc06a..c856b610005da88a7c2642813eed16c971cbe2d8 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015.05.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015.05.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015a.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015a.eb
index d3b76459b6d44c14213c55fcfe4732b0a9f6881d..b5740c5333b926cc9b792a7e9820936750453999 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015a.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015a.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015b.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015b.eb
index 66ecad79ff5cb8aab4c9881ac3b3b40065bbe447..4bbd90baa77e0cbfdacdae4025b85914c371412f 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015b.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2015b.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016a.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016a.eb
index 037141ab778ea9d9405bc2774f34d54c103c75f3..e33a1ae2394abb87e940200e97fb44c32d407c6f 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016a.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-foss-2016a.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '6.0')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gimkl-2.11.5.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gimkl-2.11.5.eb
index fb2145ca857437d4442fcb075c14d247c0a96c58..675e8c38cd4f8af9f69e048ef613940a6cd3d60e 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gimkl-2.11.5.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gompi-1.5.16.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gompi-1.5.16.eb
index 8845b7c009d1113640f85777f69d7906534f8b77..dbc0087596235a6e73b7500dd15b3772e8a45b89 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gompi-1.5.16.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-gompi-1.5.16.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.4.10.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.4.10.eb
index 793dcaf0af9d518ec1a17da92d992c39914f9853..cbb20595ceb38d0e33778b29963aab454dbfde3e 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.4.10.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.5.14.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.5.14.eb
index e594babc962286447e5cf8a60625ed8d96ad63e6..7ecfe2dc0ab40746160ebcd5f57d1be13cebe5ca 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.5.14.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.5.16.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.5.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a11e7823ed4c6ada4409799ecd43dc20148f7226
--- /dev/null
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.5.16.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'libreadline'
+version = '6.3'
+
+homepage = 'http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html'
+description = """The GNU Readline library provides a set of functions for use by applications that
+ allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available.
+ The Readline library includes additional functions to maintain a list of previously-entered command lines,
+ to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+toolchainopts = {'pic': True}
+
+sources = ['readline-%(version)s.tar.gz']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
+
+dependencies = [('ncurses', '5.9')]
+
+# for the termcap symbols, use EB ncurses
+preconfigopts = "env LDFLAGS='-lncurses'"
+
+sanity_check_paths = {
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+             ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                                  'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.7.20.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.7.20.eb
index ec5413615c6946b0b1f010599aaa86f039b41fbb..3c009a2b02de4f3067e03792fe77b090c798f935 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.7.20.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-goolf-1.7.20.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.2.5.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.2.5.eb
index 35af50be83bdce6ffaf60f2c5bea696c9622cd54..84703a1b03710cdf0c5fe10c2593ccd0f6034393 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.2.5.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.2.5.eb
@@ -20,7 +20,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.3.5.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.3.5.eb
index 2db2e8532677fee8a12e72fd49e4541825180391..fdf5247663c6e0b9487f5e7d8c241db10b60ee50 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.3.5.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-6.3.5.eb
@@ -20,7 +20,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.1.2.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.1.2.eb
index c9c675d48425bc1729e581c730a89ce19f78a154..fb685e3854d483b83fa0618906094c277a2c42df 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.1.2.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.3.5.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.3.5.eb
index 46eef59b197a2643bcfa3c8e4b06bb4703163b2e..68d21572c3b9708574812c6d7fb2a22754ae5b90 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.3.5.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-ictce-7.3.5.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014.06.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014.06.eb
index 583b41298f853b2d02f64efe757f7033b71c9f1a..76b828f76dbed57f98644e681b1a391606b528c9 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014.06.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014.06.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014b.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014b.eb
index 3e67c2044917732df64cd7683b7c69cb103687ce..9539bb724fe8e0b114b81f034d08f07d91a2a770 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014b.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2014b.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015a.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015a.eb
index 2c8752c40012c517201fbbcb8e10906ff544e252..051672a6f21aa29a259e1a63722f447f8ded70f5 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015a.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015a.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015b.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015b.eb
index de76493eec8f84523ea05be91cf16de0d76741fe..fa9c58b0b8ae76bfbc268a062bcfcd94cadbe90d 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015b.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2015b.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '5.9')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9c5b9b6279d8dac244134b18047c4f1e4fbd5a1c
--- /dev/null
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'libreadline'
+version = '6.3'
+
+homepage = 'http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html'
+description = """The GNU Readline library provides a set of functions for use by applications that
+ allow users to edit command lines as they are typed in. Both Emacs and vi editing modes are available.
+ The Readline library includes additional functions to maintain a list of previously-entered command lines,
+ to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'pic': True}
+
+sources = ['readline-%(version)s.tar.gz']
+source_urls = ['http://ftp.gnu.org/gnu/readline']
+
+dependencies = [('ncurses', '6.0')]
+
+# for the termcap symbols, use EB ncurses
+preconfigopts = "env LDFLAGS='-lncurses'"
+
+sanity_check_paths = {
+    'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
+    ['include/readline/%s' % x for x in ['chardefs.h', 'history.h', 'keymaps.h', 'readline.h', 'rlconf.h',
+                                         'rlstdc.h', 'rltypedefs.h', 'tilde.h']],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016a.eb b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016a.eb
index 0762f90f29f7d4705159aa0ac8590730bf7013da..5b1cb39b0acc7d2c163d517f9bd3b002516232d6 100644
--- a/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016a.eb
+++ b/easybuild/easyconfigs/l/libreadline/libreadline-6.3-intel-2016a.eb
@@ -18,7 +18,7 @@ source_urls = ['http://ftp.gnu.org/gnu/readline']
 dependencies = [('ncurses', '6.0')]
 
 # for the termcap symbols, use EB ncurses
-preconfigopts = "LDFLAGS='-lncurses'"
+preconfigopts = "env LDFLAGS='-lncurses'"
 
 sanity_check_paths = {
     'files': ['lib/libreadline.a', 'lib/libhistory.a'] +
diff --git a/easybuild/easyconfigs/l/libsodium/libsodium-1.0.6-intel-2016a.eb b/easybuild/easyconfigs/l/libsodium/libsodium-1.0.6-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8cd02bafe0871bc8ef3e8fb29827b8e4b653310f
--- /dev/null
+++ b/easybuild/easyconfigs/l/libsodium/libsodium-1.0.6-intel-2016a.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'libsodium'
+version = '1.0.6'
+
+homepage = 'http://doc.libsodium.org/'
+description = """Sodium is a modern, easy-to-use software library for encryption, decryption, signatures,
+ password hashing and more."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://download.libsodium.org/libsodium/releases/']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['include/sodium.h', 'lib/libsodium.so', 'lib/libsodium.a'],
+    'dirs': ['include/sodium', 'lib/pkgconfig'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libsodium/libsodium-1.0.8-foss-2016a.eb b/easybuild/easyconfigs/l/libsodium/libsodium-1.0.8-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ef8bb83cbf81737589c38ce4fe540833524df9b4
--- /dev/null
+++ b/easybuild/easyconfigs/l/libsodium/libsodium-1.0.8-foss-2016a.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'libsodium'
+version = '1.0.8'
+
+homepage = 'http://doc.libsodium.org/'
+description = """Sodium is a modern, easy-to-use software library for encryption, decryption, signatures,
+ password hashing and more."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://download.libsodium.org/libsodium/releases/']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['include/sodium.h', 'lib/libsodium.%s' % SHLIB_EXT, 'lib/libsodium.a'],
+    'dirs': ['include/sodium', 'lib/pkgconfig'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libspatialite/libspatialite-4.3.0a-foss-2015a.eb b/easybuild/easyconfigs/l/libspatialite/libspatialite-4.3.0a-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9c107ea9d929aa43d0f933b34aeb765f88416769
--- /dev/null
+++ b/easybuild/easyconfigs/l/libspatialite/libspatialite-4.3.0a-foss-2015a.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'libspatialite'
+version = '4.3.0a'
+
+homepage = "https://www.gaia-gis.it/fossil/libspatialite/home"
+description = """SpatiaLite is an open source library intended to extend the SQLite core to support
+ fully fledged Spatial SQL capabilities."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'usempi': False, 'pic': True}
+
+source_urls = ['http://www.gaia-gis.it/gaia-sins/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('FreeXL', '1.0.2'),
+    ('GEOS', '3.5.0', '-Python-2.7.11'),
+    ('SQLite', '3.10.0'),
+    ('PROJ', '4.9.1'),
+]
+
+builddependencies = [('CMake', '3.4.1')]
+
+configopts = '--disable-geosadvanced'
+
+sanity_check_paths = {
+    'files': ['include/spatialite.h', 'lib/libspatialite.a', 'lib/libspatialite.%s' % SHLIB_EXT],
+    'dirs': ['include/spatialite'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtasn1/libtasn1-4.7-foss-2016a.eb b/easybuild/easyconfigs/l/libtasn1/libtasn1-4.7-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0a37b2e3929fc0cb7e19b2517741394c5ea66be3
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtasn1/libtasn1-4.7-foss-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtasn1'
+version = '4.7'
+
+homepage = 'https://www.gnu.org/software/libtasn1/'
+description = """Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some other packages.
+ It was written by Fabio Fiorina, and has been shipped as part of GnuTLS
+ for some time but is now a proper GNU package."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['bin/asn1%s' % x for x in ['Coding', 'Decoding', 'Parser']] +
+             ['lib/libtasn1.%s' % x for x in ['a', SHLIB_EXT]],
+    'dirs': ['include'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libtool/libtool-2.4.6-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..857c0faabb3e2a5666bc4d8a64258ce4309a9d52
--- /dev/null
+++ b/easybuild/easyconfigs/l/libtool/libtool-2.4.6-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,17 @@
+easyblock = 'ConfigureMake'
+
+name = 'libtool'
+version = '2.4.6'
+
+homepage = 'http://www.gnu.org/software/libtool'
+description = """GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries
+ behind a consistent, portable interface."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+dependencies = [('M4', '1.4.17')]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-foss-2016a.eb b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..052063704a27337eaa7379021de783dd94b3eb79
--- /dev/null
+++ b/easybuild/easyconfigs/l/libunistring/libunistring-0.9.3-foss-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libunistring'
+version = '0.9.3'
+
+homepage = 'http://www.gnu.org/software/libunistring/'
+description = """This library provides functions for manipulating Unicode strings and for manipulating C strings
+ according to the Unicode standard."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+parallel = 1
+
+sanity_check_paths = {
+    'files' : ['lib/libunistring.a', 'lib/libunistring.%s' % SHLIB_EXT] +
+              ['include/uni%s.h' % x for x in ['case', 'conv', 'ctype', 'lbrk', 'name', 'norm',
+                                               'stdio', 'str', 'types', 'wbrk', 'width']],
+    'dirs' : ['include/unistring'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.2.1-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/l/libxc/libxc-2.2.1-CrayGNU-2015.06.eb
similarity index 94%
rename from easybuild/easyconfigs/l/libxc/libxc-2.2.1-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/l/libxc/libxc-2.2.1-CrayGNU-2015.06.eb
index 3ef89d660d2d5a6551a9e70c17adc39118ef5380..d9d2ff8c6b3e99c6d19cdb9a8fb77093735737b4 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.2.1-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.2.1-CrayGNU-2015.06.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.tddft.org/programs/octopus/wiki/index.php/Libxc'
 description = """Libxc is a library of exchange-correlation functionals for density-functional theory.
  The aim is to provide a portable, well tested and reliable set of exchange and correlation functionals."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'opt': True}
 
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.2.1-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/l/libxc/libxc-2.2.1-CrayGNU-2015.11.eb
similarity index 94%
rename from easybuild/easyconfigs/l/libxc/libxc-2.2.1-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/l/libxc/libxc-2.2.1-CrayGNU-2015.11.eb
index bfd88b3c4bccb65f094283d7fe96624aa6c7f4ae..254367cee7edc335d841ccf23272bf1a76b38851 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.2.1-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.2.1-CrayGNU-2015.11.eb
@@ -7,7 +7,7 @@ homepage = 'http://www.tddft.org/programs/octopus/wiki/index.php/Libxc'
 description = """Libxc is a library of exchange-correlation functionals for density-functional theory.
  The aim is to provide a portable, well tested and reliable set of exchange and correlation functionals."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'opt': True}
 
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/libxc/libxc-2.2.2-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/l/libxc/libxc-2.2.2-CrayGNU-2015.11.eb
similarity index 94%
rename from easybuild/easyconfigs/l/libxc/libxc-2.2.2-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/l/libxc/libxc-2.2.2-CrayGNU-2015.11.eb
index 99ad1db263cfcd419b28286ce93caee3724f66aa..ae74d150b04e7c568340754278cadc07372aee73 100644
--- a/easybuild/easyconfigs/l/libxc/libxc-2.2.2-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/l/libxc/libxc-2.2.2-CrayGNU-2015.11.eb
@@ -8,7 +8,7 @@ homepage = 'http://www.tddft.org/programs/octopus/wiki/index.php/Libxc'
 description = """Libxc is a library of exchange-correlation functionals for density-functional theory.
  The aim is to provide a portable, well tested and reliable set of exchange and correlation functionals."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'opt': True}
 
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-foss-2016a.eb b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fa27444b38602619c535a125c015a34a5f30e451
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxcb/libxcb-1.11.1-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxcb'
+version = '1.11.1'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint,
+latency hiding, direct access to the protocol, improved threading support, and extensibility."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+    ('pkg-config', '0.29'),
+    ('xcb-proto', '1.11', '', True),
+    ('xproto', '7.0.28'),
+    ('libpthread-stubs', '0.3'),
+]
+dependencies = [
+    ('libXau', '1.0.8'),
+    ('libXdmcp', '1.1.2'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb%s.a' % x for x in ['', '-composite', '-damage', '-dpms', '-dri2', '-glx',
+                                             '-randr', '-record', '-render', '-res', '-screensaver',
+                                             '-shape', '-shm', '-sync', '-xevie', '-xf86dri', '-xfixes',
+                                             '-xinerama', '-xprint', '-xtest', '-xv', '-xvmc']],
+    'dirs': ['include/xcb', 'lib/pkgconfig'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.6.1-foss-2016a.eb b/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.6.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5f450a09888a55b8da1306ac37a3d9bfffec94a6
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.6.1-foss-2016a.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxkbcommon'
+version = '0.6.1'
+
+homepage = 'http://xkbcommon.org/'
+description = """xkbcommon is a library to handle keyboard descriptions,
+ including loading them from disk, parsing them and handling their state.
+ It's mainly meant for client toolkits, window systems,
+ and other system applications."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://xkbcommon.org/download/']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('libxcb', '1.11.1'),
+    ('XKeyboardConfig', '2.17'),
+]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxkbcommon%s.so' % x for x in ['', '-x11']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.6.1-intel-2016a.eb b/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.6.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8611f0332bd3f25d136cb0b0941c0bccfb71e6be
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxkbcommon/libxkbcommon-0.6.1-intel-2016a.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxkbcommon'
+version = '0.6.1'
+
+homepage = 'http://xkbcommon.org/'
+description = """xkbcommon is a library to handle keyboard descriptions,
+ including loading them from disk, parsing them and handling their state.
+ It's mainly meant for client toolkits, window systems,
+ and other system applications."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://xkbcommon.org/download/']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('libxcb', '1.11.1'),
+    ('XKeyboardConfig', '2.17'),
+]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxkbcommon%s.so' % x for x in ['', '-x11']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-foss-2015b.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..03c075bd1ad120d75cf42b76c40171a8fbadd5f4
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-foss-2015b.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxml2'
+version = '2.9.1'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and 
+toolchain developed for the Gnome project
+ (but usable outside of the Gnome platform)."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
+
+dependencies = [('zlib', '1.2.8')]
+
+sanity_check_paths = {
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
+    'dirs': ['bin', 'include/libxml2/libxml'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10-Python-2.7.5.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10-Python-2.7.5.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ae7f22f7a4879db23c81cc74d16da7ac406148c4
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.1-goolf-1.4.10-Python-2.7.5.eb
@@ -0,0 +1,24 @@
+name = 'libxml2'
+version = '2.9.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
+ outside of the Gnome platform)."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.5'),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.16.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..54c5dad803dc36681877716fb5eed01f228cc478
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.2-goolf-1.5.16.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxml2'
+version = '2.9.2'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and 
+toolchain developed for the Gnome project
+ (but usable outside of the Gnome platform)."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
+
+dependencies = [('zlib', '1.2.8')]
+
+sanity_check_paths = {
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
+    'dirs': ['bin', 'include/libxml2/libxml'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ba6d0a4c3f26989449ef72ed359a4fb73933c8a8
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-GCC-4.9.3-2.25.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxml2'
+version = '2.9.3'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project
+ (but usable outside of the Gnome platform)."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
+
+dependencies = [('zlib', '1.2.8')]
+
+sanity_check_paths = {
+    'files': [('lib/libxml2.a', 'lib64/libxml2.a'), ('lib/libxml2.%s' % SHLIB_EXT, 'lib64/libxml2.%s' % SHLIB_EXT)],
+    'dirs': ['bin', 'include/libxml2/libxml'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..59e0331739e491981981c5cba731ee5ee494be69
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2015a.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxml2'
+version = '2.9.3'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
+ outside of the Gnome platform)."""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --without-python --with-zlib=$EBROOTZLIB'
+
+dependencies = [
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0df5cbd9574ae3f33a2dfe201fbf9d97571fbeb2
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxml2/libxml2-2.9.3-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,25 @@
+name = 'libxml2'
+version = '2.9.3'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxml2 is the XML C parser and toolchain developed for the Gnome project (but usable
+ outside of the Gnome platform)."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$CC" CXX="$CXX" --with-pic --with-zlib=$EBROOTZLIB'
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.11'),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-foss-2016a.eb b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6b593148b42230fc6428d4c30621d68aed43bade
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-foss-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxslt'
+version = '1.1.28'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxslt is the XSLT C library developed for the GNOME project
+ (but usable outside of the Gnome platform)."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('libxml2', '2.9.3'),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-intel-2016a.eb b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b3d064b443f0aebb54c7c9dc35b8ecd6142bcdb5
--- /dev/null
+++ b/easybuild/easyconfigs/l/libxslt/libxslt-1.1.28-intel-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'libxslt'
+version = '1.1.28'
+
+homepage = 'http://xmlsoft.org/'
+description = """Libxslt is the XSLT C library developed for the GNOME project
+ (but usable outside of the Gnome platform)."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [
+    'http://xmlsoft.org/sources/',
+    'http://xmlsoft.org/sources/old/'
+]
+
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('libxml2', '2.9.3'),
+]
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.06.eb
similarity index 84%
rename from easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.06.eb
index 68ee7aa23b8022ae263d903304f4dfe632fd4dec..8398e40d0665ca4cb92593c45b2d9755f0ab75a4 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.06.eb
@@ -8,12 +8,12 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
   although it has some extensions (for example, handling more than 9 positional parameters to macros).
  GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.11.eb
similarity index 84%
rename from easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.11.eb
index fd7cafa798b0b63429f10cb06e6623ec2c0599d3..b84761b60206ddb7270a05110e8911573dff7510 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-CrayGNU-2015.11.eb
@@ -8,12 +8,12 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
   although it has some extensions (for example, handling more than 9 positional parameters to macros).
  GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.7.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.7.2.eb
index b62284872a3046da08afe97e8232ba453bc4cbc0..b4bb4c955de91f15c5df15b89d700e7f478985b8 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.7.2.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'GCC', 'version': '4.7.2'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb
index c2e9e524263cf8b1ad1c47ff8bf3122339382036..5df1dda5a3a107ec921112511cac14152963ffbc 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.2.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.2'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.4.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.4.eb
index 90c7eb901795056f3886b41b97c523aebb22d6c9..f406268a87d92714529bd138dc1bc61b06b4e56e 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.4.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.8.4.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'GCC', 'version': '4.8.4'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2-binutils-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2-binutils-2.25.eb
index a79d153988e395f5ecf8028734d4ae26f9a94afe..560606e07ad3dd4ea3ca3539d3d9ad54d2b81db4 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2-binutils-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2-binutils-2.25.eb
@@ -16,7 +16,7 @@ source_urls = [GNU_SOURCE]
 # use same binutils version that was used when building GCC toolchain
 builddependencies = [('binutils', '2.25', '', True)]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2.eb
index 372d1c346d6ba6bfc2c7f0d3024dbb9dad988c21..00b1eb05a83cdc8d243782bd6c3d2a161cfce06a 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.2.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'GCC', 'version': '4.9.2'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-2.25.eb
index 0fa72c61c98b4f6fb3b8fed618866eeed23b0c70..a939e01023030f76edf9fecb7f56645dec2f7402 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-2.25.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-binutils-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-binutils-2.25.eb
index 89984f9bafa395c2faeedb88f29ee71e079670c0..64c98aad337a5a17e87cac3f43c2d6d53179804d 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-binutils-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3-binutils-2.25.eb
@@ -16,7 +16,7 @@ source_urls = [GNU_SOURCE]
 # use same binutils version that was used when building GCC toolchain
 builddependencies = [('binutils', '2.25', '', True)]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3.eb
index 52fc84e052cf9619db2407ef2e4b9dee38e6c6db..745063ebad907909453d1dbb099e4b281055023e 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-4.9.3.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'GCC', 'version': '4.9.3'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-5.1.0-binutils-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-5.1.0-binutils-2.25.eb
index e856a3fd434a4481589f2c44fdc0d2860aaf8433..a95ac9f601f6972c311353e9c0e715fd747174cb 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-5.1.0-binutils-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCC-5.1.0-binutils-2.25.eb
@@ -16,7 +16,7 @@ source_urls = [GNU_SOURCE]
 # use same binutils version that was used when building GCC toolchain
 builddependencies = [('binutils', '2.25', '', True)]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5551b81d856ade255716f92fadf4c88d12171249
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.2.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'M4'
+version = '1.4.17'
+
+homepage = 'http://www.gnu.org/software/m4/m4.html'
+description = """GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible
+  although it has some extensions (for example, handling more than 9 positional parameters to macros).
+ GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.2'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.25', '', True)]
+
+configopts = "--enable-cxx CPPFLAGS='-fgnu89-inline'"
+
+sanity_check_paths = {
+    'files': ["bin/m4"],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.3.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.3.eb
index c1c8a529489457a26d7f9aa9f43edb6ce2edf59e..02f06d5cfecef51fae9e7c29c4c0af3ff45ad090 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.3.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-4.9.3.eb
@@ -16,7 +16,7 @@ source_urls = [GNU_SOURCE]
 # use same binutils version that was used when building GCC toolchain
 builddependencies = [('binutils', '2.25', '', True)]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS='-fgnu89-inline'"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-5.3.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..434b6f02ff3f4b9dad73a58e0c12d4f92a307b03
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GCCcore-5.3.0.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'M4'
+version = '1.4.17'
+
+homepage = 'http://www.gnu.org/software/m4/m4.html'
+description = """GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible
+  although it has some extensions (for example, handling more than 9 positional parameters to macros).
+ GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."""
+
+toolchain = {'name': 'GCCcore', 'version': '5.3.0'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.26', '', True)]
+
+configopts = "--enable-cxx"
+
+sanity_check_paths = {
+    'files': ["bin/m4"],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.2-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.2-2.25.eb
index e2764250bf50989e531d962b75283e395d30600f..134d181212255831296c9a1adb305b9e41f99628 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.2-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.2-2.25.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'GNU', 'version': '4.9.2-2.25'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.3-2.25.eb
index ad83091b2bf417349aeb8cbf74bc223951fd67fd..25f9aacaceb2cbc08c6c99d7f4f2fab8032a3278 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.3-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-4.9.3-2.25.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-5.1.0-2.25.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-5.1.0-2.25.eb
index e83b261924d4a2783a0f5e6aa1151bd2864ee363..5ca90d16a7bee62a427909a9a79c3c4933481ce4 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-5.1.0-2.25.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-GNU-5.1.0-2.25.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'GNU', 'version': '5.1.0-2.25'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2014b.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2014b.eb
index 94ec58056bd19a15fe6fe924516739ca49f4cb6e..4abe05a74fd0d16c61ffb7ba6dd6672c936745aa 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2014b.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2014b.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'foss', 'version': '2014b'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015a.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015a.eb
index 411820a76bb3e8fef73e6da7d5917889be8273ee..f58173164e6ea7ee31df0b14fd8d96326a31d73a 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015a.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015a.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'foss', 'version': '2015a'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015b.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015b.eb
index b66775c7a65ed48fb4d386435270650e7355355a..6a7048dcf1a81e7ed9e3195bdc1bc4e74b11b506 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015b.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2015b.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'foss', 'version': '2015b'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016a.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016a.eb
index 0d030e3264daafe90d23c28443ae3d9bf0ec2a2b..ce563e7def08932c4809c482a06c4c3c99f3ddaa 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016a.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-foss-2016a.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'foss', 'version': '2016a'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS='-fgnu89-inline'"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-gimkl-2.11.5.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-gimkl-2.11.5.eb
index 42808d7b77877d0028d644a87f5bfb67f6609168..aa806c1087065210003cfcabf47d2bbb61b64de5 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-gimkl-2.11.5.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.4.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.4.0.eb
index 3b4187acd1295cd2cee41412784368927dbb1cc2..304b160de546e23ba7198d1f926052cce3edb377 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.4.0.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.4.0.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'ictce', 'version': '5.4.0'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb
index e8d95f1f54580e10eab238b13fea40fe38ba2828..46c1b375cb08699f4194031bbfb38da5fa5cd760 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-5.5.0.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'ictce', 'version': '5.5.0'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-7.1.2.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-7.1.2.eb
index 68b3d851f696c48726bad1c53ab6fd40c7d07cea..0289e6c40e65fe26562286578cc747158621bf4c 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-ictce-7.1.2.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'ictce', 'version': '7.1.2'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2014b.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2014b.eb
index d6a8a6e705f5ef75ad38737c691e658c401b43ee..857e1b9ffca6ede724bcf7a8a8948c18fcd55f9d 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2014b.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2014b.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'intel', 'version': '2014b'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015a.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015a.eb
index f842bdc90ab31d328074da745a9f0b6503455219..a805266216045a722e5ca7f7d064c3e65cc97863 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015a.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015a.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'intel', 'version': '2015a'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015b.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015b.eb
index 292da57c7e93ecf3914f8ace0f702ef7ef7f3426..6746b4b3a40b5725a49d1bb400af40a19392e934 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015b.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2015b.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..899804b18fe298245f2dca804f36be571f10c59b
--- /dev/null
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'M4'
+version = '1.4.17'
+
+homepage = 'http://www.gnu.org/software/m4/m4.html'
+description = """GNU M4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 compatible
+  although it has some extensions (for example, handling more than 9 positional parameters to macros).
+ GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [GNU_SOURCE]
+
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
+
+sanity_check_paths = {
+    'files': ["bin/m4"],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016a.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016a.eb
index 519be6b6b35287fd2d2c870271b33bcaa569412e..4472772492e50783de3c1929f5c2c6f003611f06 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016a.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-2016a.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-para-2014.12.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-para-2014.12.eb
index 37a6837b2bc890908c3f4911dc0cd1414a61f0c2..104ad6a3bde2127f348767ec3b8b17b37dbb88fa 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-para-2014.12.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17-intel-para-2014.12.eb
@@ -13,7 +13,7 @@ toolchain = {'name': 'intel-para', 'version': '2014.12'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/M4/M4-1.4.17.eb b/easybuild/easyconfigs/m/M4/M4-1.4.17.eb
index 3f396ce26b1f9699142abde0d13df234d7552e9a..2bc8d9c022922f54733c35a70f59eb90fd7c9537 100644
--- a/easybuild/easyconfigs/m/M4/M4-1.4.17.eb
+++ b/easybuild/easyconfigs/m/M4/M4-1.4.17.eb
@@ -15,7 +15,7 @@ toolchain = {'name': 'dummy', 'version': 'dummy'}
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [GNU_SOURCE]
 
-configopts = "--enable-cxx"
+configopts = "--enable-cxx CPPFLAGS=-fgnu89-inline"
 
 sanity_check_paths = {
     'files': ["bin/m4"],
diff --git a/easybuild/easyconfigs/m/MDSplus/MDSplus-7.0.67-foss-2016a-Java-1.7.0_79-Python-2.7.11.eb b/easybuild/easyconfigs/m/MDSplus/MDSplus-7.0.67-foss-2016a-Java-1.7.0_79-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..111f00bfda2bb536a7698d334934f1139f0e62a1
--- /dev/null
+++ b/easybuild/easyconfigs/m/MDSplus/MDSplus-7.0.67-foss-2016a-Java-1.7.0_79-Python-2.7.11.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'MDSplus'
+version = '7.0.67'
+versionsuffix = '-Java-%(javaver)s-Python-%(pyver)s'
+
+homepage = 'http://mdsplus.org/'
+description = """MDSplus is a set of software tools for data acquisition and storage and a
+ methodology for management of complex scientific data."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/%(name)s/%(namelower)s/archive']
+sources = ['stable_release-%s.zip' % version.replace('.','-')]
+
+dependencies = [
+    ('Java', '1.7.0_79', '', True),
+    ('Python', '2.7.11'),
+    ('HDF5', '1.8.16'),
+    ('libxml2', '2.9.3', '-Python-%(pyver)s'),
+    ('zlib', '1.2.8')
+]
+
+configopts = '--with-jdk=$JAVA_HOME'
+
+preconfigopts = 'export CFLAGS="$CFLAGS -I$EBROOTLIBXML2/include/libxml2 " && '
+
+parallel = 1
+
+modextravars = {
+    'MDSPLUS_DIR': '%(installdir)s',
+    'MDS_PATH': '%(installdir)s/tdi',
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/m/MDSplus/MDSplus-7.0.67-goolf-1.5.16-Java-1.7.0_79-Python-2.7.9.eb b/easybuild/easyconfigs/m/MDSplus/MDSplus-7.0.67-goolf-1.5.16-Java-1.7.0_79-Python-2.7.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..25d836f8e532a1dac488f9d0b177f214576e948d
--- /dev/null
+++ b/easybuild/easyconfigs/m/MDSplus/MDSplus-7.0.67-goolf-1.5.16-Java-1.7.0_79-Python-2.7.9.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'MDSplus'
+version = '7.0.67'
+versionsuffix = '-Java-%(javaver)s-Python-%(pyver)s'
+
+homepage = 'http://mdsplus.org/'
+description = """MDSplus is a set of software tools for data acquisition and storage and a methodology
+ for management of complex scientific data."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+
+source_urls = ['https://github.com/%(name)s/%(namelower)s/archive']
+sources = ['stable_release-%s.zip' % version.replace('.','-')]
+
+dependencies = [
+    ('Java', '1.7.0_79', '', True),
+    ('Python', '2.7.9'),
+    ('HDF5', '1.8.9'),
+    ('libxml2', '2.9.2'),
+    ('zlib', '1.2.8')
+]
+
+configopts = '--with-jdk=$JAVA_HOME'
+
+preconfigopts = 'export CFLAGS="$CFLAGS -I$EBROOTLIBXML2/include/libxml2 " && '
+
+parallel = 1
+
+modextravars = {
+    'MDSPLUS_DIR': '%(installdir)s',
+    'MDS_PATH': '%(installdir)s/tdi',
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2016a-32bitIDX.eb b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2016a-32bitIDX.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a9aa0626e9309a58ac687a19702e46288556a343
--- /dev/null
+++ b/easybuild/easyconfigs/m/METIS/METIS-5.1.0-intel-2016a-32bitIDX.eb
@@ -0,0 +1,24 @@
+name = 'METIS'
+version = '5.1.0'
+# default 32-bit IDTYPEWIDTH, no patch used
+versionsuffix = '-32bitIDX'
+
+homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/metis/overview'
+description = """METIS is a set of serial programs for partitioning graphs, partitioning finite element meshes,
+and producing fill reducing orderings for sparse matrices. The algorithms implemented in METIS are based on the
+multilevel recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD',
+]
+
+builddependencies = [('CMake', '3.5.2')]
+
+configopts = ['', 'shared=1']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/MPFR/MPFR-3.1.4-foss-2016a.eb b/easybuild/easyconfigs/m/MPFR/MPFR-3.1.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fe347368b1440fa0cd71a7f99134a86e539fb4f9
--- /dev/null
+++ b/easybuild/easyconfigs/m/MPFR/MPFR-3.1.4-foss-2016a.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'MPFR'
+version = '3.1.4'
+
+homepage = 'http://www.mpfr.org'
+description = """The MPFR library is a C library for multiple-precision 
+ floating-point computations with correct rounding."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://www.mpfr.org/mpfr-%(version)s/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+patches = ['MPFR_ictce_remove-deprecated-mp.patch']
+
+dependencies = [('GMP', '6.1.0')]
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libmpfr.%s' % SHLIB_EXT, 'include/mpfr.h'],
+    'dirs': []
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/MPFR/MPFR-3.1.4-intel-2016a.eb b/easybuild/easyconfigs/m/MPFR/MPFR-3.1.4-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6101f2969d4a2b97ab504a476373cdadca35ecfe
--- /dev/null
+++ b/easybuild/easyconfigs/m/MPFR/MPFR-3.1.4-intel-2016a.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'MPFR'
+version = '3.1.4'
+
+homepage = 'http://www.mpfr.org'
+description = """The MPFR library is a C library for multiple-precision 
+ floating-point computations with correct rounding."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://www.mpfr.org/mpfr-%(version)s/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+patches = ['MPFR_ictce_remove-deprecated-mp.patch']
+
+dependencies = [('GMP', '6.1.0')]
+
+runtest = 'check'
+
+sanity_check_paths = {
+    'files': ['lib/libmpfr.%s' % SHLIB_EXT, 'include/mpfr.h'],
+    'dirs': []
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb
index ecc1ac48366107246160b4e4ea55b90b379bb9ca..e96f02635c0fad1f00702cc220e8c9d4d5ac0f5f 100644
--- a/easybuild/easyconfigs/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb
+++ b/easybuild/easyconfigs/m/MPICH/MPICH-3.0.3-ClangGCC-1.1.3.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'MPICH'
 version = '3.0.3'
 
@@ -10,19 +8,9 @@ It does not support InfiniBand (use MVAPICH2 with InfiniBand devices)."""
 toolchain = {'name': 'ClangGCC', 'version': '1.1.3'}
 
 sources = [SOURCELOWER_TAR_GZ]
-source_urls = ['http://www.mpich.org/static/tarballs/%s' % version]
-
-# MPICH configure wants F90/F90FLAGS to be renamed to FC/FCFLAGS.
-preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset F90FLAGS; '
-
-# Build shared libraries
-configopts = '--enable-shared'
+source_urls = ['http://www.mpich.org/static/tarballs/%(version)s']
 
-sanity_check_paths = {
-    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
-              'bin/mpiexec', 'bin/mpirun',
-              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h'],
-    'dirs': [],
-}
+# Let's store the checksum in order to be sure it doesn't suddenly change
+checksums = ['ee2b8a8b88e3915804df0efcc747c48b']
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MPICH/MPICH-3.0.4-GCC-4.8.1.eb b/easybuild/easyconfigs/m/MPICH/MPICH-3.0.4-GCC-4.8.1.eb
index f81230a16b43a7d071a58fac0cb37ae55a563fdb..cf4928e5640f64f2b3eddcbd308edb15bc672175 100644
--- a/easybuild/easyconfigs/m/MPICH/MPICH-3.0.4-GCC-4.8.1.eb
+++ b/easybuild/easyconfigs/m/MPICH/MPICH-3.0.4-GCC-4.8.1.eb
@@ -1,5 +1,3 @@
-easyblock = 'ConfigureMake'
-
 name = 'MPICH'
 version = '3.0.4'
 
@@ -9,21 +7,10 @@ It does not support InfiniBand (use MVAPICH2 with InfiniBand devices)."""
 
 toolchain = {'name': 'GCC', 'version': '4.8.1'}
 
-sources = ['mpich-%(version)s.tar.gz']
+sources = [SOURCELOWER_TAR_GZ]
 source_urls = ['http://www.mpich.org/static/tarballs/%(version)s']
 
-# MPICH configure wants F90/F90FLAGS to be renamed to FC/FCFLAGS.
-preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset F90FLAGS; '
-
-# Build shared libraries
-configopts = '--enable-shared'
-
-sanity_check_paths = {
-    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90', 'bin/mpiexec', 'bin/mpirun',
-              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h', 'lib/libfmpich.a', 'lib/libfmpich.%s' % SHLIB_EXT,
-              'lib/libmpich.a', 'lib/libmpich.%s' % SHLIB_EXT, 'lib/libmpichcxx.a', 'lib/libmpichcxx.%s' % SHLIB_EXT, 'lib/libmpichf90.a',
-              'lib/libmpichf90.%s' % SHLIB_EXT],
-    'dirs': [],
-}
+# Let's store the checksum in order to be sure it doesn't suddenly change
+checksums = ['9c5d5d4fe1e17dd12153f40bc5b6dbc0']
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MPICH/MPICH-3.2-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/m/MPICH/MPICH-3.2-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..06251f71e8e042cd47c7ff69ff314dcb168ce242
--- /dev/null
+++ b/easybuild/easyconfigs/m/MPICH/MPICH-3.2-GCC-4.9.3-2.25.eb
@@ -0,0 +1,16 @@
+name = 'MPICH'
+version = '3.2'
+
+homepage = 'http://www.mpich.org/'
+description = """MPICH v3.x is an open source high-performance MPI 3.0 implementation.
+It does not support InfiniBand (use MVAPICH2 with InfiniBand devices)."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.mpich.org/static/tarballs/%(version)s']
+
+# Let's store the checksum in order to be sure it doesn't suddenly change
+checksums = ['f414cfa77099cd1fa1a5ae4e22db508a']
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MRIcron/MRIcron-20150601.eb b/easybuild/easyconfigs/m/MRIcron/MRIcron-20150601.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9830a06815e154406bd90ac3dfe295383ef4b698
--- /dev/null
+++ b/easybuild/easyconfigs/m/MRIcron/MRIcron-20150601.eb
@@ -0,0 +1,31 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Ravi Tripathi
+# Email: ravi89@uab.edu
+
+easyblock = "PackedBinary"
+
+name = 'MRIcron'
+version = '20150601'
+
+homepage = 'http://www.mccauslandcenter.sc.edu/mricro/mricron/'
+description = """ MRIcron allows viewing of medical images. It 
+includes tools to complement SPM and FSL. Native format is NIFTI 
+but includes a conversion program (see dcm2nii) for converting DICOM images. 
+Features layers, ROIs, and volume rendering.  """
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+# Automatic Download doesn't work for this software as you need to accept their license, 
+# so you can download it manually at https://www.nitrc.org/frs/download.php/7765/ 
+# and place it in a folder where Easybuild can see it. 
+# Also rename the zip file to lx-20150601.zip
+sources = ['lx-%(version)s.zip']
+
+checksums = ['a2d8b1c053384220953f6b670d0fd4df']
+
+sanity_check_paths = {
+    'files': ["dcm2nii", "dcm2niigui", "mricron", "npm"],
+    'dirs': ["example", "lut", "templates"]
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-foss-2016a.eb b/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..026425a12b6a3eb6053ac9c903dda035676f0093
--- /dev/null
+++ b/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-foss-2016a.eb
@@ -0,0 +1,33 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = 'MakeCp'
+
+name = 'MUSCLE'
+version = '3.8.31'
+
+homepage = 'http://drive5.com/muscle/'
+description = """ MUSCLE is one of the best-performing multiple alignment programs 
+ according to published benchmark tests, with accuracy and speed that are consistently 
+ better than CLUSTALW. MUSCLE can align hundreds of sequences in seconds. Most users 
+ learn everything they need to know about MUSCLE in a few minutes—only a handful of 
+ command-line options are needed to perform common alignment tasks."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = ['%(namelower)s%(version)s_src.tar.gz']
+source_urls = ['http://www.drive5.com/muscle/downloads%(version)s/']
+
+patches = ['MUSCLE-%(version)s_fix-mk-hardcoding.patch']
+
+files_to_copy = [
+    (["muscle"], 'bin')]
+
+sanity_check_paths = {
+    'files': ["bin/muscle"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-intel-2016a.eb b/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..467b83b6ce987dfcf90d0e1a627c06836ace24ef
--- /dev/null
+++ b/easybuild/easyconfigs/m/MUSCLE/MUSCLE-3.8.31-intel-2016a.eb
@@ -0,0 +1,33 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+
+easyblock = 'MakeCp'
+
+name = 'MUSCLE'
+version = '3.8.31'
+
+homepage = 'http://drive5.com/muscle/'
+description = """ MUSCLE is one of the best-performing multiple alignment programs 
+ according to published benchmark tests, with accuracy and speed that are consistently 
+ better than CLUSTALW. MUSCLE can align hundreds of sequences in seconds. Most users 
+ learn everything they need to know about MUSCLE in a few minutes—only a handful of 
+ command-line options are needed to perform common alignment tasks."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = ['%(namelower)s%(version)s_src.tar.gz']
+source_urls = ['http://www.drive5.com/muscle/downloads%(version)s/']
+
+patches = ['MUSCLE-%(version)s_fix-mk-hardcoding.patch']
+
+files_to_copy = [
+    (["muscle"], 'bin')]
+
+sanity_check_paths = {
+    'files': ["bin/muscle"],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb
index cee59253ac7eefe660a0861079b66e471fee491f..0d8dbcbf471d1aca8176c9ccecd6b8a4e5df78e0 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3-hwloc-chkpt.eb
@@ -12,20 +12,25 @@ sources = [SOURCELOWER_TGZ]
 # note: this URL will only work for the most recent version (previous versions no longer available?)
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2']
 
-rdma_type = "gen2"  # 'gen2' or 'udapl'
+checksums = ['b05c3cde3d181b2499500b4bd8962e3f']
+
+dependencies = [
+    ('hwloc', '1.5.1'),
+    ('attr', '2.4.47'),
+]
+
+builddependencies = [('Bison', '2.5')]
+
+osdependencies = [('libcr-dev', 'blcr-devel'),]
 
 # enable building of MPE routines
 withmpe = True
 
 # enable hwloc support
 withhwloc = True
-dependencies = [('hwloc', '1.5.1')]
 
 # enable checkpointing support
 withchkpt = True
-osdependencies = ['blcr-libs', 'blcr-devel']
-
-builddependencies = [('Bison', '2.5')]
 
 # parallel build tends to fail
 parallel = 1
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb
index 22a7f9f02ed34f620d4e9fb53d1c5c8ebdda4d20..8f93aad7e1f2660463d669e9099bc7a1f82d78de 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.7-GCC-4.6.3.eb
@@ -11,9 +11,9 @@ sources = [SOURCELOWER_TGZ]
 # note: this URL will only work for the most recent version (previous versions no longer available?)
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2']
 
-builddependencies = [('Bison', '2.5')]
+checksums = ['b05c3cde3d181b2499500b4bd8962e3f']
 
-rdma_type = "gen2"  # 'gen2' or 'udapl'
+builddependencies = [('Bison', '2.5')]
 
 # enable building of MPE routines
 withmpe = True
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb
index 9be4dedbf32c49944fd9681092a81d235bb0fc19..f289c8d654349e1e7fdd48677db0f167bbf830e8 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.8.1-GCC-4.7.2.eb
@@ -9,6 +9,8 @@ toolchain = {'name': 'GCC', 'version': '4.7.2'}
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
 sources = [SOURCELOWER_TGZ]
 
+checksums = ['ef4ae05e3b5ad485326505db7381246c']
+
 builddependencies = [('Bison', '2.7')]
 
 # parallel build doesn't work
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb
index 6d98d3a0320ac9ff07dec1b382eddd0fcbd67d84..09e03929130c43167cc9eee6b7f7562956d24048 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.1.3.eb
@@ -9,6 +9,8 @@ toolchain = {'name': 'ClangGCC', 'version': '1.1.3'}
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
 sources = [SOURCELOWER_TGZ]
 
+checksums = ['5dc58ed08fd3142c260b70fe297e127c']
+
 dependencies = [('Bison', '2.7')]
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb
index e1fdfb364f7904909bff6f0a79e2d0ce717a4c96..8c81cfba65b0f63b282c7a84e216a4ef1122ab0b 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-ClangGCC-1.2.3.eb
@@ -9,6 +9,8 @@ toolchain = {'name': 'ClangGCC', 'version': '1.2.3'}
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
 sources = [SOURCELOWER_TGZ]
 
+checksums = ['5dc58ed08fd3142c260b70fe297e127c']
+
 dependencies = [('Bison', '2.7')]
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb
index 602d1c4c8094e330d74fb85bd3369ab7cceb4e3b..87eee23607c70ca7f66a33893d551edfea6f4cb3 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-GCC-4.7.3.eb
@@ -9,6 +9,8 @@ toolchain = {'name': 'GCC', 'version': '4.7.3'}
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
 sources = [SOURCELOWER_TGZ]
 
+checksums = ['5dc58ed08fd3142c260b70fe297e127c']
+
 builddependencies = [('Bison', '2.7')]
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb
index f87ce5fafe3fff232cf81a7131b1e39b43fd3981..b08de1e59f3205d64c9abb002cebe730b7fbb3b2 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9-iccifort-2011.13.367.eb
@@ -10,9 +10,11 @@ toolchainopts = {'optarch': True, 'pic': True}
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
 sources = [SOURCELOWER_TGZ]
 
+checksums = ['5dc58ed08fd3142c260b70fe297e127c']
+
 builddependencies = [('Bison', '2.7')]
 
 # the hydra launcher start's before LD_LIBRARY_PATH is forwarded, so we provide this hint on where to find some libs
-preconfigopts = 'LDFLAGS="-Wl,-rpath,$EBROOTICC/compiler/lib/intel64 $LDFLAGS"'
+preconfigopts = 'env LDFLAGS="-Wl,-rpath,$EBROOTICC/compiler/lib/intel64 $LDFLAGS"'
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb
index 86fdc73adc25bb54034aa24a83cad1f306f82e42..372dd0b722aa1dbf4ec79704e427a2c66063badf 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9a2-GCC-4.7.2.eb
@@ -9,6 +9,8 @@ toolchain = {'name': 'GCC', 'version': '4.7.2'}
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
 sources = [SOURCELOWER_TGZ]
 
+checksums = ['9d517d6fe483ad339ea01fa234f0c4c9']
+
 builddependencies = [('Bison', '2.7')]
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb
index 1c45f04807b554a134216dc7595e6abc677cc1ad..657cf1ea1611d506a9a90251c24d8a874bdc6313 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9b-GCC-4.7.2.eb
@@ -9,6 +9,8 @@ toolchain = {'name': 'GCC', 'version': '4.7.2'}
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
 sources = [SOURCELOWER_TGZ]
 
+checksums = ['dfc86a014666776c8a76bb8e78356c8b']
+
 builddependencies = [('Bison', '2.7')]
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb
index 892dac4687124b372e01b2e2f715b26007252e10..efbb18826b1fcfc654dda0e0055699c040beeb93 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-ClangGCC-1.1.3.eb
@@ -9,6 +9,8 @@ toolchain = {'name': 'ClangGCC', 'version': '1.1.3'}
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
 sources = [SOURCELOWER_TGZ]
 
+checksums = ['0a236f526e368e12a1b3de90716a12d7']
+
 builddependencies = [('Bison', '2.7')]
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb
index 9e7d8d7641931027d54de338bc178528b87fffe5..46ea0c6676739d23dcabe4b11ca182e6efc60f40 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-1.9rc1-GCC-4.7.3.eb
@@ -9,6 +9,8 @@ toolchain = {'name': 'GCC', 'version': '4.7.3'}
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich2/']
 sources = [SOURCELOWER_TGZ]
 
+checksums = ['0a236f526e368e12a1b3de90716a12d7']
+
 builddependencies = [('Bison', '2.7')]
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-2.0.1-GCC-4.8.4.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-2.0.1-GCC-4.8.4.eb
index bf2762a1a17896b6fec477959392846f65d093a1..b07b0a30f41925fa3e211add03f8c7060a09794b 100644
--- a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-2.0.1-GCC-4.8.4.eb
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-2.0.1-GCC-4.8.4.eb
@@ -9,7 +9,6 @@ toolchain = {'name': 'GCC', 'version': '4.8.4'}
 source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/']
 sources = [SOURCELOWER_TAR_GZ]
 
-# Let's store the checksum in order to be sure it doesn't suddenly change
 checksums = ['77bba29442f81e196155e87869cdceda']
 
 builddependencies = [('Bison', '2.7')]
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-2.1-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-2.1-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..13f9a5a43d1d18aefce77f7349f70445c422f793
--- /dev/null
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-2.1-GCC-4.9.3-2.25.eb
@@ -0,0 +1,17 @@
+name = 'MVAPICH2'
+version = '2.1'
+
+homepage = 'http://mvapich.cse.ohio-state.edu/overview/mvapich2/'
+description = "This is an MPI 3.0 implementation.  It is based on MPICH2 and MVICH."
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/']
+sources = [SOURCELOWER_TAR_GZ]
+
+# Let's store the checksum in order to be sure it doesn't suddenly change
+checksums = ['0095ceecb19bbb7fb262131cb9c2cdd6']
+
+builddependencies = [('Bison', '3.0.4')]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-2.2b-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-2.2b-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7f35d9ebdf6b0dbccb1e80bcbbc0991f7d714729
--- /dev/null
+++ b/easybuild/easyconfigs/m/MVAPICH2/MVAPICH2-2.2b-GCC-4.9.3-2.25.eb
@@ -0,0 +1,17 @@
+name = 'MVAPICH2'
+version = '2.2b'
+
+homepage = 'http://mvapich.cse.ohio-state.edu/overview/mvapich2/'
+description = "This is an MPI 3.0 implementation.  It is based on MPICH2 and MVICH."
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/']
+sources = [SOURCELOWER_TAR_GZ]
+
+# Let's store the checksum in order to be sure it doesn't suddenly change
+checksums = ['5651e8b7a72d7c77ca68da48f3a5d108']
+
+builddependencies = [('Bison', '3.0.4')]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/m/MariaDB/MariaDB-10.1.13-intel-2016a.eb b/easybuild/easyconfigs/m/MariaDB/MariaDB-10.1.13-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ae90e1a3edf9664fc1f1c343bec1e1d96ea1e74e
--- /dev/null
+++ b/easybuild/easyconfigs/m/MariaDB/MariaDB-10.1.13-intel-2016a.eb
@@ -0,0 +1,40 @@
+easyblock = 'CMakeMake'
+
+name = 'MariaDB'
+version = '10.1.13'
+
+homepage = 'https://mariadb.org/'
+description = """MariaDB An enhanced, drop-in replacement for MySQL."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://downloads.mariadb.org/f/mariadb-%(version)s/source']
+sources = [SOURCELOWER_TAR_GZ]
+
+patches = [
+    'MariaDB-%(version)s-remove-Werror.patch',
+    'MariaDB-%(version)s-link-rt-for-jemalloc.patch',
+]
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('ncurses', '6.0'),
+    ('jemalloc', '4.1.0'),
+    ('PCRE', '8.38'),
+    ('XZ', '5.2.2'),
+    ('Boost', '1.60.0', '-Python-2.7.11'),
+    ('libxml2', '2.9.3'),
+]
+
+builddependencies = [('CMake', '3.4.3')]
+
+separate_build_dir = True
+
+configopts = "-DWITH_PCRE=system -DWITH_JEMALLOC=yes -DWITH_ZLIB=system -DMYSQL_MAINTAINER_MODE=ON"
+
+sanity_check_paths = {
+    'files': ['bin/mysql', 'bin/mysqld_safe', 'lib/libmysqlclient.%s' % SHLIB_EXT, 'scripts/mysql_install_db'],
+    'dirs': ['include', 'share'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/m/MariaDB/MariaDB-10.1.13-link-rt-for-jemalloc.patch b/easybuild/easyconfigs/m/MariaDB/MariaDB-10.1.13-link-rt-for-jemalloc.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c0a2cfee1825ccfe2376c7f3b9e40b4c346fab7d
--- /dev/null
+++ b/easybuild/easyconfigs/m/MariaDB/MariaDB-10.1.13-link-rt-for-jemalloc.patch
@@ -0,0 +1,14 @@
+# On older systems (like RHEL 6), jemalloc must also link to -lrt for getclock
+# On RHEL 7 and greater, this is not  needed as it's part of libc there.
+# Ward Poelmans <ward.poelmans@ugent.be>
+diff -ur mariadb-10.1.13.orig/cmake/jemalloc.cmake mariadb-10.1.13/cmake/jemalloc.cmake
+--- mariadb-10.1.13.orig/cmake/jemalloc.cmake	2016-03-24 10:12:10.000000000 +0100
++++ mariadb-10.1.13/cmake/jemalloc.cmake	2016-04-20 16:21:18.102681504 +0200
+@@ -21,6 +21,7 @@
+       SET(what bundled)
+     ELSE()
+       SET(libname jemalloc c)
++      SET(CMAKE_REQUIRED_LIBRARIES rt)
+       SET(what system)
+     ENDIF()
+ 
diff --git a/easybuild/easyconfigs/m/MariaDB/MariaDB-10.1.13-remove-Werror.patch b/easybuild/easyconfigs/m/MariaDB/MariaDB-10.1.13-remove-Werror.patch
new file mode 100644
index 0000000000000000000000000000000000000000..eb1812a0ff9a0dd4fe69db7f2ee462e5dc774cdd
--- /dev/null
+++ b/easybuild/easyconfigs/m/MariaDB/MariaDB-10.1.13-remove-Werror.patch
@@ -0,0 +1,16 @@
+# This -Werror will cause the build to fail because of a warning about using the intel compiler
+# Ward Poelmans <ward.poelmans@ugent.be>
+diff -ur mariadb-10.1.13.orig/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake mariadb-10.1.13/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake
+--- mariadb-10.1.13.orig/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake	2016-03-24 10:12:12.000000000 +0100
++++ mariadb-10.1.13/storage/tokudb/PerconaFT/cmake_modules/TokuSetupCompiler.cmake	2016-04-20 14:29:31.019940551 +0200
+@@ -156,8 +156,8 @@
+ endif ()
+ 
+ ## always want these
+-set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
+-set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
++set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
++set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
+ 
+ ## need to set -stdlib=libc++ to get real c++11 support on darwin
+ if (APPLE)
diff --git a/easybuild/easyconfigs/m/Mathematica/Mathematica-10.4.1.eb b/easybuild/easyconfigs/m/Mathematica/Mathematica-10.4.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9d13deaf53305795cecfd561637671f0490c8422
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mathematica/Mathematica-10.4.1.eb
@@ -0,0 +1,14 @@
+name = 'Mathematica'
+version = '10.4.1'
+
+homepage = 'http://www.wolfram.com/mathematica'
+description = """Mathematica is a computational software program used in many scientific, engineering, mathematical
+and computing fields."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = ['Mathematica_%(version)s_LINUX.sh']
+
+license_server = 'license.example.com'
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/Mawk/Mawk-1.3.4-goolf-1.4.10-20150503.eb b/easybuild/easyconfigs/m/Mawk/Mawk-1.3.4-goolf-1.4.10-20150503.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7235621e5d7eb453c71274e12836afafb1516761
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mawk/Mawk-1.3.4-goolf-1.4.10-20150503.eb
@@ -0,0 +1,27 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+
+easyblock = 'ConfigureMake'
+
+name = 'Mawk'
+version = '1.3.4'
+versionsuffix = '-20150503' 
+
+homepage = 'http://invisible-island.net/mawk/'
+description = """mawk is an interpreter for the AWK Programming Language."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['ftp://invisible-island.net/mawk/']
+sources = ['%(namelower)s-%(version)s%(versionsuffix)s.tgz']
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/mawk'],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5-intel-2015a-Python-2.7.9.eb
index 2c72b2e6f54a87a865024750b1dcc884f03c6760..3f895315b2a88fb07285216cfc4979edf11aaa85 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-10.4.5-intel-2015a-Python-2.7.9.eb
@@ -59,7 +59,7 @@ configopts += " --disable-driglx-direct --with-gallium-drivers='' --disable-egl"
 # package-config files for os dependencies are in an os specific place
 #preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
 
-prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
 
 sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-10.5.5-intel-2015a-Python-2.7.10.eb b/easybuild/easyconfigs/m/Mesa/Mesa-10.5.5-intel-2015a-Python-2.7.10.eb
index 1a69d474413cc5fbe35f76807094bff3b1d3f2bb..592c4a11827077d61adfee3d0b2ae8fdf0f620a6 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-10.5.5-intel-2015a-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-10.5.5-intel-2015a-Python-2.7.10.eb
@@ -57,7 +57,7 @@ configopts += " --disable-driglx-direct --with-gallium-drivers='swrast' --disabl
 #preconfigopts = 'libtoolize && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
 preconfigopts = ' libtoolize &&  '
 
-prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
 
 sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-11.0.2-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/m/Mesa/Mesa-11.0.2-intel-2015b-Python-2.7.10.eb
index 9d960059a5d49958a1d30129e8f2a1b67cd6e9a9..2bd0ff0f9444e69a6acf07212d15fb9a40617a3a 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-11.0.2-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-11.0.2-intel-2015b-Python-2.7.10.eb
@@ -56,7 +56,7 @@ configopts += " --disable-driglx-direct --with-gallium-drivers='swrast' --disabl
 #preconfigopts = 'libtoolize && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
 preconfigopts = ' libtoolize &&  '
 
-prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
 
 sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-11.0.8-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/m/Mesa/Mesa-11.0.8-intel-2015b-Python-2.7.11.eb
index 73b355c719f6ba7fa57a048d8f2b2bbce713c0c0..a22cf02d6911f031fba5d7d5d99dcc53218a1e80 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-11.0.8-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-11.0.8-intel-2015b-Python-2.7.11.eb
@@ -56,7 +56,7 @@ configopts += " --disable-driglx-direct --with-gallium-drivers='swrast' --disabl
 #preconfigopts = 'libtoolize && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
 preconfigopts = ' libtoolize &&  '
 
-prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
 
 sanity_check_paths = {
     'files': ['lib/libGL.so', 'lib/libOSMesa.so',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-11.1.2-foss-2016a.eb b/easybuild/easyconfigs/m/Mesa/Mesa-11.1.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fb2151e5df58ccd777a59541bd14c797a8e0bd5c
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-11.1.2-foss-2016a.eb
@@ -0,0 +1,68 @@
+easyblock = 'ConfigureMake'
+
+name = 'Mesa'
+version = '11.1.2'
+
+homepage = 'http://www.mesa3d.org/'
+description = """Mesa is an open-source implementation of the OpenGL specification -
+ a system for rendering interactive 3D graphics."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [
+    'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
+]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('Autotools', '20150215'),
+    ('pkg-config', '0.29'),
+    ('glproto', '1.4.17'),
+    ('kbproto', '1.0.7'),
+    ('libpthread-stubs', '0.3'),
+    ('xextproto', '7.3.0'),
+    ('xproto', '7.0.28'),
+    ('makedepend', '1.0.5'),
+]
+
+dependencies = [
+    ('libxml2', '2.9.3'),
+    ('libdrm', '2.4.67'),
+    ('libX11', '1.6.3',),
+    ('libXext', '1.3.3'),
+    ('libXfixes', '5.0.1'),
+    ('libXdamage', '1.1.4'),
+    ('libXfont', '1.5.1'),
+    ('LLVM', '3.7.1'),
+    ('eudev', '3.1.5'),
+]
+
+# Use the os provided libudev or the EB provided eudev
+#osdependencies = ['libudev']
+
+# GLU is not part anymore of Mesa package!
+configopts = " --disable-osmesa --enable-gallium-osmesa --enable-gallium-llvm --enable-glx --disable-dri"
+configopts += " --enable-xlib-glx --disable-driglx-direct --with-gallium-drivers='swrast' --disable-egl"
+configopts += " --with-osmesa-bits=32 --enable-texture-float "
+
+# package-config files for os dependencies are in an os specific place
+#preconfigopts = 'libtoolize && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
+preconfigopts = ' libtoolize &&  '
+
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
+
+sanity_check_paths = {
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT, 'lib/libGLESv1_CM.%s' % SHLIB_EXT,
+              'lib/libGLESv2.%s' %SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h', 'include/GL/glx.h',
+              'include/GL/osmesa.h', 'include/GL/wglext.h', 'include/GL/gl.h', 'include/GL/glxext.h',
+              'include/GL/glx_mangle.h', 'include/GLES/gl.h', 'include/GLES2/gl2.h', 'include/GLES3/gl3.h'],
+    'dirs': []
+}
+
+maxparallel = 1
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-11.1.2-gimkl-2.11.5.eb b/easybuild/easyconfigs/m/Mesa/Mesa-11.1.2-gimkl-2.11.5.eb
index 72d772f45056512475f9e5e43314bd3a0175a39d..171b47710c44b8eba7ffb842cca90768e1bec3c0 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-11.1.2-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-11.1.2-gimkl-2.11.5.eb
@@ -53,7 +53,7 @@ configopts += " --with-osmesa-bits=32 --enable-texture-float "
 #preconfigopts = 'libtoolize && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
 preconfigopts = ' libtoolize &&  '
 
-prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
 
 sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT, 'lib/libGLESv1_CM.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-11.1.2-intel-2016a.eb b/easybuild/easyconfigs/m/Mesa/Mesa-11.1.2-intel-2016a.eb
index 3ee16e73eacd73afb0f41eb6f88464de77b1fb8c..3282ad740cd589c6b1feb1b46744ed578dbe56d2 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-11.1.2-intel-2016a.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-11.1.2-intel-2016a.eb
@@ -53,7 +53,7 @@ configopts += " --with-osmesa-bits=32 --enable-texture-float "
 #preconfigopts = 'libtoolize && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
 preconfigopts = ' libtoolize &&  '
 
-prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
 
 sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT, 'lib/libGLESv1_CM.%s' % SHLIB_EXT,
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-11.2.1-foss-2016a.eb b/easybuild/easyconfigs/m/Mesa/Mesa-11.2.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a919f2eab90d692a26d0f04b685cc4f82f00023d
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-11.2.1-foss-2016a.eb
@@ -0,0 +1,68 @@
+easyblock = 'ConfigureMake'
+
+name = 'Mesa'
+version = '11.2.1'
+
+homepage = 'http://www.mesa3d.org/'
+description = """Mesa is an open-source implementation of the OpenGL specification -
+ a system for rendering interactive 3D graphics."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [
+    'https://mesa.freedesktop.org/archive/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
+]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('Autotools', '20150215'),
+    ('pkg-config', '0.29.1'),
+    ('glproto', '1.4.17'),
+    ('kbproto', '1.0.7'),
+    ('libpthread-stubs', '0.3'),
+    ('xextproto', '7.3.0'),
+    ('xproto', '7.0.28'),
+    ('makedepend', '1.0.5'),
+]
+
+dependencies = [
+    ('libxml2', '2.9.3'),
+    ('libdrm', '2.4.68'),
+    ('libX11', '1.6.3',),
+    ('libXext', '1.3.3'),
+    ('libXfixes', '5.0.1'),
+    ('libXdamage', '1.1.4'),
+    ('libXfont', '1.5.1', '-freetype-2.6.3'),
+    ('LLVM', '3.8.0'),
+    ('eudev', '3.1.5'),
+]
+
+# Use the os provided libudev or the EB provided eudev
+#osdependencies = ['libudev']
+
+# GLU is not part anymore of Mesa package!
+configopts = " --disable-osmesa --enable-gallium-osmesa --enable-gallium-llvm --enable-glx --disable-dri"
+configopts += " --enable-xlib-glx --disable-driglx-direct --with-gallium-drivers='swrast' --disable-egl"
+configopts += " --with-osmesa-bits=32 --enable-texture-float "
+
+# package-config files for os dependencies are in an os specific place
+#preconfigopts = 'libtoolize && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
+preconfigopts = ' libtoolize &&  '
+
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
+
+sanity_check_paths = {
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT, 'lib/libGLESv1_CM.%s' % SHLIB_EXT,
+              'lib/libGLESv2.%s' %SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h', 'include/GL/glx.h',
+              'include/GL/osmesa.h', 'include/GL/wglext.h', 'include/GL/gl.h', 'include/GL/glxext.h',
+              'include/GL/glx_mangle.h', 'include/GLES/gl.h', 'include/GLES2/gl2.h', 'include/GLES3/gl3.h'],
+    'dirs': []
+}
+
+maxparallel = 1
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-11.2.1-intel-2016a.eb b/easybuild/easyconfigs/m/Mesa/Mesa-11.2.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..54f7d8a513756cbadecfddd761e65a42b6e6d434
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-11.2.1-intel-2016a.eb
@@ -0,0 +1,68 @@
+easyblock = 'ConfigureMake'
+
+name = 'Mesa'
+version = '11.2.1'
+
+homepage = 'http://www.mesa3d.org/'
+description = """Mesa is an open-source implementation of the OpenGL specification -
+ a system for rendering interactive 3D graphics."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [
+    'https://mesa.freedesktop.org/archive/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/%(version)s',
+    'ftp://ftp.freedesktop.org/pub/mesa/older-versions/%(version_major)s.x/%(version)s',
+]
+
+builddependencies = [
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('Autotools', '20150215'),
+    ('pkg-config', '0.29.1'),
+    ('glproto', '1.4.17'),
+    ('kbproto', '1.0.7'),
+    ('libpthread-stubs', '0.3'),
+    ('xextproto', '7.3.0'),
+    ('xproto', '7.0.28'),
+    ('makedepend', '1.0.5'),
+]
+
+dependencies = [
+    ('libxml2', '2.9.3'),
+    ('libdrm', '2.4.68'),
+    ('libX11', '1.6.3',),
+    ('libXext', '1.3.3'),
+    ('libXfixes', '5.0.1'),
+    ('libXdamage', '1.1.4'),
+    ('libXfont', '1.5.1', '-freetype-2.6.3'),
+    ('LLVM', '3.8.0'),
+    ('eudev', '3.1.5'),
+]
+
+# Use the os provided libudev or the EB provided eudev
+#osdependencies = ['libudev']
+
+# GLU is not part anymore of Mesa package!
+configopts = " --disable-osmesa --enable-gallium-osmesa --enable-gallium-llvm --enable-glx --disable-dri"
+configopts += " --enable-xlib-glx --disable-driglx-direct --with-gallium-drivers='swrast' --disable-egl"
+configopts += " --with-osmesa-bits=32 --enable-texture-float "
+
+# package-config files for os dependencies are in an os specific place
+#preconfigopts = 'libtoolize && PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
+preconfigopts = ' libtoolize &&  '
+
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
+
+sanity_check_paths = {
+    'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libOSMesa.%s' % SHLIB_EXT, 'lib/libGLESv1_CM.%s' % SHLIB_EXT,
+              'lib/libGLESv2.%s' %SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h', 'include/GL/glx.h',
+              'include/GL/osmesa.h', 'include/GL/wglext.h', 'include/GL/gl.h', 'include/GL/glxext.h',
+              'include/GL/glx_mangle.h', 'include/GLES/gl.h', 'include/GLES2/gl2.h', 'include/GLES3/gl3.h'],
+    'dirs': []
+}
+
+maxparallel = 1
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index 0cd27019acea5b577497606174c6ecd68257c46d..c47447d2395c9c24adc17efb1db1baa31d70e816 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -44,7 +44,7 @@ configopts += " --disable-driglx-direct --with-gallium-drivers='' --without-demo
 # package-config files for os dependencies are in an os specific place
 preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
 
-prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
 
 sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb
index a724cb0c527e939746427219619c8621ae5dd40f..57483e1d4fbf16f7f69e9d3dbf4b127664286558 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-goolf-1.4.10-Python-2.7.3.eb
@@ -43,7 +43,7 @@ configopts += " --disable-driglx-direct --with-gallium-drivers='' --without-demo
 # package-config files for os dependencies are in an os specific place
 preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
 
-prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
 
 sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb
index 70a2816d6bbce99963bebb64f7b6f6fcbbb397a3..fa636619482c054768a8c7d2f130ff989d9a6c38 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.0.6-Python-2.7.3.eb
@@ -44,7 +44,7 @@ configopts += " --disable-driglx-direct --with-gallium-drivers='' --without-demo
 # package-config files for os dependencies are in an os specific place
 preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
 
-prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
 
 sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb
index 0371483898db2bed0ec76e011e2e544dde5de98a..3d2d9d7e938f9c2825c289ffb870463fadda33c0 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-4.1.13-Python-2.7.3.eb
@@ -44,7 +44,7 @@ configopts += " --disable-driglx-direct --with-gallium-drivers='' --without-demo
 # package-config files for os dependencies are in an os specific place
 preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
 
-prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
 
 sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb
index 7e87cc2bd48924e98d0f413b82bf452bf98241cd..ac83c1243a04119a7aa1fcd817230ae911fb79b1 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.3.0-Python-2.7.3.eb
@@ -45,7 +45,7 @@ configopts += " --disable-driglx-direct --with-gallium-drivers='' --without-demo
 # package-config files for os dependencies are in an os specific place
 preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
 
-prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
 
 sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
diff --git a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.5.0-Python-2.7.6.eb
index 9c7388d8246c45918ac2586d5b032bc8f0748761..810e10d3bb903027c51806b7843dd986335a4412 100644
--- a/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.5.0-Python-2.7.6.eb
+++ b/easybuild/easyconfigs/m/Mesa/Mesa-7.11.2-ictce-5.5.0-Python-2.7.6.eb
@@ -45,7 +45,7 @@ configopts += " --disable-driglx-direct --with-gallium-drivers='' --without-demo
 # package-config files for os dependencies are in an os specific place
 preconfigopts = ' PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib64/pkgconfig/:/usr/share/pkgconfig" '
 
-prebuildopts = 'CPATH="$EBROOTLIBDRM/include/libdrm" '
+prebuildopts = 'env CPATH="$EBROOTLIBDRM/include/libdrm:$CPATH" '
 
 sanity_check_paths = {
     'files': ['lib/libGL.%s' % SHLIB_EXT, 'lib/libGLU.%s' % SHLIB_EXT, 'include/GL/glext.h', 'include/GL/gl_mangle.h',
diff --git a/easybuild/easyconfigs/m/Mesquite/Mesquite-2.3.0-intel-2016a.eb b/easybuild/easyconfigs/m/Mesquite/Mesquite-2.3.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fd518b222719d8b8f24d245ae4e5ac2af2f72560
--- /dev/null
+++ b/easybuild/easyconfigs/m/Mesquite/Mesquite-2.3.0-intel-2016a.eb
@@ -0,0 +1,15 @@
+easyblock = 'ConfigureMake'
+
+name = 'Mesquite'
+version = '2.3.0'
+
+homepage = 'https://software.sandia.gov/mesquite/'
+description = """Mesh-Quality Improvement Library"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://software.sandia.gov/mesquite/']
+sources = [SOURCELOWER_TAR_GZ]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/Minimac3/Minimac3-1.0.10-foss-2015a.eb b/easybuild/easyconfigs/m/Minimac3/Minimac3-1.0.10-foss-2015a.eb
index 3f8c039cdb3bbc4bbe1db50f3e364f6e8ce2d1a0..0df4d93ef0caf5327c68dfe524d4e92e770b27b8 100644
--- a/easybuild/easyconfigs/m/Minimac3/Minimac3-1.0.10-foss-2015a.eb
+++ b/easybuild/easyconfigs/m/Minimac3/Minimac3-1.0.10-foss-2015a.eb
@@ -15,7 +15,7 @@ sources = ['%(name)s.v%(version)s.tar.gz']
 
 dependencies = [('zlib', '1.2.8')]
 
-prebuildopts = 'CFLAGS="$CFLAGS -L$EBROOTZLIB/lib"'
+prebuildopts = 'env CFLAGS="$CFLAGS -L$EBROOTZLIB/lib"'
 buildopts = 'CC="$CC" CXX="$CXX" F77="$F77" OPTFLAG_OPT="$CFLAGS"'
 
 files_to_copy = [(['bin/Minimac3'], 'bin')]
diff --git a/easybuild/easyconfigs/m/Minimac3/Minimac3-1.0.10-intel-2015a.eb b/easybuild/easyconfigs/m/Minimac3/Minimac3-1.0.10-intel-2015a.eb
index e493e1ad486ce99eef0fcbff6bcaa584287e74e1..5bb00f47ad8dcb1c34bc48a3259b3d3c4b82e0d9 100644
--- a/easybuild/easyconfigs/m/Minimac3/Minimac3-1.0.10-intel-2015a.eb
+++ b/easybuild/easyconfigs/m/Minimac3/Minimac3-1.0.10-intel-2015a.eb
@@ -15,7 +15,7 @@ sources = ['%(name)s.v%(version)s.tar.gz']
 
 dependencies = [('zlib', '1.2.8')]
 
-prebuildopts = 'CFLAGS="$CFLAGS -wd751 -L$EBROOTZLIB/lib"'
+prebuildopts = 'env CFLAGS="$CFLAGS -wd751 -L$EBROOTZLIB/lib"'
 buildopts = 'CC="$CC" CXX="$CXX" F77="$F77" OPTFLAG_OPT="$CFLAGS"'
 
 files_to_copy = [(['bin/Minimac3'], 'bin')]
diff --git a/easybuild/easyconfigs/m/MuTect/MuTect-1.1.4-Java-1.7.0_80.eb b/easybuild/easyconfigs/m/MuTect/MuTect-1.1.4-Java-1.7.0_80.eb
index 1434f1c176673a77f9c7a5beca3de356227eb32e..0d2d28d47b19172b742da3751e61ad7f9a8286bd 100644
--- a/easybuild/easyconfigs/m/MuTect/MuTect-1.1.4-Java-1.7.0_80.eb
+++ b/easybuild/easyconfigs/m/MuTect/MuTect-1.1.4-Java-1.7.0_80.eb
@@ -2,11 +2,15 @@
 # Author: Pablo Escobar Lopez
 # Swiss Institute of Bioinformatics
 # Biozentrum - University of Basel
+# Modified by
+# Adam Huffman
+# The Francis Crick Institute
 
 easyblock = 'Tarball'
 
 name = 'MuTect'
 version = '1.1.4'
+versionsuffix = '-Java-%(javaver)s'
 
 homepage = 'http://www.broadinstitute.org/cancer/cga/mutect'
 description = """ MuTect is a method developed at the Broad Institute for the reliable
@@ -15,14 +19,11 @@ description = """ MuTect is a method developed at the Broad Institute for the re
 
 toolchain = {'name': 'dummy', 'version': ''}
 
-source_urls = ['http://www.broadinstitute.org/cancer/cga/sites/default/files/data/tools/mutect/']
+# Need to be logged in to download, at this URL
+# http://www.broadinstitute.org/cancer/cga/mutect_download
 sources = ['muTect-%(version)s-bin.zip']
 
-java = 'Java'
-javaver = '1.7.0_80'
-versionsuffix = '-%s-%s' % (java, javaver)
-
-dependencies = [(java, javaver)]
+dependencies = [('Java', '1.7.0_80')]
 
 sanity_check_paths = {
     'files': ["muTect-%(version)s.jar"],
@@ -30,7 +31,7 @@ sanity_check_paths = {
 }
 
 modloadmsg = """
-to execute: java -jar \\$EBROOTMUTECT/muTect-%(version)s.jar
+To start MuTect: java -jar \\$EBROOTMUTECT/muTect-%(version)s.jar
 """
 
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MuTect/MuTect-1.1.7-Java-1.7.0_80.eb b/easybuild/easyconfigs/m/MuTect/MuTect-1.1.7-Java-1.7.0_80.eb
new file mode 100644
index 0000000000000000000000000000000000000000..86bd5019e265e5e39ae9249c4da81c771897d211
--- /dev/null
+++ b/easybuild/easyconfigs/m/MuTect/MuTect-1.1.7-Java-1.7.0_80.eb
@@ -0,0 +1,38 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+# Modified by
+# Adam Huffman
+# The Francis Crick Institute
+
+easyblock = 'Tarball'
+
+name = 'MuTect'
+version = '1.1.7'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'http://www.broadinstitute.org/cancer/cga/mutect'
+description = """ MuTect is a method developed at the Broad Institute for the reliable
+ and accurate identification of somatic point mutations in next generation sequencing
+ data of cancer genomes. """
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+# Need to be logged in to download, at this URL
+# and to click the checkbox to agree to the licence
+# https://www.broadinstitute.org/gatk/download/auth?package=MuTect
+sources = ['%(namelower)s-%(version)s.jar.zip']
+
+dependencies = [('Java', '1.7.0_80')]
+
+sanity_check_paths = {
+    'files': ["%(namelower)s-%(version)s.jar"],
+    'dirs': [],
+}
+
+modloadmsg = """
+To start MuTect: java -jar \\$EBROOTMUTECT/%(namelower)s-%(version)s.jar
+"""
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/m/MultiNest/MultiNest-3.10-intel-2016a.eb b/easybuild/easyconfigs/m/MultiNest/MultiNest-3.10-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..78d3266bf6d5dd4c54bca4d574272d6714766029
--- /dev/null
+++ b/easybuild/easyconfigs/m/MultiNest/MultiNest-3.10-intel-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'CMakeMake'
+
+name = 'MultiNest'
+version = '3.10'
+
+homepage = 'https://ccpforge.cse.rl.ac.uk/gf/project/multinest/'
+description = """MultiNest is a Bayesian inference tool which calculates the evidence and explores the parameter space
+ which may contain multiple posterior modes and pronounced (curving) degeneracies in moderately high dimensions."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+# download via https://ccpforge.cse.rl.ac.uk/gf/project/multinest/frs (requires registration)
+sources = ['MultiNest_v%(version)s_CMake.tar.gz']
+checksums = ['a4ed7c15f2fbbf7f859f565734fc5296']
+
+builddependencies = [('CMake', '3.4.3')]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['ackley', 'eggboxC', 'eggboxC++', 'gaussian', 'gauss_shell', 'himmelblau',
+                                     'obj_detect', 'rosenbrock']] +
+             ['lib/lib%s' % x for x in ['multinest.a', 'multinest_mpi.a', 'multinest_mpi.%s' % SHLIB_EXT,
+                                        'multinest.%s' % SHLIB_EXT]] +
+             ['include/multinest.h'],
+    'dirs': ['modules'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
index 3b30e0e1d583ff5b08e71cb17acf10bcdc5d2d29..6fb02db3e55e597a669d209cb068ec525c835b39 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goalf-1.1.0-no-OFED.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
+source_urls = [XORG_UTIL_SOURCE]
 
 sanity_check_paths = {
     'files': ['bin/makedepend'],
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goolf-1.4.10.eb
index 393090c9942465fc573f3c77f19386cceba59f9b..00c6dd223228f48463d5f954fedbd485dbe02746 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
+source_urls = [XORG_UTIL_SOURCE]
 
 sanity_check_paths = {
     'files': ['bin/makedepend'],
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb
index f5f634beae7e45f2fda1603aa578687c3954199e..82ed5ca65845cf1dbf15101176a615e6b5103624 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-3.2.2.u3.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '3.2.2.u3'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
+source_urls = [XORG_UTIL_SOURCE]
 
 patches = ['makedepend_icc-sigaction.patch']
 
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb
index 25ba8c0849b1304d6f38ad70b2d4c2e619a1642f..c4b315a1b78ed272caf9d5342e5ca15e6be3f66e 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.0.6.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
+source_urls = [XORG_UTIL_SOURCE]
 
 sanity_check_paths = {
     'files': ['bin/makedepend'],
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb
index 858f7c26082a0fd203c5c4aafed8b5e08f7d5ab7..255cd2ad52f973c2ff904d5d1ea10654eff39e36 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-4.1.13.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
+source_urls = [XORG_UTIL_SOURCE]
 
 sanity_check_paths = {
     'files': ['bin/makedepend'],
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.3.0.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.3.0.eb
index 808282ac91451602ac3ae5ad2f42f803aacd53bb..49f692fd43bd1473e7d9d98bb45e39503dce462e 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.3.0.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
+source_urls = [XORG_UTIL_SOURCE]
 
 sanity_check_paths = {
     'files': ['bin/makedepend'],
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.5.0.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.5.0.eb
index 873b6391a257e930f6b0d706a1cb87561bd63aea..ece06f94ebbf96c50a9e32f669c170929b292d1c 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-ictce-5.5.0.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '5.5.0'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
+source_urls = [XORG_UTIL_SOURCE]
 
 sanity_check_paths = {
     'files': ['bin/makedepend'],
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb
index 07b6b524bfe9690d7d525e88c1fc69fbff41e8a0..50e1707937b065e9121e423e0357452ac0d69e5b 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.4-iqacml-3.7.3.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'iqacml', 'version': '3.7.3'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
+source_urls = [XORG_UTIL_SOURCE]
 
 patches = ['makedepend_icc-sigaction.patch']
 
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-foss-2016a.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c4a3658b9ff28289fb6c0e1eaa744ea8069e6c75
--- /dev/null
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-foss-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'makedepend'
+version = '1.0.5'
+
+homepage = "http://www.linuxfromscratch.org/blfs/view/svn/x/makedepend.html"
+description = "The makedepend package contains a C-preprocessor like utility to determine build-time dependencies."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_UTIL_SOURCE]
+
+builddependencies = [
+    ('xproto', '7.0.28'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/makedepend'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-gimkl-2.11.5.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-gimkl-2.11.5.eb
index c92d8634e2d5064a6f7545537110cda3fb61f09c..29139d331358ce40613b9f44e962fef5ee7b772c 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-gimkl-2.11.5.eb
@@ -10,7 +10,11 @@ toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
+source_urls = [XORG_UTIL_SOURCE]
+
+builddependencies = [
+    ('xproto', '7.0.28'),
+]
 
 sanity_check_paths = {
     'files': ['bin/makedepend'],
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-intel-2015a.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-intel-2015a.eb
index 0b36b37c50615845294ae67b33fc1f857d65dafe..2a137852f4db4ed68905a617d245a65bb10326bc 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-intel-2015a.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-intel-2015a.eb
@@ -10,7 +10,11 @@ toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
+source_urls = [XORG_UTIL_SOURCE]
+
+builddependencies = [
+    ('xproto', '7.0.28'),
+]
 
 sanity_check_paths = {
     'files': ['bin/makedepend'],
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-intel-2015b.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-intel-2015b.eb
index 77541afc672d59b8f2408a1c743958ffe1095449..32cc5814c93db585fd56ac61d0637b1177055a1b 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-intel-2015b.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-intel-2015b.eb
@@ -10,7 +10,11 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
+source_urls = [XORG_UTIL_SOURCE]
+
+builddependencies = [
+    ('xproto', '7.0.28'),
+]
 
 sanity_check_paths = {
     'files': ['bin/makedepend'],
diff --git a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-intel-2016a.eb b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-intel-2016a.eb
index 1158bd68be869ea839097d371c42e46f2b3e82c0..943da96f822de922217509d7658695c91eedd7df 100644
--- a/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-intel-2016a.eb
+++ b/easybuild/easyconfigs/m/makedepend/makedepend-1.0.5-intel-2016a.eb
@@ -10,7 +10,11 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/releases/individual/util']
+source_urls = [XORG_UTIL_SOURCE]
+
+builddependencies = [
+    ('xproto', '7.0.28'),
+]
 
 sanity_check_paths = {
     'files': ['bin/makedepend'],
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-foss-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-foss-2015b-Python-2.7.10.eb
index 207a23ff90cc88c3d698210697d83a131f76922e..96e332c7573a710e4223a79c7dea9512b22dee2c 100644
--- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-foss-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-foss-2015b-Python-2.7.10.eb
@@ -13,7 +13,6 @@ toolchain = {'name': 'foss', 'version': '2015b'}
 
 # this is a bundle of Python packages
 exts_defaultclass = 'PythonPackage'
-exts_filter = ('python -c "import %(ext_name)s"', '')
 
 dependencies = [
     ('Python', '2.7.10'),
@@ -29,6 +28,7 @@ exts_list = [
     }),
     (name, version, {
         'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
+        'patches': ['matplotlib-1.5.1_fix-Tcl-Tk-libdir.patch'],
     }),
 ]
 
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a29279c43fd46844af4ac21f00c1d739bec64712
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,45 @@
+easyblock = 'Bundle'
+
+name = 'matplotlib'
+version = '1.5.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://matplotlib.org'
+description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
+ hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
+ and ipython shell, web application servers, and six graphical user interface toolkits."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('freetype', '2.6.2'),
+    ('libpng', '1.6.21'),
+]
+
+exts_list = [
+    ('Cycler', '0.9.0', {
+        'modulename': 'cycler',
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cycler'],
+        'source_tmpl': 'cycler-%(version)s.tar.gz',
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
+        'patches': ['matplotlib-1.5.1_fix-Tcl-Tk-libdir.patch'],
+    }),
+]
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2015b-Python-2.7.11.eb
index 1364208ceef9bfa8001984b63d643fca149b9c05..790acc6037c9ef47947722c0a3e42dcafc9ec95f 100644
--- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2015b-Python-2.7.11.eb
@@ -13,7 +13,6 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 
 # this is a bundle of Python packages
 exts_defaultclass = 'PythonPackage'
-exts_filter = ('python -c "import %(ext_name)s"', '')
 
 dependencies = [
     ('Python', '2.7.11'),
@@ -29,6 +28,7 @@ exts_list = [
     }),
     (name, version, {
         'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
+        'patches': ['matplotlib-1.5.1_fix-Tcl-Tk-libdir.patch'],
     }),
 ]
 
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-2.7.11.eb
index c62d74a1eb01f6732ab4ebe6dbedf7e629366ba8..0e7eed591811fe393f86bed9a0347233c0232d7d 100644
--- a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-2.7.11.eb
@@ -13,7 +13,6 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 
 # this is a bundle of Python packages
 exts_defaultclass = 'PythonPackage'
-exts_filter = ('python -c "import %(ext_name)s"', '')
 
 dependencies = [
     ('Python', '2.7.11'),
@@ -29,6 +28,7 @@ exts_list = [
     }),
     (name, version, {
         'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
+        'patches': ['matplotlib-1.5.1_fix-Tcl-Tk-libdir.patch'],
     }),
 ]
 
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8f0297420890de081a232eb8b09e7abf5069da30
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1-intel-2016a-Python-3.5.1.eb
@@ -0,0 +1,46 @@
+easyblock = 'Bundle'
+
+name = 'matplotlib'
+version = '1.5.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://matplotlib.org'
+description = """matplotlib is a python 2D plotting library which produces publication quality figures in a variety of
+ hardcopy formats and interactive environments across platforms. matplotlib can be used in python scripts, the python
+ and ipython shell, web application servers, and six graphical user interface toolkits."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+exts_filter = ('python -c "import %(ext_name)s"', '')
+
+dependencies = [
+    ('Python', '3.5.1'),
+    ('freetype', '2.6.2'),
+    ('libpng', '1.6.21'),
+]
+
+exts_list = [
+    ('Cycler', '0.9.0', {
+        'modulename': 'cycler',
+        'source_urls': ['https://pypi.python.org/packages/source/C/Cycler'],
+        'source_tmpl': 'cycler-%(version)s.tar.gz',
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/m/matplotlib'],
+        'patches': ['matplotlib-1.5.1_fix-Tcl-Tk-libdir.patch'],
+    }),
+]
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1_fix-Tcl-Tk-libdir.patch b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1_fix-Tcl-Tk-libdir.patch
new file mode 100644
index 0000000000000000000000000000000000000000..39e34a937a4797cb6946d7f762d6949fe84ce6b5
--- /dev/null
+++ b/easybuild/easyconfigs/m/matplotlib/matplotlib-1.5.1_fix-Tcl-Tk-libdir.patch
@@ -0,0 +1,26 @@
+ensure that Tcl/Tk library paths are correct, to fix segmentation fault that occurs when plotting because system
+libraries are picked up;
+the problem is that the query_tcktl method guesses the Tk library path based on the Tcl library path by simply
+replacing 'Tcl'/'tcl' with 'Tk'/'tk', which doesn't work if the Tk install prefix is different (e.g. due to a
+versionsuffix)
+author: Kenneth Hoste (HPC-UGent)
+-- matplotlib-1.5.1.orig/setupext.py	2016-01-11 04:06:08.000000000 +0100
++++ matplotlib-1.5.1/setupext.py	2016-04-29 15:43:21.280170000 +0200
+@@ -1560,7 +1560,16 @@
+ 
+             # Query Tcl/Tk system for library paths and version string
+             try:
+-                tcl_lib_dir, tk_lib_dir, tk_ver = self.query_tcltk()
++                tcl_lib_dir, tk_lib_dir, tk_ver = None, None, None
++                if 'EBROOTTCL' in os.environ and 'EBVERSIONTCL' in os.environ:
++                    tcl_ver = '.'.join(os.environ['EBVERSIONTCL'].split('.')[:2])
++                    tcl_lib_dir = os.path.join(os.environ['EBROOTTCL'], 'lib', 'tcl%s' % tcl_ver)
++                if 'EBROOTTK' in os.environ and 'EBVERSIONTK' in os.environ:
++                    tk_ver = '.'.join(os.environ['EBVERSIONTK'].split('.')[:2])
++                    tk_lib_dir = os.path.join(os.environ['EBROOTTK'], 'lib', 'tk%s' % tk_ver)
++
++                if tcl_lib_dir is None or tk_lib_dir is None or tk_ver is None:
++                        tcl_lib_dir, tk_lib_dir, tk_ver = self.query_tcltk()
+             except:
+                 tk_ver = ''
+                 result = self.hardcoded_tcl_config()
diff --git a/easybuild/easyconfigs/m/molmod/molmod-1.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/m/molmod/molmod-1.1-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ee1c58975014abc6ebbd9e9f28c37e376d909503
--- /dev/null
+++ b/easybuild/easyconfigs/m/molmod/molmod-1.1-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,31 @@
+easyblock = 'PythonPackage'
+
+name = 'molmod'
+version = '1.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://molmod.github.io/molmod/'
+description = """MolMod is a Python library with many compoments that are useful to write molecular modeling programs."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://github.com/molmod/molmod/releases/download/v%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.10'),
+    ('matplotlib', '1.5.0', versionsuffix), 
+]
+
+runtest = "export MATPLOTLIBRC=$PWD; echo 'backend: agg' > $MATPLOTLIBRC/matplotlibrc;"
+runtest += "python setup.py build_ext -i; nosetests -v"
+
+# fix permissions issue on files in share/molmod subdir
+postinstallcmds = ['chmod -R o+r %(installdir)s/share/molmod']
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/molmod'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/molmod/molmod-1.1-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/m/molmod/molmod-1.1-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1673c64e606c81e97a672d02dc07d0fe0d5b604e
--- /dev/null
+++ b/easybuild/easyconfigs/m/molmod/molmod-1.1-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,31 @@
+easyblock = 'PythonPackage'
+
+name = 'molmod'
+version = '1.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://molmod.github.io/molmod/'
+description = """MolMod is a Python library with many compoments that are useful to write molecular modeling programs."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://github.com/molmod/molmod/releases/download/v%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('matplotlib', '1.5.1', versionsuffix), 
+]
+
+runtest = "export MATPLOTLIBRC=$PWD; echo 'backend: agg' > $MATPLOTLIBRC/matplotlibrc;"
+runtest += "python setup.py build_ext -i; nosetests -v"
+
+# fix permissions issue on files in share/molmod subdir
+postinstallcmds = ['chmod -R o+r %(installdir)s/share/molmod']
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/molmod'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb
index 6d97e3c57a21ee9c3898afc2435ee12f7bc0f138..ea8c9d49ac4547c6c4eddbb9021a905db911619f 100644
--- a/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-goolf-1.4.10.eb
@@ -38,7 +38,7 @@ builddependencies = [
 ]
 
 # make has problems with utf8
-prebuildopts = "LANG=C "
+prebuildopts = "env LANG=C "
 
 # motif ships a broken automake and libtool
 preconfigopts = "rm -f libtool install-sh missing depcomp config.guess config.sub && "
diff --git a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb
index 36d9829a6d813ad548761146bd913558f75de8ca..4476f0d92206be3a53e9baea816c1e1ce1e1729c 100644
--- a/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/m/motif/motif-2.2.4-ictce-4.1.13.eb
@@ -38,7 +38,7 @@ dependencies = [
 ]
 
 # make has problems with utf8
-prebuildopts = "LANG=C "
+prebuildopts = "env LANG=C "
 
 # motif ships a broken automake and libtool
 preconfigopts = "rm -f libtool install-sh missing depcomp config.guess config.sub && "
diff --git a/easybuild/easyconfigs/m/motif/motif-2.3.5-intel-2016a.eb b/easybuild/easyconfigs/m/motif/motif-2.3.5-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0cf658c9a2f18831b2d0673251d4ebae0db57dfb
--- /dev/null
+++ b/easybuild/easyconfigs/m/motif/motif-2.3.5-intel-2016a.eb
@@ -0,0 +1,45 @@
+easyblock = 'ConfigureMake'
+
+name = 'motif'
+version = '2.3.5'
+
+homepage = 'http://motif.ics.com/'
+description = """Motif refers to both a graphical user interface (GUI) specification and the widget toolkit for building
+ applications that follow that specification under the X Window System on Unix and other POSIX-compliant systems.
+ It was the standard toolkit for the Common Desktop Environment and thus for Unix."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+# use -O1 to dance around icc segfaulting
+toolchainopts = {'lowopt': True}
+
+sources = ['%(name)s-%(version)s.tar.gz']
+source_urls = [SOURCEFORGE_SOURCE]
+
+dependencies = [
+    ('libXt', '1.1.5'),
+    ('libXau', '1.0.8'),
+    ('libX11', '1.6.3'),
+    ('libXext', '1.3.3'),
+    ('libXdmcp', '1.1.2'),
+    ('libpng', '1.6.21'),
+    ('xbitmaps', '1.1.1'),
+    ('freetype', '2.6.3'),
+    ('libjpeg-turbo', '1.4.2'),
+    ('bzip2', '1.0.6'),
+]
+builddependencies = [
+    ('Autotools', '20150215'),
+    ('flex', '2.6.0'),
+    ('Bison', '3.0.4'),
+    ('util-linux', '2.28'),
+]
+
+# makefile is not parallel safe
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['lib/libMrm.a', 'lib/libUil.a', 'lib/libXm.a', 'bin/mwm', 'bin/uil', 'bin/xmbind'],
+    'dirs': ['include/Mrm', 'include/uil', 'include/X11', 'include/Xm'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/m/multitail/multitail-6.2.1-intel-2015a.eb b/easybuild/easyconfigs/m/multitail/multitail-6.2.1-intel-2015a.eb
index e8dddb718d57579e1b1101078693da481bf450a1..eb272b1b70fc021e4a1bcb891cd0c67a8218408f 100644
--- a/easybuild/easyconfigs/m/multitail/multitail-6.2.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/m/multitail/multitail-6.2.1-intel-2015a.eb
@@ -21,7 +21,7 @@ files_to_copy = [
 
 dependencies = [("ncurses", "5.9")]
 
-prebuildopts = 'DESTDIR=%(installdir)s '
+prebuildopts = 'env DESTDIR=%(installdir)s '
 
 sanity_check_paths = {
     'files': ['bin/multitail'],
diff --git a/easybuild/easyconfigs/n/NASM/NASM-2.12.01-foss-2016a.eb b/easybuild/easyconfigs/n/NASM/NASM-2.12.01-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3097f4cb0eb343cd51caea00867d31f8c0ec9ad0
--- /dev/null
+++ b/easybuild/easyconfigs/n/NASM/NASM-2.12.01-foss-2016a.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'NASM'
+version = '2.12.01'
+
+homepage = 'http://www.nasm.us/'
+description = """NASM: General-purpose x86 assembler"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://www.nasm.us/pub/nasm/releasebuilds/%(version)s']
+
+sanity_check_paths = {
+    'files': ['bin/nasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/n/NASM/NASM-2.12.01-intel-2016a.eb b/easybuild/easyconfigs/n/NASM/NASM-2.12.01-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..dc884fc26040838108fa8bf3503dc09a14401fa5
--- /dev/null
+++ b/easybuild/easyconfigs/n/NASM/NASM-2.12.01-intel-2016a.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'NASM'
+version = '2.12.01'
+
+homepage = 'http://www.nasm.us/'
+description = """NASM: General-purpose x86 assembler"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://www.nasm.us/pub/nasm/releasebuilds/%(version)s']
+
+sanity_check_paths = {
+    'files': ['bin/nasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/n/NBO/NBO-1.1-intel-2016a.eb b/easybuild/easyconfigs/n/NBO/NBO-1.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a0ff978b5298c5e8bea6bcc55205a403ab79c33b
--- /dev/null
+++ b/easybuild/easyconfigs/n/NBO/NBO-1.1-intel-2016a.eb
@@ -0,0 +1,37 @@
+easyblock = 'MakeCp'
+
+name = 'NBO'
+version = '1.1'
+
+homepage = 'http://schmidt.chem.wisc.edu/nbosoftware'
+description = """Generalized Natural Bond Orbital algorithm to handle systems characterized by periodic symmetry."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'openmp': True}
+
+source_urls = ['http://schmidt.chem.wisc.edu/sites/schmidt.chem.wisc.edu/files/']
+sources = [
+    'periodic_nbo_v.%(version)s.tgz',
+    'projection_v.1.1.2.tgz',
+]
+
+patches = [
+    'NBO-%(version)s_MKL95.patch',
+    ('projection-1.1.2_MKL95.patch', '..'),
+]
+
+prebuildopts = "cd %(builddir)s/projection && "
+prebuildopts += 'make FFLAGS="$FFLAGS -I$LAPACK_INC_DIR/intel64/ilp64" && '
+prebuildopts += "cd %(builddir)s/periodic_nbo && "
+
+buildopts = 'FC="$FC" LD="$FC" FFLAGS="$FFLAGS -I$LAPACK_INC_DIR/intel64/ilp64" '
+buildopts += 'LDFLAGS="$FFLAGS $LDFLAGS $LIBLAPACK -lmkl_blas95_ilp64 -lmkl_lapack95_ilp64"'
+
+files_to_copy = [(['%(builddir)s/periodic_nbo/nbo.exe', '%(builddir)s/projection/projection.exe'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/nbo.exe', 'bin/projection.exe'],
+    'dirs': [],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/n/NBO/NBO-1.1_MKL95.patch b/easybuild/easyconfigs/n/NBO/NBO-1.1_MKL95.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1bde9b006b99260499f7519af7998eba3ac3b805
--- /dev/null
+++ b/easybuild/easyconfigs/n/NBO/NBO-1.1_MKL95.patch
@@ -0,0 +1,505 @@
+fix using BLAS95/LAPACK95 interface for recent Intel MKL versions
+author: Kenneth Hoste (HPC-UGent)
+diff -ru periodic_nbo.orig/matutil.f90 periodic_nbo/matutil.f90
+--- periodic_nbo.orig/matutil.f90	2015-03-04 18:06:25.000000000 +0100
++++ periodic_nbo/matutil.f90	2016-05-12 10:17:54.673546000 +0200
+@@ -93,7 +93,7 @@
+   END FUNCTION matdet
+ 
+   FUNCTION matsqrt_real(dmat)
+-    USE MKL95_BLAS
++    USE BLAS95
+     IMPLICIT NONE
+     REAL*8 , DIMENSION(:,:) :: dmat
+     REAL*8 , DIMENSION(SIZE(dmat,1),SIZE(dmat,2)) :: matsqrt_real, vecs
+@@ -115,14 +115,14 @@
+     FORALL (i=1:n1) matsqrt_real(i,i) = SQRT(abs(vals(i)))
+     !matsqrt_real = MATMUL(vecs, MATMUL(matsqrt_real, TRANSPOSE(vecs)))
+ 
+-    CALL DGEMM_MKL95(vecs,matsqrt_real,dummy,'N','N',1.d0,0.d0)
+-    CALL DGEMM_MKL95(dummy,vecs,matsqrt_real,'N','T',1.d0,0.d0)
++    CALL DGEMM(vecs,matsqrt_real,dummy,'N','N',1.d0,0.d0)
++    CALL DGEMM(dummy,vecs,matsqrt_real,'N','T',1.d0,0.d0)
+ 
+ 
+   END FUNCTION matsqrt_real
+ 
+   FUNCTION matsqrt_complex(cmat)
+-    USE MKL95_BLAS
++    USE BLAS95
+     IMPLICIT NONE
+     COMPLEX*16 , DIMENSION(:,:) :: cmat
+     COMPLEX*16 , DIMENSION(SIZE(cmat,1),SIZE(cmat,2)) :: matsqrt_complex, vecs
+@@ -140,13 +140,13 @@
+     FORALL (i=1:n1) matsqrt_complex(i,i) = SQRT(abs(vals(i)))
+     !matsqrt_complex = MATMUL(vecs, MATMUL(matsqrt_complex, TRANSPOSE(CONJG(vecs))))
+ 
+-    CALL ZGEMM_MKL95(vecs,matsqrt_complex,dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
+-    CALL ZGEMM_MKL95(dummy,vecs,matsqrt_complex,'N','C',(1.d0,0.d0),(0.d0,0.d0))
++    CALL ZGEMM(vecs,matsqrt_complex,dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
++    CALL ZGEMM(dummy,vecs,matsqrt_complex,'N','C',(1.d0,0.d0),(0.d0,0.d0))
+ 
+   END FUNCTION matsqrt_complex
+ 
+   FUNCTION matinvsqrt_real(dmat)
+-    USE MKL95_BLAS
++    USE BLAS95
+     IMPLICIT NONE
+     REAL*8 , DIMENSION(:,:) :: dmat
+     REAL*8 , DIMENSION(SIZE(dmat,1),SIZE(dmat,2)) :: matinvsqrt_real, vecs
+@@ -164,13 +164,13 @@
+     FORALL (i=1:n1) matinvsqrt_real(i,i) = 1.d0/SQRT(abs(vals(i)))
+     !matinvsqrt_real = MATMUL(vecs, MATMUL(matinvsqrt_real, TRANSPOSE(vecs)))
+ 
+-    CALL DGEMM_MKL95(vecs,matinvsqrt_real,dummy,'N','N',1.d0,0.d0)
+-    CALL DGEMM_MKL95(dummy,vecs,matinvsqrt_real,'N','T',1.d0,0.d0)
++    CALL DGEMM(vecs,matinvsqrt_real,dummy,'N','N',1.d0,0.d0)
++    CALL DGEMM(dummy,vecs,matinvsqrt_real,'N','T',1.d0,0.d0)
+ 
+   END FUNCTION matinvsqrt_real
+ 
+   FUNCTION matinvsqrt_complex(cmat)
+-    USE MKL95_BLAS
++    USE BLAS95
+     IMPLICIT NONE
+     COMPLEX*16 , DIMENSION(:,:) :: cmat
+     COMPLEX*16 , DIMENSION(SIZE(cmat,1),SIZE(cmat,2)) :: matinvsqrt_complex, vecs
+@@ -199,13 +199,13 @@
+ 
+     !matinvsqrt_complex = MATMUL(vecs, MATMUL(matinvsqrt_complex, TRANSPOSE(CONJG(vecs))))
+ 
+-    CALL ZGEMM_MKL95(vecs,matinvsqrt_complex,dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
+-    CALL ZGEMM_MKL95(dummy,vecs,matinvsqrt_complex,'N','C',(1.d0,0.d0),(0.d0,0.d0))
++    CALL ZGEMM(vecs,matinvsqrt_complex,dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
++    CALL ZGEMM(dummy,vecs,matinvsqrt_complex,'N','C',(1.d0,0.d0),(0.d0,0.d0))
+ 
+   END FUNCTION matinvsqrt_complex
+ 
+   FUNCTION matexp(dmat)
+-    USE MKL95_BLAS
++    USE BLAS95
+     IMPLICIT NONE
+     REAL*8 , DIMENSION(:,:) :: dmat
+     REAL*8 , DIMENSION(SIZE(dmat,1),SIZE(dmat,2)) :: matexp, vecs
+@@ -222,8 +222,8 @@
+     matexp = 0.d0
+     FORALL (i=1:n1) matexp(i,i) = EXP(vals(i))
+     !matexp = MATMUL(vecs, MATMUL(matexp, TRANSPOSE(vecs)))
+-    CALL DGEMM_MKL95(vecs,matexp,dummy,'N','N',1.d0,0.d0)
+-    CALL DGEMM_MKL95(dummy,vecs,matexp,'N','T',1.d0,0.d0)
++    CALL DGEMM(vecs,matexp,dummy,'N','N',1.d0,0.d0)
++    CALL DGEMM(dummy,vecs,matexp,'N','T',1.d0,0.d0)
+ 
+   END FUNCTION matexp
+ 
+@@ -246,8 +246,8 @@
+ 
+   ! solves the generalized eigenvalue equations D c=S c*lambda
+   SUBROUTINE diag_general(dmat,smat,dvals,dvecs)
+-    USE MKL95_BLAS
+-    USE MKL95_LAPACK
++    USE BLAS95
++    USE LAPACK95
+     IMPLICIT NONE
+     REAL*8 , DIMENSION(:,:) :: dmat, smat, dvecs
+     REAL*8 , DIMENSION(:)   :: dvals
+@@ -277,14 +277,14 @@
+ 
+     ! transform to the coordinates of the normal eigensystem
+     !dmat = MATMUL(TRANSPOSE(shalfi),MATMUL(dmat,shalfi))
+-    CALL DGEMM_MKL95(shalfi,dmat,dummy,'T','N',1.d0,0.d0)
+-    CALL DGEMM_MKL95(dummy,shalfi,dmat,'N','N',1.d0,0.d0)
++    CALL DGEMM(shalfi,dmat,dummy,'T','N',1.d0,0.d0)
++    CALL DGEMM(dummy,shalfi,dmat,'N','N',1.d0,0.d0)
+     ! get the normal eigenvalues and vectors
+     call jacobi(dmat,n1,n1,dvals,dvecs,nrot)
+     ! transform the eigenvectors BACK to the original coordinate system
+     !dvecs = MATMUL(shalfi, dvecs)
+     dummy = dvecs
+-    CALL DGEMM_MKL95(shalfi,dummy,dvecs,'N','N',1.d0,0.d0)
++    CALL DGEMM(shalfi,dummy,dvecs,'N','N',1.d0,0.d0)
+     CALL eigsrt(dvals,dvecs,n1,n1)
+ 
+     !WRITE(6,*)'Eigenvalues'
+@@ -294,7 +294,7 @@
+   END SUBROUTINE diag_general
+ 
+   FUNCTION matinv_real(dmat)
+-    USE MKL95_LAPACK
++    USE LAPACK95
+     IMPLICIT NONE
+     REAL*8 , DIMENSION(:,:) :: dmat
+     REAL*8 , DIMENSION(SIZE(dmat,1),SIZE(dmat,2)) :: matinv_real
+@@ -306,12 +306,12 @@
+     IF (n1.NE.n2) STOP 'Attempting to invert a non-square matrix'
+ 
+     matinv_real=dmat
+-    CALL DGETRF_MKL95(matinv_real,ipiv,info)
+-    CALL DGETRI_MKL95(matinv_real,ipiv,info)
++    CALL DGETRF(matinv_real,ipiv,info)
++    CALL DGETRI(matinv_real,ipiv,info)
+   END FUNCTION matinv_real
+ 
+   FUNCTION matinv_complex(cmat)
+-    USE MKL95_LAPACK
++    USE LAPACK95
+     IMPLICIT NONE
+     COMPLEX*16 , DIMENSION(:,:) :: cmat
+     COMPLEX*16 , DIMENSION(SIZE(cmat,1),SIZE(cmat,2)) :: matinv_complex
+@@ -328,7 +328,7 @@
+ 
+ 
+     !evecs = cmat
+-    !CALL ZHEEV_MKL95(evecs,evals,'V','U',INFO)
++    !CALL ZHEEV(evecs,evals,'V','U',INFO)
+     !DO info=1,SIZE(evals,1)
+     !   WRITE(6,'(F10.5)')evals(info)
+     !ENDDO
+@@ -337,8 +337,8 @@
+ 
+ 
+     matinv_complex=cmat
+-    CALL ZGETRF_MKL95(matinv_complex,ipiv,info)
+-    CALL ZGETRI_MKL95(matinv_complex,ipiv,info)
++    CALL ZGETRF(matinv_complex,ipiv,info)
++    CALL ZGETRI(matinv_complex,ipiv,info)
+   END FUNCTION matinv_complex
+ 
+   FUNCTION outer_product(x,y)
+@@ -351,7 +351,7 @@
+ 
+ !Fortran 90 wrappers for diag routines
+   SUBROUTINE matdiag_real(dmat,evals,evecs)
+-    USE MKL95_LAPACK
++    USE LAPACK95
+     IMPLICIT NONE
+     REAL*8 , DIMENSION(:,:) :: dmat
+     REAL*8 , DIMENSION(SIZE(dmat,1)) :: evals
+@@ -363,7 +363,7 @@
+     IF (n1.NE.n2) STOP 'Attempting to diagonalize a non-square matrix'
+ 
+     evecs=dmat
+-    !CALL dsyev_mkl95(evecs,evals,'V','U',info)
++    !CALL dsyev(evecs,evals,'V','U',info)
+     CALL diag(dmat,n1,n1,evals,evecs)
+ 
+     !WRITE(6,*)'using real symmetrizing routine'
+@@ -373,7 +373,7 @@
+   END SUBROUTINE matdiag_real
+ 
+   SUBROUTINE matdiag_complex(cmat,evals,evecs)
+-    USE MKL95_LAPACK
++    USE LAPACK95
+     IMPLICIT NONE
+     COMPLEX*16 , DIMENSION(:,:) :: cmat
+     REAL*8 , DIMENSION(SIZE(cmat,1)) :: evals
+@@ -389,11 +389,11 @@
+ 
+     evecs=cmat
+ 
+-    CALL zheev_mkl95(evecs,evals,'V','U',info)
++    CALL zheev(evecs,evals,'V','U',info)
+     IF (info.NE.0) STOP 'Error in matdiag_complex'
+ 
+     !dummy=cmat
+-    !CALL ZGESVD_MKL95(dummy,sing_value,u_matrix,v_matrix)
++    !CALL ZGESVD(dummy,sing_value,u_matrix,v_matrix)
+ 
+ 
+     !IF( evals(1) .LE. -1.d-13 )WRITE(6,*)'WHOOOOOOOOOAAAAAAAAAAAAAAA!!!   Negative eigenvalues'
+@@ -436,31 +436,31 @@
+   END FUNCTION matiden
+ 
+   FUNCTION matunitary_trans_real(A,U) RESULT(Ap)
+-    USE MKL95_BLAS
++    USE BLAS95
+     IMPLICIT NONE
+     REAL*8,DIMENSION(:,:) :: A,U
+     REAL*8,DIMENSION(SIZE(U,1),SIZE(U,1)) :: Ap
+     REAL*8,DIMENSION(SIZE(A,1),SIZE(U,1)) :: dummy
+ 
+     !Ap=MATMUL(U,MATMUL(A,TRANSPOSE(U)))
+-    CALL DGEMM_MKL95(A,U,dummy,'N','T',1.d0,0.d0)
+-    CALL DGEMM_MKL95(U,dummy,Ap,'N','N',1.d0,0.d0)
++    CALL DGEMM(A,U,dummy,'N','T',1.d0,0.d0)
++    CALL DGEMM(U,dummy,Ap,'N','N',1.d0,0.d0)
+   END FUNCTION matunitary_trans_real
+ 
+   FUNCTION matunitary_trans_complex(A,U) RESULT(Ap)
+-    USE MKL95_BLAS
++    USE BLAS95
+     IMPLICIT NONE
+     COMPLEX*16,DIMENSION(:,:) :: A,U
+     COMPLEX*16,DIMENSION(SIZE(U,1),SIZE(U,1)) :: Ap
+     COMPLEX*16,DIMENSION(SIZE(A,1),SIZE(U,1)) :: dummy
+ 
+     !Ap=MATMUL(U,MATMUL(A,CONJG(TRANSPOSE(U))))
+-    CALL ZGEMM_MKL95(A,U,dummy,'N','C',(1.d0,0.d0),(0.d0,0.d0))
+-    CALL ZGEMM_MKL95(U,dummy,Ap,'N','N',(1.d0,0.d0),(0.d0,0.d0))
++    CALL ZGEMM(A,U,dummy,'N','C',(1.d0,0.d0),(0.d0,0.d0))
++    CALL ZGEMM(U,dummy,Ap,'N','N',(1.d0,0.d0),(0.d0,0.d0))
+   END FUNCTION matunitary_trans_complex
+ 
+   FUNCTION matunitary_trans_complex2(A,U) RESULT(Ap)
+-    USE MKL95_BLAS
++    USE BLAS95
+     IMPLICIT NONE
+     COMPLEX*16,DIMENSION(:,:) :: A
+     REAL*8,DIMENSION(:,:) :: U
+@@ -470,8 +470,8 @@
+ 
+     U_comp = U
+     !Ap=MATMUL(U,MATMUL(A,TRANSPOSE(U)))
+-    CALL ZGEMM_MKL95(A,U_comp,dummy,'N','C',(1.d0,0.d0),(0.d0,0.d0))
+-    CALL ZGEMM_MKL95(U_comp,dummy,Ap,'N','N',(1.d0,0.d0),(0.d0,0.d0))
++    CALL ZGEMM(A,U_comp,dummy,'N','C',(1.d0,0.d0),(0.d0,0.d0))
++    CALL ZGEMM(U_comp,dummy,Ap,'N','N',(1.d0,0.d0),(0.d0,0.d0))
+   END FUNCTION matunitary_trans_complex2
+ 
+   
+diff -ru periodic_nbo.orig/nbo.f90 periodic_nbo/nbo.f90
+--- periodic_nbo.orig/nbo.f90	2015-03-04 18:06:25.000000000 +0100
++++ periodic_nbo/nbo.f90	2016-05-12 09:55:32.463039731 +0200
+@@ -1,6 +1,6 @@
+ MODULE nbo
+   USE nbo_shared
+-  USE MKL95_BLAS
++  USE BLAS95
+   PRIVATE
+   PUBLIC :: do_nbo, output
+ 
+@@ -336,7 +336,7 @@
+                   !IF( jg /= ig )Pi = Pi - outer_product(bond_coeff(:,2*ibondorlp+1-inbo,jg),bond_coeff(:,2*ibondorlp+1-inbo,jg))
+                   !proj_dummy = P
+                   !P = MATMUL(Pi,P)
+-                  !CALL DGEMM_MKL95(Pi,proj_dummy,P,'N','N',1.d0,0.d0)
++                  !CALL DGEMM(Pi,proj_dummy,P,'N','N',1.d0,0.d0)
+ 
+                   rhoat=0.d0
+                   rhoat(iifirst:iilast,iifirst:iilast)=inp%rho0(ifirst:ilast,ifirst:ilast,ig,ispin)
+@@ -379,8 +379,8 @@
+ 
+       !Now project out all of the bonding and antibonding density, to leave solely the dentisy associated with Rydberg states
+       !inp%rho0(:,:,1) = MATMUL(P,(MATMUL(inp%rho0(:,:,1),P)))
+-      !CALL DGEMM_MKL95(inp%rho0(:,:,1),P,proj_dummy,'N','N',1.d0,0.d0)
+-      !CALL DGEMM_MKL95(P,proj_dummy,inp%rho0(:,:,1),'N','N',1.d0,0.d0)
++      !CALL DGEMM(inp%rho0(:,:,1),P,proj_dummy,'N','N',1.d0,0.d0)
++      !CALL DGEMM(P,proj_dummy,inp%rho0(:,:,1),'N','N',1.d0,0.d0)
+ 
+ 
+       !PRINT *, 'made it to doing rydberg search'
+@@ -552,7 +552,7 @@
+          Pi=Pi-outer_product(lpcontrib,lpcontrib)
+          Pdummy=P
+          !P=MATMUL(Pi,P)
+-         CALL DGEMM_MKL95(Pi,Pdummy,P,'N','N',1.d0,0.d0)
++         CALL DGEMM(Pi,Pdummy,P,'N','N',1.d0,0.d0)
+ 
+          !IF( occ > core_thresh*DBLE(3-inp%nspins) )THEN
+          !   PRINT *, 'Removing CR from atom',iatom
+@@ -563,8 +563,8 @@
+       !PRINT *
+ 
+       !inp%rho0(:,:,1) = MATMUL(P,(MATMUL(inp%rho0(:,:,1),P)))
+-      CALL DGEMM_MKL95(inp%rho0(:,:,1,ispin),P,Pdummy,'N','N',1.d0,0.d0)
+-      CALL DGEMM_MKL95(P,Pdummy,inp%rho0(:,:,1,ispin),'N','N',1.d0,0.d0)
++      CALL DGEMM(inp%rho0(:,:,1,ispin),P,Pdummy,'N','N',1.d0,0.d0)
++      CALL DGEMM(P,Pdummy,inp%rho0(:,:,1,ispin),'N','N',1.d0,0.d0)
+ 
+ 
+     END SUBROUTINE do_1c_search
+@@ -966,7 +966,7 @@
+ 
+     FUNCTION schmidt_orthog_matrix(S,n) RESULT(Os)
+       USE matutil
+-      USE MKL95_BLAS
++      USE BLAS95
+       IMPLICIT NONE
+       REAL*8,DIMENSION(:,:) :: S
+       REAL*8,DIMENSION(n,n) :: Sinv
+@@ -981,7 +981,7 @@
+       !onto the remaining basis function n+1:nbasis
+       Sinv=matinv(S(1:n,1:n))
+       !proj=MATMUL(Sinv,S(1:n,n+1:nbasis))
+-      CALL DGEMM_MKL95(Sinv,S(1:n,n+1:nbasis),proj,'N','N',1.d0,0.d0)
++      CALL DGEMM(Sinv,S(1:n,n+1:nbasis),proj,'N','N',1.d0,0.d0)
+ 
+       !Now do gs orthogonalization using those projections
+       Os=0.d0
+diff -ru periodic_nbo.orig/nbo_shared.f90 periodic_nbo/nbo_shared.f90
+--- periodic_nbo.orig/nbo_shared.f90	2015-03-04 18:06:25.000000000 +0100
++++ periodic_nbo/nbo_shared.f90	2016-05-12 09:55:32.463039731 +0200
+@@ -151,7 +151,7 @@
+   !Calculates the number of electrons in the unit cell
+   !
+   SUBROUTINE calc_nelec(inp,is_orthog)
+-    USE MKL95_BLAS
++    USE BLAS95
+     USE matutil
+     IMPLICIT NONE
+     TYPE(nbo_input) :: inp
+@@ -167,9 +167,9 @@
+ 
+     DO ispin=1,inp%nspins
+        DO ik=1,nk
+-          CALL ZGEMM_MKL95(inp%rhok(:,:,ik,ispin),inp%sk(:,:,ik),nelec_dummy,'N','C',(1.d0,0.d0),(0.d0,0.d0))
++          CALL ZGEMM(inp%rhok(:,:,ik,ispin),inp%sk(:,:,ik),nelec_dummy,'N','C',(1.d0,0.d0),(0.d0,0.d0))
+           nelec=nelec+inp%kpt_wt(ik)*mattrace(nelec_dummy) 
+-          CALL ZGEMM_MKL95(inp%rhok(:,:,ik,ispin),inp%fockk(:,:,ik,ispin),nelec_dummy,'N','C',(1.d0,0.d0),(0.d0,0.d0))
++          CALL ZGEMM(inp%rhok(:,:,ik,ispin),inp%fockk(:,:,ik,ispin),nelec_dummy,'N','C',(1.d0,0.d0),(0.d0,0.d0))
+           nenergy=nenergy+inp%kpt_wt(ik)*mattrace(nelec_dummy)
+        ENDDO
+     ENDDO
+diff -ru periodic_nbo.orig/periodic_matutil.f90 periodic_nbo/periodic_matutil.f90
+--- periodic_nbo.orig/periodic_matutil.f90	2015-03-04 18:06:25.000000000 +0100
++++ periodic_nbo/periodic_matutil.f90	2016-05-12 09:55:32.463039731 +0200
+@@ -41,7 +41,7 @@
+   !Multiples two periodic matrices.
+   !
+   FUNCTION periodic_matmul(a,b) RESULT(c)
+-    USE MKL95_BLAS
++    USE BLAS95
+     IMPLICIT NONE
+     REAL*8,DIMENSION(:,:,:), INTENT(in) :: a,b
+     REAL*8,DIMENSION(SIZE(a,1),SIZE(a,2),SIZE(a,3)) :: c
+@@ -101,7 +101,7 @@
+ !$OMP END CRITICAL
+           IF (idg.GT.0.AND.normab.GT.thresh) THEN
+ !             c(:,:,ig)=c(:,:,ig)+MATMUL(a(:,:,igp),b(:,:,idg))
+-             CALL DGEMM_MKL95(a(:,:,igp),b(:,:,idg),c(:,:,ig),'N','N',1.d0,1.d0)
++             CALL DGEMM(a(:,:,igp),b(:,:,idg),c(:,:,ig),'N','N',1.d0,1.d0)
+ !$OMP CRITICAL
+              imul=imul+1
+ !$OMP END CRITICAL
+@@ -118,7 +118,7 @@
+   END FUNCTION periodic_matmul
+ 
+   FUNCTION periodic_matvecmul(a,b) RESULT(c)
+-    USE MKL95_BLAS
++    USE BLAS95
+     IMPLICIT NONE
+     REAL*8,DIMENSION(:,:,:), INTENT(in) :: a
+     REAL*8,DIMENSION(:,:), INTENT(IN)   :: b
+@@ -165,7 +165,7 @@
+           IF (idg.GT.0) THEN
+              !WRITE(6,*)'non zero matrix',idg,indexg(:,idg)
+              c(:,ig)=c(:,ig)+MATMUL(a(:,:,idg),b(:,igp))
+-             !CALL DGEMM_MKL95(a(:,:,igp),b(:,:,idg),c(:,:,ig),'N','N',1.d0,1.d0)
++             !CALL DGEMM(a(:,:,igp),b(:,:,idg),c(:,:,ig),'N','N',1.d0,1.d0)
+              imul=imul+1
+           ENDIF
+ 
+diff -ru periodic_nbo.orig/pre_nao.f90 periodic_nbo/pre_nao.f90
+--- periodic_nbo.orig/pre_nao.f90	2015-03-04 18:06:25.000000000 +0100
++++ periodic_nbo/pre_nao.f90	2016-05-12 10:18:03.939451000 +0200
+@@ -1,5 +1,5 @@
+ MODULE pre_nao
+-  USE MKL95_BLAS
++  USE BLAS95
+   PRIVATE
+   PUBLIC :: do_pre_nao
+ 
+@@ -18,7 +18,7 @@
+     USE matutil
+     USE periodic_matutil
+     USE nbo_shared
+-    USE mkl95_LAPACK
++    USE LAPACK95
+     IMPLICIT NONE
+ 
+     TYPE(nbo_input) :: inp
+@@ -135,9 +135,9 @@
+     num_elec = 0.d0
+     DO ispin=1,nspins
+        DO ik=1,nk
+-          CALL ZGEMM_MKL95(inp%rhok(:,:,ik,ispin),inp%fockk(:,:,ik,ispin),energy_test,'N','C',(1.d0,0.d0),(0.d0,0.d0))
++          CALL ZGEMM(inp%rhok(:,:,ik,ispin),inp%fockk(:,:,ik,ispin),energy_test,'N','C',(1.d0,0.d0),(0.d0,0.d0))
+           energy_sum = energy_sum + inp%kpt_wt(ik)*mattrace(energy_test)
+-          !CALL ZGEMM_MKL95(inp%rhok(:,:,ik,ispin),sk(:,:,ik),elec_test,'N','C',(1.d0,0.d0),(0.d0,0.d0))
++          !CALL ZGEMM(inp%rhok(:,:,ik,ispin),sk(:,:,ik),elec_test,'N','C',(1.d0,0.d0),(0.d0,0.d0))
+           num_elec = num_elec + inp%kpt_wt(ik)*mattrace(inp%rhok(:,:,ik,ispin))  !sk should be the identity matrix now
+        ENDDO
+     ENDDO
+@@ -193,8 +193,8 @@
+ !$OMP PARALLEL DEFAULT(PRIVATE) SHARED(nk,rhok,sk)
+ !$OMP DO SCHEDULE(STATIC)
+       DO ik=1,nk
+-         CALL ZGEMM_MKL95(rhok(:,:,ik),sk(:,:,ik),dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
+-         CALL zGEMM_MKL95(sk(:,:,ik),dummy,rhok(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
++         CALL ZGEMM(rhok(:,:,ik),sk(:,:,ik),dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
++         CALL zGEMM(sk(:,:,ik),dummy,rhok(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
+       ENDDO
+ !$OMP END DO NOWAIT
+ !$OMP END PARALLEL
+@@ -298,7 +298,7 @@
+          sk(:,:,ik)=matunitary_trans(sk(:,:,ik),TRANSPOSE(N))
+          rhok(:,:,ik)=matunitary_trans(rhok(:,:,ik),TRANSPOSE(N))
+          dummy = idenk(:,:,ik)
+-         CALL ZGEMM_MKL95(N,dummy,idenk(:,:,ik),'C','N',(1.d0,0.d0),(0.d0,0.d0))
++         CALL ZGEMM(N,dummy,idenk(:,:,ik),'C','N',(1.d0,0.d0),(0.d0,0.d0))
+       ENDDO
+ !$OMP END DO NOWAIT
+ !$OMP END PARALLEL
+@@ -365,7 +365,7 @@
+          sk(:,:,ik)=matunitary_trans(sk(:,:,ik),Os)
+          rhok(:,:,ik)=matunitary_trans(rhok(:,:,ik),Os)
+          dummy = idenk(:,:,ik)
+-         CALL ZGEMM_MKL95(Os,dummy,idenk(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
++         CALL ZGEMM(Os,dummy,idenk(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
+ 
+       !Step 3c:  Restoration of natural character of NRB
+       !(Omitted; doesn't seem important at all)
+@@ -451,7 +451,7 @@
+          sk(:,:,ik)=matunitary_trans(sk(:,:,ik),Ow)
+          rhok(:,:,ik)=matunitary_trans(rhok(:,:,ik),Ow)
+          dummy = idenk(:,:,ik)
+-         CALL ZGEMM_MKL95(Ow,dummy,idenk(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
++         CALL ZGEMM(Ow,dummy,idenk(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
+ 
+          !WRITE(6,*)'hi occ ryd orthog'
+ 
+@@ -461,7 +461,7 @@
+          sk(:,:,ik)=matunitary_trans(sk(:,:,ik),Ow)
+          rhok(:,:,ik)=matunitary_trans(rhok(:,:,ik),Ow)
+          dummy = idenk(:,:,ik)
+-         CALL ZGEMM_MKL95(Ow,dummy,idenk(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
++         CALL ZGEMM(Ow,dummy,idenk(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
+ 
+          !Finally with the low occupancy NRB
+          !Here we first do a Gram-Schmidt orthogonalization of the low occupancy states to the remainder
+@@ -469,7 +469,7 @@
+          sk(:,:,ik)=matunitary_trans(sk(:,:,ik),Os)
+          rhok(:,:,ik)=matunitary_trans(rhok(:,:,ik),Os)
+          dummy = idenk(:,:,ik)
+-         CALL ZGEMM_MKL95(Os,dummy,idenk(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
++         CALL ZGEMM(Os,dummy,idenk(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
+ 
+          !WRITE(6,*)'lo occ ryd orthog'
+ 
+@@ -480,7 +480,7 @@
+          sk(:,:,ik)=matunitary_trans(sk(:,:,ik),Ow)
+          rhok(:,:,ik)=matunitary_trans(rhok(:,:,ik),Ow)
+          dummy = idenk(:,:,ik)
+-         CALL ZGEMM_MKL95(Ow,dummy,idenk(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
++         CALL ZGEMM(Ow,dummy,idenk(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
+ 
+          !Now restore the expected order of the basis functions
+          sk(:,:,ik)=remap_matrix(sk(:,:,ik),irydbasisremap,.TRUE.)
+@@ -656,7 +656,7 @@
+       !onto the remaining basis function n+1:nbasis
+       Sinv=matinv(S(1:n,1:n))
+       !proj=MATMUL(Sinv,S(1:n,n+1:nbasis))
+-      CALL ZGEMM_MKL95(Sinv,S(1:n,n+1:nbasis),proj,'N','N',(1.d0,0.d0),(0.d0,0.d0))
++      CALL ZGEMM(Sinv,S(1:n,n+1:nbasis),proj,'N','N',(1.d0,0.d0),(0.d0,0.d0))
+ 
+       !Now do gs orthogonalization using those projections
+       Os=0.d0
+@@ -707,7 +707,7 @@
+       nbasis=SIZE(N,1)
+       IF (PRESENT(S)) THEN
+          !overlap=MATMUL(matsqrt(S),N)
+-         CALL DGEMM_MKL95(matsqrt(S),N,overlap,'N','N',1.d0,0.d0)
++         CALL DGEMM(matsqrt(S),N,overlap,'N','N',1.d0,0.d0)
+       ELSE
+          overlap=N
+       ENDIF
diff --git a/easybuild/easyconfigs/n/NBO/projection-1.1.2_MKL95.patch b/easybuild/easyconfigs/n/NBO/projection-1.1.2_MKL95.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f12e3ac7a405553732051708568d60d0b9c23681
--- /dev/null
+++ b/easybuild/easyconfigs/n/NBO/projection-1.1.2_MKL95.patch
@@ -0,0 +1,212 @@
+fix using BLAS95/LAPACK95 interface for recent Intel MKL versions
+author: Kenneth Hoste (HPC-UGent)
+diff -ru projection.orig/bloch_overlap.f90 projection/bloch_overlap.f90
+--- projection.orig/bloch_overlap.f90	2015-04-15 18:05:39.000000000 +0200
++++ projection/bloch_overlap.f90	2016-05-12 13:58:53.000000000 +0200
+@@ -18,8 +18,8 @@
+ ! Kudin and Scuseria, Chem. Phys. Lett.; 289, 611-616 (1998)
+ 
+ SUBROUTINE bloch_space_overlap(AO_basis,index_l)
+-  USE mkl95_lapack
+-  USE mkl95_blas
++  USE LAPACK95
++  USE BLAS95
+   IMPLICIT NONE
+ 
+   TYPE(AO_function), DIMENSION(:) :: AO_basis
+@@ -189,9 +189,9 @@
+       bloch_s_inv(:,:,ik) = bloch_s_mat(:,:,ik)
+       IF( SVD )THEN
+          !SVD inversion method, more robust but slow
+-         CALL ZGESVD_MKL95(bloch_s_inv(:,:,ik),sing_value,u_matrix,v_matrix,work_array,'A')
++         CALL ZGESVD(bloch_s_inv(:,:,ik),sing_value,u_matrix,v_matrix,work_array,'A')
+          !Previously used SVD routine, has numerical instability wrt really small values
+-         !CALL ZGESDD_MKL95(bloch_s_inv(:,:,ik),sing_value,u_matrix,v_matrix,'A')
++         !CALL ZGESDD(bloch_s_inv(:,:,ik),sing_value,u_matrix,v_matrix,'A')
+   
+          !This loop is the equivalent of multiplying the inverse of the singular values matrix by adjoint of the u matrix
+          DO j=1,s_dim
+@@ -202,16 +202,16 @@
+                inv_dummy(j,:) = 0.d0
+             ENDIF
+          ENDDO
+-         CALL ZGEMM_MKL95(v_matrix,inv_dummy,bloch_s_inv(:,:,ik),'C','N',(1.d0,0.d0),(0.d0,0.d0))
++         CALL ZGEMM(v_matrix,inv_dummy,bloch_s_inv(:,:,ik),'C','N',(1.d0,0.d0),(0.d0,0.d0))
+       ELSE
+          !LU decompostion inversion method, fast but easily suffers from instability due to linear dependency
+-         CALL ZGETRF_MKL95(bloch_s_inv(:,:,ik),IPIV,INFO)
++         CALL ZGETRF(bloch_s_inv(:,:,ik),IPIV,INFO)
+          IF( INFO /= 0 )THEN
+             WRITE(6,*)'The inverese of the overlap matrix for kpt',ik,'could not be computed'
+             WRITE(6,*)'INFO value output from ZGETRF',INFO
+             STOP
+          ENDIF
+-         CALL ZGETRI_MKL95(bloch_s_inv(:,:,ik),IPIV)
++         CALL ZGETRI(bloch_s_inv(:,:,ik),IPIV)
+       ENDIF
+ 
+       !WRITE(6,*)'inverse for kpoint',ik
+@@ -248,7 +248,7 @@
+ !IF there are linear dependencies the best bet is to just 'trim' the basis set of its most diffuse functions.
+ !In periodic systems there is no 'edge' and these diffuse functions are largely uneccessary.
+ SUBROUTINE check_linear_depend(input_mat,eig_min)
+-  USE mkl95_lapack
++  USE LAPACK95
+   IMPLICIT NONE
+ 
+   COMPLEX*16,DIMENSION(:,:),INTENT(IN)  ::  input_mat
+@@ -262,7 +262,7 @@
+ 
+   test_mat = input_mat
+ 
+-  CALL ZHEEV_MKL95(test_mat,eigval,'V','U',INFO)
++  CALL ZHEEV(test_mat,eigval,'V','U',INFO)
+ 
+   IF( INFO .NE. 0 )THEN
+      WRITE(6,*)'Calculating eigenvalues in check_linear_depend failed'
+diff -ru projection.orig/projection_main.f90 projection/projection_main.f90
+--- projection.orig/projection_main.f90	2015-03-04 17:07:27.000000000 +0100
++++ projection/projection_main.f90	2016-05-12 13:58:57.000000000 +0200
+@@ -4,7 +4,7 @@
+   USE rd_basis
+   USE bloch_overlap
+   USE PAW
+-  USE mkl95_blas
++  USE BLAS95
+   IMPLICIT NONE
+ 
+   CHARACTER(128)  ::  basis_fn, VASP_fn, NBO_fn
+@@ -145,28 +145,28 @@
+         !Then for each basis function, nu, the contribution of the planewaves is calculated for all bands at one using vector-matrix multiplication
+         DO ispin=1,nspins
+            !each computation is SUM(nu) S-1{mu,nu} * (SUM(g) <nu|g>*c(a,g))
+-           CALL ZGEMV_MKL95(pw_coeff(:,:,ik,ispin),AO_PW_overlap(:,ik),proj_matrix(nu,:,ik,ispin),(1.d0,0.d0),(0.d0,0.d0),'T')
++           CALL ZGEMV(pw_coeff(:,:,ik,ispin),AO_PW_overlap(:,ik),proj_matrix(nu,:,ik,ispin),(1.d0,0.d0),(0.d0,0.d0),'T')
+         ENDDO
+      ENDDO
+ 
+      DO ispin=1,nspins
+ !        !Calculation of planewave contributions to band coeff's are done at once using matrix multiplication
+ !        !each computation is SUM(nu) S-1{mu,nu} * (SUM(g) <nu|g>*c(a,g))
+-!        CALL ZGEMM_MKL95(AO_PW_overlap(:,:,ik),pw_coeff(:,:,ik,ispin),proj_matrix(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
++!        CALL ZGEMM(AO_PW_overlap(:,:,ik),pw_coeff(:,:,ik,ispin),proj_matrix(:,:,ik),'N','N',(1.d0,0.d0),(0.d0,0.d0))
+ !
+ !        !Since band is simply summation of PW AND PAW, PAW contirbution is simply added to PW's
+-!        IF( PAW_pseudo )  CALL ZGEMM_MKL95(PAW_overlap(:,:,ik),PAW_coeff(:,:,ik,ispin),proj_matrix(:,:,ik),'N','N',(1.d0,0.d0),(1.d0,0.d0))
++!        IF( PAW_pseudo )  CALL ZGEMM(PAW_overlap(:,:,ik),PAW_coeff(:,:,ik,ispin),proj_matrix(:,:,ik),'N','N',(1.d0,0.d0),(1.d0,0.d0))
+ !
+ !        !Band overlaps are finally multiplied by inverse of overlap matrix to complete projection
+ !        !The use of the inverse of the overlap matrix is necessary due to the non-orthogonality of the AO-basis
+-!        CALL ZGEMM_MKL95(bloch_s_inv(:,:,ik),proj_matrix(:,:,ik),bloch_band_coeff(:,:,ik,ispin),'N','N',(1.d0,0.d0),(0.d0,0.d0))
++!        CALL ZGEMM(bloch_s_inv(:,:,ik),proj_matrix(:,:,ik),bloch_band_coeff(:,:,ik,ispin),'N','N',(1.d0,0.d0),(0.d0,0.d0))
+ 
+         !Since band is simply summation of PW AND PAW, PAW contirbution is simply added to PW's
+-        IF( PAW_pseudo )  CALL ZGEMM_MKL95(PAW_overlap(:,:,ik),PAW_coeff(:,:,ik,ispin),proj_matrix(:,:,ik,ispin),'N','N',(1.d0,0.d0),(1.d0,0.d0))
++        IF( PAW_pseudo )  CALL ZGEMM(PAW_overlap(:,:,ik),PAW_coeff(:,:,ik,ispin),proj_matrix(:,:,ik,ispin),'N','N',(1.d0,0.d0),(1.d0,0.d0))
+ 
+         !Band overlaps are finally multiplied by inverse of overlap matrix to complete projection
+         !The use of the inverse of the overlap matrix is necessary due to the non-orthogonality of the AO-basis
+-        CALL ZGEMM_MKL95(bloch_s_inv(:,:,ik),proj_matrix(:,:,ik,ispin),bloch_band_coeff(:,:,ik,ispin),'N','N',(1.d0,0.d0),(0.d0,0.d0))
++        CALL ZGEMM(bloch_s_inv(:,:,ik),proj_matrix(:,:,ik,ispin),bloch_band_coeff(:,:,ik,ispin),'N','N',(1.d0,0.d0),(0.d0,0.d0))
+ 
+      ENDDO
+ 
+@@ -208,19 +208,19 @@
+            coeff_dummy(:,iband) = bloch_band_coeff(:,iband,ik,ispin) * weight(iband,ik,ispin)
+         ENDDO
+         !Matrix muliplication is used to calculate the density matrix
+-        CALL ZGEMM_MKL95(coeff_dummy,bloch_band_coeff(:,:,ik,ispin),bloch_density(:,:,ik,ispin),'N','C',(1.d0,0.d0),(0.d0,0.d0))
++        CALL ZGEMM(coeff_dummy,bloch_band_coeff(:,:,ik,ispin),bloch_density(:,:,ik,ispin),'N','C',(1.d0,0.d0),(0.d0,0.d0))
+ 
+         !FOCK MATRIX
+         !Matrix multiplication is used to convert the Fock matrix into the projected basis
+         ! F{mu,nu} = SUM(fock_coeff{nu,iband}*F{iband,iband}*CONJG(fock_coeff{nu,iband}))
+         !First the nonorthogonality of the bloch orbtials must be addressed since the MO->AO transform is not unitary 
+         !coeff's must be multiplied by Overlap matrix
+-        CALL ZGEMM_MKL95(bloch_s_mat(:,:,ik),bloch_band_coeff(:,:,ik,ispin),coeff_dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
++        CALL ZGEMM(bloch_s_mat(:,:,ik),bloch_band_coeff(:,:,ik,ispin),coeff_dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
+         !Then the trnsformation is simply a unitary transform using the new coefficients
+         DO iband=1,nbands
+            fock_dummy(iband,:) = eig(iband,ik,ispin)*CONJG(coeff_dummy(:,iband))
+         ENDDO
+-        CALL ZGEMM_MKL95(coeff_dummy,fock_dummy,bloch_fock(:,:,ik,ispin),'N','N',(1.d0,0.d0),(0.d0,0.d0))
++        CALL ZGEMM(coeff_dummy,fock_dummy,bloch_fock(:,:,ik,ispin),'N','N',(1.d0,0.d0),(0.d0,0.d0))
+      ENDDO
+   ENDDO
+ 
+@@ -235,12 +235,12 @@
+   energy_sum = 0.d0
+   DO ispin=1,nspins
+      DO ik=1,nkpts
+-        CALL ZGEMM_MKL95(bloch_density(:,:,ik,ispin),bloch_s_mat(:,:,ik),n_elec_dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
++        CALL ZGEMM(bloch_density(:,:,ik,ispin),bloch_s_mat(:,:,ik),n_elec_dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
+         n_elec_dummy = n_elec_dummy*kpt_wt(ik)
+         DO nu=1,s_dim
+            num_elec = num_elec + n_elec_dummy(nu,nu)
+         ENDDO
+-        CALL ZGEMM_MKL95(bloch_density(:,:,ik,ispin),bloch_fock(:,:,ik,ispin),n_elec_dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
++        CALL ZGEMM(bloch_density(:,:,ik,ispin),bloch_fock(:,:,ik,ispin),n_elec_dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
+         n_elec_dummy = n_elec_dummy*kpt_wt(ik)
+         DO nu=1,s_dim
+            energy_sum = energy_sum + n_elec_dummy(nu,nu)
+@@ -271,7 +271,7 @@
+ !This subrotuine computes the overlap matrices of the projected bands in the AO basis.
+ !This information is also used to calculate the spillover (quantify how much of band density is lost in projection
+ SUBROUTINE calc_spillover(r_mat,band_coeff)
+-  USE mkl95_blas
++  USE BLAS95
+   USE rd_wavefunction
+   USE projection_shared
+   IMPLICIT NONE
+@@ -345,8 +345,8 @@
+ 
+      !Overlap of projected bands is computed using matrix mulitplication
+      !Each overlap is equal to SUM(mu) SUM(nu) c*S{mu,nu}c
+-     CALL ZGEMM_MKL95(bloch_s_mat(:,:,ik),band_coeff(:,:,ik,ispin),r_mat_dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
+-     CALL ZGEMM_MKL95(band_coeff(:,:,ik,ispin),r_mat_dummy,r_mat(:,:,ik,ispin),'C','N',(1.d0,0.d0),(0.d0,0.d0))
++     CALL ZGEMM(bloch_s_mat(:,:,ik),band_coeff(:,:,ik,ispin),r_mat_dummy,'N','N',(1.d0,0.d0),(0.d0,0.d0))
++     CALL ZGEMM(band_coeff(:,:,ik,ispin),r_mat_dummy,r_mat(:,:,ik,ispin),'C','N',(1.d0,0.d0),(0.d0,0.d0))
+ 
+ 
+      !Then the norm of each band at each k-point is analyzed to make sure the norm is appropriate
+diff -ru projection.orig/projection_shared.f90 projection/projection_shared.f90
+--- projection.orig/projection_shared.f90	2015-04-15 17:50:44.000000000 +0200
++++ projection/projection_shared.f90	2016-05-12 13:59:00.000000000 +0200
+@@ -94,8 +94,8 @@
+ !The bands are in the same original AO basis
+ !The orhtogonalizing matrix is constructed as W(WSW)^-1/2, where S is the 'overlap_mat' and W is a diagonal matrix containing the occupancy of each band
+ SUBROUTINE do_OWSO(overlap_mat,band_occ,band_coeff)
+-  USE mkl95_BLAS
+-  USE mkl95_LAPACK
++  USE BLAS95
++  USE LAPACK95
+   IMPLICIT NONE
+ 
+   COMPLEX*16,DIMENSION(:,:),INTENT(IN)    ::  overlap_mat  !Input overlap matrix, used to construct orthogonalizing matrix
+@@ -145,7 +145,7 @@
+ 
+   !Now obtain the eigenvectors to obtain the square root matrix
+   eigvec = sym_weight
+-  CALL ZHEEV_MKL95(eigvec,eigval,'V','U',INFO)
++  CALL ZHEEV(eigvec,eigval,'V','U',INFO)
+   IF( INFO /= 0 )THEN
+      WRITE(6,*)'The eigenvalues of the overlap matrix could not be computed'
+      WRITE(6,*)'INFO on exit of ZHEEV',INFO
+@@ -156,7 +156,7 @@
+   DO iband=1,nbands
+      sym_weight(iband,:) = CONJG(eigvec(:,iband)) / SQRT(eigval(iband))  !Sym_weight is now just a dummy matrix for use in the BLAS routine
+   ENDDO
+-  CALL ZGEMM_MKL95(eigvec,sym_weight,sqrt_inv,'N','N',(1.d0,0.d0),(0.d0,0.d0))
++  CALL ZGEMM(eigvec,sym_weight,sqrt_inv,'N','N',(1.d0,0.d0),(0.d0,0.d0))
+ 
+ 
+   !To obtain the orthogonlaizing matrix an additional multiplication by the weight matrix must be applied from the left
+@@ -168,7 +168,7 @@
+   !Now the bands can finally be orhtogonalized
+   !Note that the original coefficients are lost. They are currently unused but this will have to be rewritten if they become necessary.
+   coeff_dummy = band_coeff
+-  CALL ZGEMM_MKL95(coeff_dummy,sqrt_inv,band_coeff,'N','N',(1.d0,0.d0),(0.d0,0.d0))
++  CALL ZGEMM(coeff_dummy,sqrt_inv,band_coeff,'N','N',(1.d0,0.d0),(0.d0,0.d0))
+ 
+ 
+ 
diff --git a/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-2015.06.eb
similarity index 93%
rename from easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-2015.06.eb
index f01696474882de502bcfdd202eca3de02b9b6d51..a33090c4b67324c26833505642c18ada54798863 100644
--- a/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-2015.06.eb
@@ -8,7 +8,7 @@ description = """The NFFT (nonequispaced fast Fourier transform or nonuniform fa
  library for computing the nonequispaced discrete Fourier transform (NDFT) and its generalisations in one or more
  dimensions, of arbitrary input size, and of complex data."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 
 source_urls = ['https://www-user.tu-chemnitz.de/~potts/nfft/download/']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-2015.11.eb
similarity index 93%
rename from easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-2015.11.eb
index 10957199be853104bf0d061cae04c6b221f3e3b4..c9ebfcb9f58fe9030b5f0b13de1eec6148e39a7b 100644
--- a/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/n/NFFT/NFFT-3.3.0-CrayGNU-2015.11.eb
@@ -8,7 +8,7 @@ description = """The NFFT (nonequispaced fast Fourier transform or nonuniform fa
  library for computing the nonequispaced discrete Fourier transform (NDFT) and its generalisations in one or more
  dimensions, of arbitrary input size, and of complex data."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 
 source_urls = ['https://www-user.tu-chemnitz.de/~potts/nfft/download/']
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/n/NGS-Python/NGS-Python-1.2.3-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/n/NGS-Python/NGS-Python-1.2.3-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..94dc61a1a7455ea4e9a7cbac9a7a1090774f52f2
--- /dev/null
+++ b/easybuild/easyconfigs/n/NGS-Python/NGS-Python-1.2.3-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,46 @@
+easyblock = 'ConfigureMake'
+
+name = 'NGS-Python'
+version = '1.2.3'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/ncbi/ngs'
+description = """NGS is a new, domain-specific API for accessing reads, alignments and pileups produced from
+ Next Generation Sequencing."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://github.com/ncbi/ngs/archive/']
+sources = ['%(version)s.tar.gz']
+
+patches = ['NGS-Python-%(version)s_fix-prefix.patch']
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('NGS', version),
+    ('ncbi-vdb', '2.5.8-1'),
+]
+
+preconfigopts = "cd ngs-python && "
+
+# override default of using $HOME/ncbi-outdir
+configopts = "--build-prefix=%(builddir)s/ncbi-outdir "
+
+configopts += "--with-ngs-sdk-prefix=$EBROOTNGS "
+configopts += "--with-ncbi-vdb-prefix=$EBROOTNCBIMINVDB"
+
+buildopts = 'CC="$CC -c" CPP="$CXX" CP="$CXX -c" -C ngs-python'
+installopts = "-C ngs-python"
+
+parallel = 1
+
+modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python2.7/site-packages', 'share/examples-python'],
+}
+
+sanity_check_commands = [('python', "-c 'import ngs'")]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/n/NGS-Python/NGS-Python-1.2.3_fix-prefix.patch b/easybuild/easyconfigs/n/NGS-Python/NGS-Python-1.2.3_fix-prefix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..60411ef54148bf00ab7b3e6a24f57a0db1cabdbb
--- /dev/null
+++ b/easybuild/easyconfigs/n/NGS-Python/NGS-Python-1.2.3_fix-prefix.patch
@@ -0,0 +1,13 @@
+correctly specify prefix to install NGS-Python package to
+author: Kenneth Hoste (HPC-UGent)
+--- ngs-1.2.3/ngs-python/Makefile.python.orig	2016-03-31 12:34:54.124551782 +0200
++++ ngs-1.2.3/ngs-python/Makefile.python	2016-03-31 12:37:01.515699327 +0200
+@@ -82,7 +82,7 @@
+    
+ else
+ 	@ echo "Installing ngs package..."
+-	@ python setup.py -q install --user
++	@ python setup.py -q install --prefix $(INST_PYTHONDIR)
+ endif
+ 
+ ifneq (, $(NGS_LIBDIR))
diff --git a/easybuild/easyconfigs/n/NGS/NGS-1.2.3-intel-2016a.eb b/easybuild/easyconfigs/n/NGS/NGS-1.2.3-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ed0e37836cc67fcff25845e7671997a38c189c22
--- /dev/null
+++ b/easybuild/easyconfigs/n/NGS/NGS-1.2.3-intel-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'NGS'
+version = '1.2.3'
+
+homepage = 'https://github.com/ncbi/ngs'
+description = """NGS is a new, domain-specific API for accessing reads, alignments and pileups produced from
+ Next Generation Sequencing."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://github.com/ncbi/ngs/archive/']
+sources = ['%(version)s.tar.gz']
+
+dependencies = [('Java', '1.8.0_77', '', True)]
+
+# override default of using $HOME/ncbi-outdir
+configopts = "--build-prefix=%(builddir)s/ncbi-outdir"
+
+buildopts = 'CC="$CC -c" CPP="$CXX" CP="$CXX -c" -C ngs-sdk && '
+buildopts += 'make CC="$CC -c" CPP="$CXX" CP="$CXX -c" -C ngs-java'
+
+installopts = "-C ngs-sdk && make install -C ngs-java"
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['jar/ngs-java.jar', ('lib/libngs-sdk.%s' % SHLIB_EXT, 'lib64/libngs-sdk.%s' % SHLIB_EXT),
+              ('lib/libngs-adapt-c++.a', 'lib64/libngs-adapt-c++.a'), ('lib/libngs-c++.a', 'lib64/libngs-c++.a')],
+    'dirs': ['include/ngs', 'share'],
+}
+
+modextrapaths = {'CLASSPATH': 'jar/ngs-java.jar'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/n/NiBabel/NiBabel-2.0.2-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/n/NiBabel/NiBabel-2.0.2-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..77bcd52bff6666a8d7805b7bf8e3a44ea9246ba4
--- /dev/null
+++ b/easybuild/easyconfigs/n/NiBabel/NiBabel-2.0.2-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,29 @@
+easyblock = 'PythonPackage'
+
+name = 'NiBabel'
+version = '2.0.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://nipy.github.io/nibabel'
+description = """NiBabel provides read/write access to some common medical and neuroimaging file formats,
+ including: ANALYZE (plain, SPM99, SPM2 and later), GIFTI, NIfTI1, NIfTI2, MINC1, MINC2, MGH and ECAT
+ as well as Philips PAR/REC. We can read and write Freesurfer geometry, and read Freesurfer morphometry and
+ annotation files. There is some very limited support for DICOM. NiBabel is the successor of PyNIfTI."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('PIL', '1.1.7', versionsuffix),
+    ('pydicom', '0.9.9', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': ['bin/nib-dicomfs', 'bin/nib-ls', 'bin/nib-nifti-dx', 'bin/parrec2nii'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/nibabel', 'lib/python%(pyshortver)s/site-packages/nisext'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/n/ncbi-vdb/ncbi-vdb-2.5.8-1-intel-2016a.eb b/easybuild/easyconfigs/n/ncbi-vdb/ncbi-vdb-2.5.8-1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4197805f9ea6b67a6e80af9e7dd039f6009b7ea4
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncbi-vdb/ncbi-vdb-2.5.8-1-intel-2016a.eb
@@ -0,0 +1,38 @@
+easyblock = 'ConfigureMake'
+
+name = 'ncbi-vdb'
+version = '2.5.8-1'
+
+homepage = 'https://github.com/ncbi/ncbi-vdb'
+description = """The SRA Toolkit and SDK from NCBI is a collection of tools and libraries for
+ using data in the INSDC Sequence Read Archives."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://github.com/ncbi/ncbi-vdb/archive/']
+sources = ['%(version)s.tar.gz']
+
+dependencies = [
+    ('libxml2', '2.9.3'),
+    ('file', '5.25'),  # provides libmagic
+    ('HDF5', '1.8.16'),
+    ('NGS', '1.2.3'),
+]
+
+# override default of using $HOME/ncbi-outdir
+configopts = "--build-prefix=%(builddir)s/ncbi-outdir "
+
+configopts += "--with-ngs-sdk-prefix=$EBROOTNGS --with-ngs-java-prefix=$EBROOTNGS "
+configopts += "--with-hdf5-prefix=$EBROOTHDF5 --with-xml2-prefix=$EBROOTLIBXML2"
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['include/ncbi-vdb/NGS.hpp', ('lib/libncbi-vdb.%s' % SHLIB_EXT, 'lib64/libncbi-vdb.%s' % SHLIB_EXT),
+              ('lib/libncbi-wvdb.%s' % SHLIB_EXT, 'lib64/libncbi-wvdb.%s' % SHLIB_EXT),
+              ('lib/libncbi-ngs-c++.a', 'lib64/libncbi-ngs-c++.a'), ('lib/libncbi-vdb.a', 'lib64/libncbi-vdb.a'),
+              ('lib/libncbi-wvdb.a', 'lib64/libncbi-wvdb.a')],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayGNU-2015.06.eb
similarity index 95%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayGNU-2015.06.eb
index f11ad3873e99f1816288e42bd3001560ffb6fd75..16fc4ff0eab78853521f9af2365a9f1b1414d8a7 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayGNU-2015.06.eb
@@ -8,7 +8,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
  and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and
  function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True}
 
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayGNU-2015.11.eb
similarity index 95%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayGNU-2015.11.eb
index 0c15e725f4e60a2f84b590da9c43f19d040f461b..cb88b8202daaea54b3a732a68828ffac6582f4df 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayGNU-2015.11.eb
@@ -8,7 +8,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
  and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and
  function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayIntel-2015.11-XC.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayIntel-2015.11.eb
similarity index 95%
rename from easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayIntel-2015.11-XC.eb
rename to easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayIntel-2015.11.eb
index 6caf9a9b85903ed3644a868b1a990090efb6c4f8..c1260d9ce2efc2a99e3ec4a2a3836116479ebaef 100644
--- a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayIntel-2015.11-XC.eb
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-CrayIntel-2015.11.eb
@@ -8,7 +8,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
  and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and
  function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses."""
 
-toolchain = {'name': 'CrayIntel', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayIntel', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
 source_urls = [GNU_SOURCE]
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolf-1.5.16.eb b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolf-1.5.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0d4841191f34069f7b085fca4af8e007c015bf37
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-5.9-goolf-1.5.16.eb
@@ -0,0 +1,36 @@
+easyblock = 'ConfigureMake'
+
+name = 'ncurses'
+version = '5.9'
+
+homepage = 'http://www.gnu.org/software/ncurses/'
+description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0,
+and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and
+function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['ncurses-%(version)s_configure_darwin.patch']
+
+configopts = [
+    # default build
+    '--with-shared --enable-overwrite',
+    # the UTF-8 enabled version (ncursesw)
+    '--with-shared --enable-overwrite --enable-ext-colors --enable-widec --includedir=%(installdir)s/include/ncursesw/'
+]
+
+libs = ["form", "menu", "ncurses", "panel"]
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ["captoinfo", "clear", "infocmp", "infotocap", "ncurses5-config",
+                                     "reset", "tabs", "tic", "toe", "tput", "tset"]] +
+             ['lib/lib%s%s.a' % (x, y) for x in libs for y in ['', '_g', 'w', 'w_g']] +
+             ['lib/lib%s%s.so' % (x, y) for x in libs for y in ['', 'w']] +
+             ['lib/libncurses++%s.a' % x for x in ['', 'w']],
+    'dirs': ['include', 'include/ncursesw'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/ncurses/ncurses-6.0-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/n/ncurses/ncurses-6.0-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7c1c8c34c6cf03d24cca678a2ba6004d4122b553
--- /dev/null
+++ b/easybuild/easyconfigs/n/ncurses/ncurses-6.0-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'ncurses'
+version = '6.0'
+
+homepage = 'http://www.gnu.org/software/ncurses/'
+description = """The Ncurses (new curses) library is a free software emulation of curses in System V Release 4.0,
+ and more. It uses Terminfo format, supports pads and color and multiple highlights and forms characters and
+ function-key mapping, and has all the other SYSV-curses enhancements over BSD Curses."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+configopts = [
+    # default build
+    '--with-shared --enable-overwrite',
+    # the UTF-8 enabled version (ncursesw)
+    '--with-shared --enable-overwrite --enable-ext-colors --enable-widec --includedir=%(installdir)s/include/ncursesw/'
+]
+
+libs = ["form", "menu", "ncurses", "panel"]
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ["captoinfo", "clear", "infocmp", "infotocap", "ncurses%(version_major)s-config",
+                                     "reset", "tabs", "tic", "toe", "tput", "tset"]] +
+             ['lib/lib%s%s.a' % (x, y) for x in libs for y in ['', '_g', 'w', 'w_g']] +
+             ['lib/lib%s%s.so' % (x, y) for x in libs for y in ['', 'w']] +
+             ['lib/libncurses++%s.a' % x for x in ['', 'w']],
+    'dirs': ['include', 'include/ncursesw'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/n/neon/neon-0.30.0-goolf-1.4.10.eb b/easybuild/easyconfigs/n/neon/neon-0.30.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2732f2ab74fd0ad6cdd80de3819e02b665dd7297
--- /dev/null
+++ b/easybuild/easyconfigs/n/neon/neon-0.30.0-goolf-1.4.10.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'neon'
+version = '0.30.0'
+
+homepage = 'http://www.webdav.org/neon/'
+description = "neon is an HTTP and WebDAV client library, with a C interface."
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [homepage]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('zlib', '1.2.7'),
+    ('libxml2', '2.9.1'),
+]
+
+configopts = "--with-libxml2"
+
+sanity_check_paths = {
+    'files': ["bin/neon-config", "lib/libneon.a"],
+    'dirs': ["include/neon"],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.4.2-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.4.2-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..80d70623d7ff4817fd92fa5ab9cf2d0990a51ae7
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.4.2-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,20 @@
+name = 'netCDF-Fortran'
+version = '4.4.2'
+
+homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
+description = """NetCDF (network Common Data Form) is a set of software libraries 
+ and machine-independent data formats that support the creation, access, and sharing of array-oriented 
+ scientific data."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [
+    'ftp://ftp.unidata.ucar.edu/pub/netcdf/',
+    'ftp://ftp.unidata.ucar.edu/pub/netcdf/old',
+]
+
+dependencies = [('netCDF', '4.3.3.1')]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.4.3-intel-2016a.eb b/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.4.3-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4b898dd0feac937001b12a674297b9e158f33150
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF-Fortran/netCDF-Fortran-4.4.3-intel-2016a.eb
@@ -0,0 +1,19 @@
+name = 'netCDF-Fortran'
+version = '4.4.3'
+
+homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
+description = """NetCDF (network Common Data Form) is a set of software libraries 
+ and machine-independent data formats that support the creation, access, and sharing of array-oriented 
+ scientific data."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = [
+    'https://github.com/Unidata/netcdf-fortran/archive/'
+]
+
+dependencies = [('netCDF', '4.4.0')]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/netCDF/netCDF-4.3.3.1-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.3.1-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..cff46757ade46162ac257f19d0ee12510f0cc046
--- /dev/null
+++ b/easybuild/easyconfigs/n/netCDF/netCDF-4.3.3.1-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,34 @@
+name = 'netCDF'
+version = '4.3.3.1'
+
+homepage = 'http://www.unidata.ucar.edu/software/netcdf/'
+description = """NetCDF (network Common Data Form) is a set of software libraries
+ and machine-independent data formats that support the creation, access, and sharing of array-oriented
+ scientific data."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [
+    'ftp://ftp.unidata.ucar.edu/pub/netcdf/',
+    'ftp://ftp.unidata.ucar.edu/pub/netcdf/old',
+]
+
+dependencies = [
+    ('HDF5', '1.8.16'),
+    ('cURL', '7.47.0'),
+]
+
+builddependencies = [
+    ('CMake', '3.4.1'),
+    ('Doxygen', '1.8.10'),
+]
+
+# make sure both static and shared libs are built
+configopts = [
+    "-DBUILD_SHARED_LIBS=OFF ",
+    "-DBUILD_SHARED_LIBS=ON ",
+]
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/n/nettle/nettle-3.1.1-foss-2016a.eb b/easybuild/easyconfigs/n/nettle/nettle-3.1.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fc3be53324f5ec393dcdf687ea45549349389329
--- /dev/null
+++ b/easybuild/easyconfigs/n/nettle/nettle-3.1.1-foss-2016a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'nettle'
+version = '3.1.1'
+
+homepage = 'http://www.lysator.liu.se/~nisse/nettle/'
+description = """Nettle is a cryptographic library that is designed to fit easily
+ in more or less any context: In crypto toolkits for object-oriented
+ languages (C++, Python, Pike, ...), in applications like LSH or GNUPG,
+ or even in kernel space."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('GMP', '6.1.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['nettle-hash', 'nettle-lfib-stream', 'pkcs1-conv', 'sexp-conv']] +
+             ['lib64/libhogweed.a', 'lib64/libhogweed.%s' % SHLIB_EXT,
+              'lib64/libnettle.a', 'lib64/libnettle.%s' % SHLIB_EXT],
+    'dirs': ['include/nettle'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/n/npstat/npstat-0.99-foss-2016a.eb b/easybuild/easyconfigs/n/npstat/npstat-0.99-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b72652fe93a80fa25d914940340f711dcdbb829a
--- /dev/null
+++ b/easybuild/easyconfigs/n/npstat/npstat-0.99-foss-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'MakeCp'
+
+name = 'npstat'
+version = '0.99'
+
+homepage = 'https://code.google.com/archive/p/npstat/'
+description = """npstat implements some population genetics tests and estimators that can be applied
+ to pooled sequences from Next Generation Sequencing experiments."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/npstat/']
+sources = ['source-archive.zip']
+
+patches = ['npstat-%(version)s_fix-hardcoding-Makefile.patch']
+
+# commit 14, Oct 31st 2013
+checksums = ['a1595b7c46312d0f51b8b68987289337']
+
+dependencies = [
+    ('GSL', '1.16'),
+]
+
+start_dir = 'trunk'
+
+files_to_copy = [(['npstat'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/npstat'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/n/npstat/npstat-0.99-intel-2016a.eb b/easybuild/easyconfigs/n/npstat/npstat-0.99-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b8f9940b595f0b4fd927428ba2a02f51caf53c02
--- /dev/null
+++ b/easybuild/easyconfigs/n/npstat/npstat-0.99-intel-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'MakeCp'
+
+name = 'npstat'
+version = '0.99'
+
+homepage = 'https://code.google.com/archive/p/npstat/'
+description = """npstat implements some population genetics tests and estimators that can be applied
+ to pooled sequences from Next Generation Sequencing experiments."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/npstat/']
+sources = ['source-archive.zip']
+
+patches = ['npstat-%(version)s_fix-hardcoding-Makefile.patch']
+
+# commit 14, Oct 31st 2013
+checksums = ['a1595b7c46312d0f51b8b68987289337']
+
+dependencies = [
+    ('GSL', '1.16'),
+]
+
+start_dir = 'trunk'
+
+files_to_copy = [(['npstat'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/npstat'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/n/npstat/npstat-0.99_fix-hardcoding-Makefile.patch b/easybuild/easyconfigs/n/npstat/npstat-0.99_fix-hardcoding-Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..54420af1c1c080e0e497ba928e34fbbe3717f686
--- /dev/null
+++ b/easybuild/easyconfigs/n/npstat/npstat-0.99_fix-hardcoding-Makefile.patch
@@ -0,0 +1,16 @@
+fix hardcoding of 'gcc', add optimization flags defined in $CFLAGS
+author: Kenneth Hoste (HPC-UGent)
+--- npstat/trunk/Makefile.orig	2016-02-15 01:16:51.000000000 +0100
++++ npstat/trunk/Makefile	2016-03-10 09:25:46.000000000 +0100
+@@ -1,8 +1,7 @@
+ all: npstat
+ 
+-
+ npstat: 
+-	gcc -o npstat NPStat-v0.99.c -lgsl -lgslcblas -lm
++	${CC} ${CFLAGS} -o npstat NPStat-v0.99.c -lgsl -lgslcblas -lm
+ 
+ clean: 
+-	rm npstat
+\ No newline at end of file
++	rm npstat
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d7d6d78efaa21f970cd7cb20102e3c1a89f7cbbc
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCC-5.3.0-2.26.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'numactl'
+version = '2.0.11'
+
+homepage = 'http://oss.sgi.com/projects/libnuma/'
+description = """The numactl program allows you to run your application program on specific cpu's and memory nodes.
+ It does this by supplying a NUMA memory policy to the operating system before running your program.
+ The libnuma library provides convenient ways for you to add NUMA memory policies into your own program."""
+
+toolchain = {'name': 'GCC', 'version': '5.3.0-2.26'}
+
+source_urls = ['ftp://oss.sgi.com/www/projects/libnuma/download/']
+sources = [SOURCE_TAR_GZ]
+
+checksums = ['d3bc88b7ddb9f06d60898f4816ae9127']
+
+sanity_check_paths = {
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
+    'dirs': ['share/man', 'include']
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCCcore-4.9.2.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCCcore-4.9.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..49ba8f9bf381705a79e197cf0390eab76f6d5f32
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCCcore-4.9.2.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'numactl'
+version = '2.0.11'
+
+homepage = 'http://oss.sgi.com/projects/libnuma/'
+description = """The numactl program allows you to run your application program on specific cpu's and memory nodes.
+ It does this by supplying a NUMA memory policy to the operating system before running your program.
+ The libnuma library provides convenient ways for you to add NUMA memory policies into your own program."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.2'}
+
+source_urls = ['ftp://oss.sgi.com/www/projects/libnuma/download/']
+sources = [SOURCE_TAR_GZ]
+
+checksums = ['d3bc88b7ddb9f06d60898f4816ae9127']
+
+builddependencies = [('binutils', '2.25')]
+
+sanity_check_paths = {
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
+    'dirs': ['share/man', 'include']
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCCcore-4.9.3.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..91b7fa73b171079909d2e4d5220a41972055ccdb
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-GCCcore-4.9.3.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'numactl'
+version = '2.0.11'
+
+homepage = 'http://oss.sgi.com/projects/libnuma/'
+description = """The numactl program allows you to run your application program on specific cpu's and memory nodes.
+ It does this by supplying a NUMA memory policy to the operating system before running your program.
+ The libnuma library provides convenient ways for you to add NUMA memory policies into your own program."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+
+source_urls = ['ftp://oss.sgi.com/www/projects/libnuma/download/']
+sources = [SOURCE_TAR_GZ]
+
+checksums = ['d3bc88b7ddb9f06d60898f4816ae9127']
+
+builddependencies = [('binutils', '2.25')]
+
+sanity_check_paths = {
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
+    'dirs': ['share/man', 'include']
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/n/numactl/numactl-2.0.11-intel-2016a.eb b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6379096747ff1dc8601a99c73e78893ef66d9cad
--- /dev/null
+++ b/easybuild/easyconfigs/n/numactl/numactl-2.0.11-intel-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'numactl'
+version = '2.0.11'
+
+homepage = 'http://oss.sgi.com/projects/libnuma/'
+description = """The numactl program allows you to run your application program on specific cpu's and memory nodes.
+ It does this by supplying a NUMA memory policy to the operating system before running your program.
+ The libnuma library provides convenient ways for you to add NUMA memory policies into your own program."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['ftp://oss.sgi.com/www/projects/libnuma/download/']
+sources = [SOURCE_TAR_GZ]
+
+checksums = ['d3bc88b7ddb9f06d60898f4816ae9127']
+
+sanity_check_paths = {
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
+    'dirs': ['share/man', 'include']
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/n/numba/llvmlite-0.9.0_fix-ffi-Makefile.patch b/easybuild/easyconfigs/n/numba/llvmlite-0.9.0_fix-ffi-Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7a74cc062390131ced03dc4af2897554210ed92a
--- /dev/null
+++ b/easybuild/easyconfigs/n/numba/llvmlite-0.9.0_fix-ffi-Makefile.patch
@@ -0,0 +1,29 @@
+don't use -static-libstdc++, causing problems like "glibc detected *** python: free(): invalid pointer"
+cfr. https://github.com/numba/llvmlite/issues/93;
+don't hardcode -lLLVMOProfileJIT, not required anymore
+cfr. https://github.com/numba/llvmlite/issues/121
+author: Kenneth Hoste (HPC-UGent)
+--- llvmlite-0.9.0/ffi/Makefile.linux.orig	2016-01-26 15:11:43.000000000 +0100
++++ llvmlite-0.9.0/ffi/Makefile.linux	2016-03-30 12:41:34.102307156 +0200
+@@ -4,9 +4,7 @@
+ # -flto and --exclude-libs allow us to remove those parts of LLVM we don't use
+ CXXFLAGS = $(LLVM_CXXFLAGS) -flto
+ LDFLAGS = $(LLVM_LDFLAGS) -flto -Wl,--exclude-libs=ALL
+-# Need to add LLVMOProfileJIT by hand
+-# see https://llvm.org/bugs/show_bug.cgi?id=25091
+-LIBS = $(LLVM_LIBS) -lLLVMOProfileJIT
++LIBS = $(LLVM_LIBS)
+ SRC = assembly.cpp bitcode.cpp core.cpp initfini.cpp module.cpp value.cpp \
+ 	  executionengine.cpp transforms.cpp passmanagers.cpp targets.cpp dylib.cpp \
+ 	  linker.cpp
+@@ -15,9 +13,7 @@
+ all: $(OUTPUT)
+ 
+ $(OUTPUT): $(SRC)
+-	# static-libstdc++ avoids runtime dependencies on a
+-	# particular libstdc++ version.
+-	$(CXX) -static-libstdc++ -shared $(CXXFLAGS) $(SRC) -o $(OUTPUT) $(LDFLAGS) $(LIBS)
++	$(CXX) -shared $(CXXFLAGS) $(SRC) -o $(OUTPUT) $(LDFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -rf test
diff --git a/easybuild/easyconfigs/n/numba/numba-0.22.1-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/n/numba/numba-0.22.1-intel-2015b-Python-2.7.11.eb
index 402bb7ef969fdd459475ac8118a497a77ba559e3..6456ccb4fbb0281e2d1f1ca315a9fe364f81016a 100644
--- a/easybuild/easyconfigs/n/numba/numba-0.22.1-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/n/numba/numba-0.22.1-intel-2015b-Python-2.7.11.eb
@@ -11,7 +11,6 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 
 # this is a bundle of Python packages
 exts_defaultclass = 'PythonPackage'
-exts_filter = ('python -c "import %(ext_name)s"', '')
 
 pyver = '2.7.11'
 versionsuffix = '-Python-%s' % pyver
diff --git a/easybuild/easyconfigs/n/numba/numba-0.24.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/n/numba/numba-0.24.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1ed8278597621e2a51c4e91200c8e136de808852
--- /dev/null
+++ b/easybuild/easyconfigs/n/numba/numba-0.24.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,41 @@
+easyblock = 'Bundle'
+
+name = 'numba'
+version = '0.24.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://numba.pydata.org/'
+description = """Numba is an Open Source NumPy-aware optimizing compiler for Python sponsored by Continuum Analytics,
+ Inc. It uses the remarkable LLVM compiler infrastructure to compile Python syntax to machine code."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('LLVM', '3.7.1'),
+]
+
+exts_list = [
+    ('llvmlite', '0.9.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/llvmlite/'],
+        'patches': ['llvmlite-0.9.0_fix-ffi-Makefile.patch'],
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/n/numba/'],
+    }),
+]
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+sanity_check_paths = {
+    'files': ['bin/numba', 'bin/pycc'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/n/numba/numba-0.24.0-intel-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/n/numba/numba-0.24.0-intel-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c11e1bdb17aa0d4bbe62eb2de778acd50bbc7cec
--- /dev/null
+++ b/easybuild/easyconfigs/n/numba/numba-0.24.0-intel-2016a-Python-3.5.1.eb
@@ -0,0 +1,41 @@
+easyblock = 'Bundle'
+
+name = 'numba'
+version = '0.24.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://numba.pydata.org/'
+description = """Numba is an Open Source NumPy-aware optimizing compiler for Python sponsored by Continuum Analytics,
+ Inc. It uses the remarkable LLVM compiler infrastructure to compile Python syntax to machine code."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '3.5.1'),
+    ('LLVM', '3.7.1'),
+]
+
+exts_list = [
+    ('llvmlite', '0.9.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/llvmlite/'],
+        'patches': ['llvmlite-0.9.0_fix-ffi-Makefile.patch'],
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/n/numba/'],
+    }),
+]
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+sanity_check_paths = {
+    'files': ['bin/numba', 'bin/pycc'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb
index b59dd7b4f3f89db7b250251393124d3e06306c7d..12e8271d8840659dec0c2e3d9ddef0d2c2562ed3 100644
--- a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-4.1.13-Python-2.7.3.eb
@@ -10,7 +10,6 @@ description = """The numexpr package evaluates multiple-operator array expressio
  compiler at runtime."""
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
-toolchainopts = {'usempi': True}
 
 source_urls = [GOOGLECODE_SOURCE]
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb
index 0f252858359e4432fd80c6b4a681fbb48793f9df..986566870cdcee8d3cb904deb83cdb09b406fc78 100644
--- a/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.0.1-ictce-5.3.0-Python-2.7.3.eb
@@ -10,7 +10,6 @@ description = """The numexpr package evaluates multiple-operator array expressio
  compiler at runtime."""
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
-toolchainopts = {'usempi': True}
 
 source_urls = [GOOGLECODE_SOURCE]
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb
index 585a1680b7ce7ca3b62d1d3cea7f0429f60484c0..7b2e107b820c82863b3eef0a525d35609c4a4f96 100644
--- a/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb
+++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.2.2-ictce-5.5.0-Python-2.7.6.eb
@@ -10,7 +10,6 @@ description = """The numexpr package evaluates multiple-operator array expressio
  compiler at runtime."""
 
 toolchain = {'name': 'ictce', 'version': '5.5.0'}
-toolchainopts = {'usempi': True}
 
 source_urls = [GOOGLECODE_SOURCE]
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.4.6-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.4.6-intel-2015b-Python-2.7.10.eb
index a1e1df7d77f9a9ad2e225db2b41280dd22182ad7..0012640a1cacc41ae65b52863788e1cd8f6f1088 100644
--- a/easybuild/easyconfigs/n/numexpr/numexpr-2.4.6-intel-2015b-Python-2.7.10.eb
+++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.4.6-intel-2015b-Python-2.7.10.eb
@@ -10,7 +10,6 @@ description = """The numexpr package evaluates multiple-operator array expressio
  compiler at runtime."""
 
 toolchain = {'name': 'intel', 'version': '2015b'}
-toolchainopts = {'usempi': True}
 
 source_urls = ['https://github.com/pydata/numexpr/archive/']
 sources = ['v%(version)s.tar.gz']
diff --git a/easybuild/easyconfigs/n/numexpr/numexpr-2.5.2-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/n/numexpr/numexpr-2.5.2-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c352743328f0d42eb1c247a4fe6dff8bfe6ab463
--- /dev/null
+++ b/easybuild/easyconfigs/n/numexpr/numexpr-2.5.2-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,27 @@
+easyblock = 'PythonPackage'
+
+name = 'numexpr'
+version = '2.5.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://code.google.com/p/numexpr/'
+description = """The numexpr package evaluates multiple-operator array expressions many times faster than NumPy can.
+ It accepts the expression as a string, analyzes it, rewrites it more efficiently, and compiles it on the fly into
+ code for its internal virtual machine (VM). Due to its integrated just-in-time (JIT) compiler, it does not require a
+ compiler at runtime."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://github.com/pydata/numexpr/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.8.2-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/n/numpy/numpy-1.8.2-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b9ddbc192738c87ea560a635fff0d5ebe5b0f561
--- /dev/null
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.8.2-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,23 @@
+name = 'numpy'
+version = '1.8.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.numpy.org'
+description = """NumPy is the fundamental package for scientific computing with Python. It contains among other things:
+ a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran
+ code, useful linear algebra, Fourier transform, and random number capabilities. Besides its obvious scientific uses,
+ NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be 
+ defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['numpy-1.8.1-mkl.patch']
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.9.2-CrayGNU-2015.06-XC-Python-2.7.9.eb b/easybuild/easyconfigs/n/numpy/numpy-1.9.2-CrayGNU-2015.06-Python-2.7.9.eb
similarity index 93%
rename from easybuild/easyconfigs/n/numpy/numpy-1.9.2-CrayGNU-2015.06-XC-Python-2.7.9.eb
rename to easybuild/easyconfigs/n/numpy/numpy-1.9.2-CrayGNU-2015.06-Python-2.7.9.eb
index 09f3884a76c520b9ebb4a473db0936b3ed05c11b..aa3c00b1635939247cf8ba4cc596f0ef801e13d0 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.9.2-CrayGNU-2015.06-XC-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.9.2-CrayGNU-2015.06-Python-2.7.9.eb
@@ -8,7 +8,7 @@ description = """NumPy is the fundamental package for scientific computing with
  NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be 
  defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/n/numpy/numpy-1.9.2-CrayGNU-2015.11-XC-Python-2.7.9.eb b/easybuild/easyconfigs/n/numpy/numpy-1.9.2-CrayGNU-2015.11-Python-2.7.9.eb
similarity index 93%
rename from easybuild/easyconfigs/n/numpy/numpy-1.9.2-CrayGNU-2015.11-XC-Python-2.7.9.eb
rename to easybuild/easyconfigs/n/numpy/numpy-1.9.2-CrayGNU-2015.11-Python-2.7.9.eb
index 91375139ee4e2e2ac2860b84be20cb5b39489305..5c8368180f5d295029838104bcb24877eb94290d 100644
--- a/easybuild/easyconfigs/n/numpy/numpy-1.9.2-CrayGNU-2015.11-XC-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/n/numpy/numpy-1.9.2-CrayGNU-2015.11-Python-2.7.9.eb
@@ -8,7 +8,7 @@ description = """NumPy is the fundamental package for scientific computing with
  NumPy can also be used as an efficient multi-dimensional container of generic data. Arbitrary data-types can be 
  defined. This allows NumPy to seamlessly and speedily integrate with a wide variety of databases."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/o/ORCA/ORCA-2_9_1-linux_x86-64.eb b/easybuild/easyconfigs/o/ORCA/ORCA-2_9_1-linux_x86-64.eb
index d28d21b593dc90a3cf78415d69e254bd7b2ad63a..a85c46d3f0216ba78937ad53ab1f3eb6f18c6a54 100644
--- a/easybuild/easyconfigs/o/ORCA/ORCA-2_9_1-linux_x86-64.eb
+++ b/easybuild/easyconfigs/o/ORCA/ORCA-2_9_1-linux_x86-64.eb
@@ -29,4 +29,9 @@ sanity_check_paths = {
     'dirs': [],
 }
 
+modextravars = {
+    "SLURM_CPU_BIND" : "none",
+    "RSH_COMMAND"    : "ssh -x",
+}
+
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb
index 81bfa462d1eca20b183384c4ca5e4bada13e60ac..685a061dbd6de1e7b6ebe9e22bb72a1cb3e80cdb 100644
--- a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb
+++ b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_0-linux_x86-64_openmpi_165.eb
@@ -15,6 +15,7 @@ toolchain = {'name': 'dummy', 'version': ''}
 
 sources = ['%%(namelower)s_%s_%s.tbz' % (version.split('-')[0], '-'.join(version.split('-')[1:]))]
 
+# ORCA 3.0.0 is compiled only against OpenMPI 1.6.5 for Linux
 dependencies = [('OpenMPI', openmpiversion, '-GCC-4.7.2')]
 
 sanity_check_paths = {
@@ -30,4 +31,9 @@ sanity_check_paths = {
     'dirs': [],
 }
 
+modextravars = {
+    "SLURM_CPU_BIND" : "none",
+    "RSH_COMMAND"    : "ssh -x",
+}
+
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64-OpenMPI-1.6.5.eb b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64.eb
similarity index 87%
rename from easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64-OpenMPI-1.6.5.eb
rename to easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64.eb
index 3d3c83269cd51ee69b92cb1d5af23af8a4835483..7d277554957a31f99daa6cbfd699ee87b539abd7 100644
--- a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64-OpenMPI-1.6.5.eb
+++ b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_2-linux_x86-64.eb
@@ -3,9 +3,6 @@ easyblock = "PackedBinary"
 name = "ORCA"
 version = '3_0_2-linux_x86-64'
 
-openmpiversion = '1.6.5'
-versionsuffix = '-OpenMPI-%s' % openmpiversion
-
 homepage = 'http://cec.mpg.de/forum/'
 description = """ORCA is a flexible, efficient and easy-to-use general purpose tool for quantum chemistry
  with specific emphasis on spectroscopic properties of open-shell molecules.
@@ -17,7 +14,8 @@ toolchain = {'name': 'dummy', 'version': ''}
 
 sources = ['%%(namelower)s_%s_%s.tbz' % (version.split('-')[0], '-'.join(version.split('-')[1:]))]
 
-dependencies = [('OpenMPI', openmpiversion, '-GCC-4.7.2')]
+# ORCA 3.0.2 is compiled only against OpenMPI 1.6.5 for Linux
+dependencies = [('OpenMPI', '1.6.5', '-GCC-4.7.2')]
 
 sanity_check_paths = {
     'files': ['orca_%s%s' % (x, y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf',
@@ -32,4 +30,9 @@ sanity_check_paths = {
     'dirs': [],
 }
 
+modextravars = {
+    "SLURM_CPU_BIND" : "none",
+    "RSH_COMMAND"    : "ssh -x",
+}
+
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_3-linux_x86-64-OpenMPI-1.6.5.eb b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_3-linux_x86-64.eb
similarity index 87%
rename from easybuild/easyconfigs/o/ORCA/ORCA-3_0_3-linux_x86-64-OpenMPI-1.6.5.eb
rename to easybuild/easyconfigs/o/ORCA/ORCA-3_0_3-linux_x86-64.eb
index 1c8c6b0dafd995db73a67bf078b36b24a6e1561b..6a633a98ef1f743e289bf3572aa59fd65462b974 100644
--- a/easybuild/easyconfigs/o/ORCA/ORCA-3_0_3-linux_x86-64-OpenMPI-1.6.5.eb
+++ b/easybuild/easyconfigs/o/ORCA/ORCA-3_0_3-linux_x86-64.eb
@@ -3,9 +3,6 @@ easyblock = "PackedBinary"
 name = "ORCA"
 version = '3_0_3-linux_x86-64'
 
-openmpiversion = '1.6.5'
-versionsuffix = '-OpenMPI-%s' % openmpiversion
-
 homepage = 'http://cec.mpg.de/forum/'
 description = """ORCA is a flexible, efficient and easy-to-use general purpose tool for quantum chemistry
  with specific emphasis on spectroscopic properties of open-shell molecules.
@@ -17,7 +14,8 @@ toolchain = {'name': 'dummy', 'version': ''}
 
 sources = ['%%(namelower)s_%s_%s.tbz' % (version.split('-')[0], '-'.join(version.split('-')[1:]))]
 
-dependencies = [('OpenMPI', openmpiversion, '-GCC-4.7.2')]
+# ORCA 3.0.3 is compiled only against OpenMPI 1.6.5 for Linux
+dependencies = [('OpenMPI', '1.6.5', '-GCC-4.7.2')]
 
 sanity_check_paths = {
     'files': ['orca_%s%s' % (x, y) for x in ['anoint', 'casscf', 'cis', 'cleanup', 'cpscf',
@@ -32,4 +30,9 @@ sanity_check_paths = {
     'dirs': [],
 }
 
+modextravars = {
+    "SLURM_CPU_BIND" : "none",
+    "RSH_COMMAND"    : "ssh -x",
+}
+
 moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/o/OSU-Micro-Benchmarks/OSU-Micro-Benchmarks-5.2-goolf-1.7.20.eb b/easybuild/easyconfigs/o/OSU-Micro-Benchmarks/OSU-Micro-Benchmarks-5.2-goolf-1.7.20.eb
new file mode 100644
index 0000000000000000000000000000000000000000..456a180ae7c10383bbeef452264393d6abb322e5
--- /dev/null
+++ b/easybuild/easyconfigs/o/OSU-Micro-Benchmarks/OSU-Micro-Benchmarks-5.2-goolf-1.7.20.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'OSU-Micro-Benchmarks'
+version = '5.2'
+
+homepage = 'http://mvapich.cse.ohio-state.edu/benchmarks/'
+description = """OSU Micro-Benchmarks"""
+
+toolchain = {'name': 'goolf', 'version': '1.7.20'}
+
+source_urls = ['http://mvapich.cse.ohio-state.edu/download/mvapich/']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = 'CC="$MPICC" CXX="$MPICC"'
+
+benchmark_dirs = ['libexec/osu-micro-benchmarks/mpi/%s' % x for x in ['collective', 'one-sided', 'pt2pt']]
+modextrapaths = {'PATH': benchmark_dirs}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': benchmark_dirs,
+}
+
+moduleclass = 'perf'
diff --git a/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-GCC-5.3.0-2.26-LAPACK-3.6.0.eb b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-GCC-5.3.0-2.26-LAPACK-3.6.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d8f2e33a1963f19e3e89a827d85ea12f6ad90aaf
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenBLAS/OpenBLAS-0.2.18-GCC-5.3.0-2.26-LAPACK-3.6.0.eb
@@ -0,0 +1,51 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenBLAS'
+version = '0.2.18'
+
+lapackver = '3.6.0'
+versionsuffix = '-LAPACK-%s' % lapackver
+
+homepage = 'http://xianyi.github.com/OpenBLAS/'
+description = """OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version."""
+
+toolchain = {'name': 'GCC', 'version': '5.3.0-2.26'}
+
+lapack_src = 'lapack-%s.tgz' % lapackver
+large_src = 'large.tgz'
+timing_src = 'timing.tgz'
+sources = [
+    'v%(version)s.tar.gz',
+    lapack_src,
+    large_src,
+    timing_src,
+]
+source_urls = [
+    # order matters, trying to download the LAPACK tarball from GitHub causes trouble
+    "http://www.netlib.org/lapack/",
+    "http://www.netlib.org/lapack/timing/",
+    "https://github.com/xianyi/OpenBLAS/archive/",
+]
+
+patches = [
+    (lapack_src, '.'),  # copy LAPACK tarball to unpacked OpenBLAS dir
+    (large_src, '.'),
+    (timing_src, '.'),
+]
+
+skipsteps = ['configure']
+
+buildopts = 'BINARY=64 USE_THREAD=1 CC="$CC" FC="$F77" NO_AFFINITY=1'
+installopts = "USE_THREAD=1 PREFIX=%(installdir)s"
+
+# extensive testing can be enabled by uncommenting the line below
+#runtest = 'PATH=.:$PATH lapack-timing'
+
+sanity_check_paths = {
+    'files': ['include/cblas.h', 'include/f77blas.h', 'include/lapacke_config.h', 'include/lapacke.h',
+              'include/lapacke_mangling.h', 'include/lapacke_utils.h', 'include/openblas_config.h',
+              'lib/libopenblas.a', 'lib/libopenblas.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.12-intel-2016a.eb b/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.12-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..89e2746bd8da94c91df940914b950f54b73dcb88
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenCV/OpenCV-2.4.12-intel-2016a.eb
@@ -0,0 +1,69 @@
+easyblock = 'CMakeMake'
+
+name = 'OpenCV'
+version = '2.4.12'
+
+homepage = 'http://opencv.org/'
+description = """OpenCV (Open Source Computer Vision Library) is an open source computer vision
+ and machine learning software library. OpenCV was built to provide
+ a common infrastructure for computer vision applications and to accelerate
+ the use of machine perception in the commercial products."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://github.com/Itseez/opencv/archive/']
+sources = ['%(version)s.zip']
+
+patches = ['OpenCV-2.4.9_with_IPP.patch']
+
+builddependencies = [
+    ('CMake', '3.5.2'),
+]
+
+javaver = '1.7.0_80'
+dependencies = [
+    ('Python', '2.7.11'),
+    ('zlib', '1.2.8'),
+    ('FFmpeg', '2.8.7'),
+    ('libjpeg-turbo', '1.4.2', '-NASM-2.12.01'),
+    ('libpng', '1.6.21'),
+    ('LibTIFF', '4.0.6'),
+    ('JasPer', '1.900.1'),
+    ('Java', javaver, '', True),
+    ('ant', '1.9.6', '-Java-%s' % javaver, True),
+    ('GLib', '2.48.0'),
+    ('GTK+', '2.24.30'),
+]
+
+preconfigopts = 'export IPPROOT=$EBROOTICC/ipp && '
+
+configopts = '-DCMAKE_BUILD_TYPE=RELEASE '
+configopts += '-DBUILD_PYTHON_SUPPORT=ON '
+configopts += '-DPYTHON_PACKAGES_PATH=$EBROOTPYTHON/lib/python%(pyshortver)s/site-packages '
+configopts += '-DBUILD_NEW_PYTHON_SUPPORT=ON '
+configopts += '-DZLIB_LIBRARY=$EBROOTZLIB/lib/libz.so '
+configopts += '-DZLIB_INCLUDE_DIR=$EBROOTZLIB/include '
+configopts += '-DTIFF_LIBRARY=$EBROOTLIBTIFF/lib/libtiff.so '
+configopts += '-DTIFF_INCLUDE_DIR=$EBROOTLIBTIFF/include '
+configopts += '-DPNG_LIBRARY=$EBROOTLIBPNG/lib/libpng.so '
+configopts += '-DPNG_INCLUDE_DIR=$EBROOTLIBPNG/include '
+configopts += '-DJPEG_LIBRARY=$EBROOTLIBJPEGMINTURBO/lib/libjpeg.so '
+configopts += '-DJPEG_INCLUDE_DIR=$EBROOTLIBJPEGMINTURBO/include '
+configopts += '-DJASPER_LIBRARY=$EBROOTJASPER/lib/libjasper.a '
+configopts += '-DJASPER_INCLUDE_DIR=$EBROOTJASPER/include '
+configopts += '-DWITH_IPP=ON '
+configopts += '-DENABLE_SSE=ON -DENABLE_SSE2=ON -DENABLE_SSE3=ON '
+configopts += '-DWITH_CUDA=OFF '
+
+sanity_check_paths = {
+    'files': ['lib/libopencv_core.%s' % SHLIB_EXT] +
+             ['bin/opencv_%s' % x for x in ['haartraining', 'createsamples', 'performance', 'traincascade']],
+    'dirs': ['include']
+}
+
+modextrapaths = {
+    'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages',
+    'CLASSPATH': 'share/OpenCV/java',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.2-intel-2016a.eb b/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.2-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..00e9eaf0071ee3ad34c9d5adb3a9ed7e575ebcd1
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenFOAM-Extend/OpenFOAM-Extend-3.2-intel-2016a.eb
@@ -0,0 +1,48 @@
+easyblock = 'EB_OpenFOAM'
+
+name = 'OpenFOAM-Extend'
+version = '3.2'
+
+homepage = 'http://www.extend-project.de/'
+description = """OpenFOAM is a free, open source CFD software package. 
+OpenFOAM has an extensive range of features to solve anything from complex fluid flows
+involving chemical reactions, turbulence and heat transfer, 
+to solid dynamics and electromagnetics."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://github.com/Unofficial-Extend-Project-Mirror/foam-extend-foam-extend-%(version)s/archive']
+sources = ['v%(version)s.tar.gz']
+
+patches = [
+    'OpenFOAM-Extend-%(version)s-ParMGridGen.patch',
+    'OpenFOAM-Extend-3.1_build-qa.patch',
+    'OpenFOAM-Extend-3.1_comp-mpi.patch',
+    'OpenFOAM-Extend-3.1_skip-ThirdParty-OpenMPI.patch',
+]
+
+dependencies = [
+    ('hwloc', '1.11.3'),
+    ('ParMETIS', '4.0.3'),
+    ('METIS', '5.1.0', '-32bitIDX'),  # order matters, METIS need to be listed after ParMETIS to get $CPATH right
+    ('SCOTCH', '6.0.4'),
+    ('Mesquite', '2.3.0'),
+    ('ParMGridGen', '1.0'),
+    ('Python', '2.7.11'),
+    # Libccmio v2.6.1, zoltan v3.5
+]
+
+builddependencies = [
+    ('flex', '2.5.39'),
+    ('Bison', '3.0.4'),
+    ('M4', '1.4.17'),
+    ('CMake', '3.5.2'),
+]
+
+prebuildopts = "(wcleanAll || echo 'all is fine') && "  # clean up everything first (and ignore any errors)
+
+# too many builds in parallel actually slows down the build
+maxparallel = 4
+
+moduleclass = 'cae'
diff --git a/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-3.0.0-intel-2015b.eb b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-3.0.0-intel-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eb8704d554e110c9136fe186d99b7ee44af45026
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenFOAM/OpenFOAM-3.0.0-intel-2015b.eb
@@ -0,0 +1,40 @@
+name = 'OpenFOAM'
+version = '3.0.0'
+
+homepage = 'http://www.openfoam.com/'
+description = """OpenFOAM is a free, open source CFD software package. 
+ OpenFOAM has an extensive range of features to solve anything from complex fluid flows
+ involving chemical reactions, turbulence and heat transfer, 
+ to solid dynamics and electromagnetics."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'cstd': 'c++14'}
+
+source_urls = ['http://downloads.sourceforge.net/foam/%(version)s']
+sources = [
+    SOURCE_TGZ,
+    'ThirdParty-%(version)s.tgz',
+]
+
+patches = [
+    'OpenFOAM-%(version)s_cleanup.patch',
+    'OpenFOAM-%(version)s_libreadline.patch',
+    ('ThirdParty-%(version)s_cleanup.patch', ".."),  # patch should not be applied in OpenFOAM subdir
+]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    # OpenFOAM requires 64 bit METIS using 32 bit indexes (array indexes)
+    ('METIS', '5.1.0', '-32bitIDX'),
+    ('ncurses', '5.9'),
+    ('SCOTCH', '6.0.4'),
+    ('Boost', '1.59.0'),
+]
+
+builddependencies = [
+    ('Bison', '3.0.4'),
+    ('CMake', '3.3.2'),
+    ('flex', '2.5.39'),
+]
+
+moduleclass = 'cae'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.2-GCC-5.3.0-2.26.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.2-GCC-5.3.0-2.26.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4502f5c9f4029f724176d96cce2e10508ceafa6e
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.2-GCC-5.3.0-2.26.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '1.10.2'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '5.3.0-2.26'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+dependencies = [('hwloc', '1.11.3')]
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-verbs '
+configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
+
+# needed for --with-verbs
+osdependencies = [('libibverbs-dev', 'libibverbs-devel')]
+
+libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
+             ["lib/lib%s.%s" % (libfile, SHLIB_EXT) for libfile in libs] +
+             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
+}
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.2-PGI-16.3-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.2-PGI-16.3-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..95cc4d76a5818155471b382b104861aa58d44a56
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenMPI/OpenMPI-1.10.2-PGI-16.3-GCC-4.9.3-2.25.eb
@@ -0,0 +1,40 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '1.10.2'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-2 implementation."""
+
+toolchain = {'name': 'PGI', 'version': '16.3-GCC-4.9.3-2.25'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+
+
+configopts = '--with-threads=posix --enable-shared --enable-mpi-thread-multiple --with-verbs '
+configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
+configopts += '--with-cxxrtlib="-lgcc_s -lstdc++"' # for vt-mpi-unify
+
+dependencies = [('hwloc', '1.11.3')]
+
+# needed for --with-verbs
+osdependencies = [('libibverbs-dev', 'libibverbs-devel')]
+
+libs = ["mpi_cxx", "mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte", "vt", "vt-hyb", "vt-mpi", "vt-mpi-unify"]
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
+             ["lib/lib%s.%s" % (libfile, SHLIB_EXT) for libfile in libs] +
+             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]],
+    'dirs': ["include/openmpi/ompi/mpi/cxx"],
+}
+
+sanity_check_commands = [
+    ('mpicc --version | grep pgcc', ''),
+    ('mpicxx --version | grep pgc++', ''),
+    ('mpifort --version | grep pgfortran', ''),
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-foss-2016a.eb b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5f92dedd69fcbe5d7cf3d8c3116e2e238cebf41e
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-foss-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenPGM'
+version = '5.2.122'
+
+homepage = 'http://code.google.com/p/openpgm/'
+description = """OpenPGM is an open source implementation of the Pragmatic General Multicast (PGM)
+ specification in RFC 3208 available at www.ietf.org. PGM is a reliable and scalable multicast protocol
+ that enables receivers to detect loss, request retransmission of lost data, or notify an application
+ of unrecoverable loss. PGM is a receiver-reliable protocol, which means the receiver is responsible
+ for ensuring all data is received, absolving the sender of reception responsibility."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [GOOGLECODE_SOURCE]
+sources = ['libpgm-%(version)s.tar.gz']
+
+configopts = '--with-pic'
+
+start_dir = 'pgm'
+
+sanity_check_paths = {
+    'files': ['lib/libpgm.%s' % SHLIB_EXT, 'lib/libpgm.a'],
+    'dirs': ['include'],
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-intel-2016a.eb b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d391dfe9fd9c8b9e58e28eb4d7a2d8d01c2facfd
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenPGM/OpenPGM-5.2.122-intel-2016a.eb
@@ -0,0 +1,28 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenPGM'
+version = '5.2.122'
+
+homepage = 'http://code.google.com/p/openpgm/'
+description = """OpenPGM is an open source implementation of the Pragmatic General Multicast (PGM)
+ specification in RFC 3208 available at www.ietf.org. PGM is a reliable and scalable multicast protocol
+ that enables receivers to detect loss, request retransmission of lost data, or notify an application
+ of unrecoverable loss. PGM is a receiver-reliable protocol, which means the receiver is responsible
+ for ensuring all data is received, absolving the sender of reception responsibility."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [GOOGLECODE_SOURCE]
+sources = ['libpgm-%(version)s.tar.gz']
+
+configopts = '--with-pic'
+
+start_dir = 'pgm'
+
+sanity_check_paths = {
+    'files': ['lib/libpgm.%s' % SHLIB_EXT, 'lib/libpgm.a'],
+    'dirs': ['include'],
+}
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1k-goolf-1.5.16.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1k-goolf-1.5.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..895b5bd87b6833722bc163c5cf95545f77a8f05b
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1k-goolf-1.5.16.eb
@@ -0,0 +1,24 @@
+name = 'OpenSSL'
+version = '1.0.1k'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+ and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+ protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+patches = [
+    'OpenSSL-1.0.1f_icc-fixes.patch',
+    'OpenSSL-1.0.1i-fix_parallel_build-1.patch',
+]
+
+dependencies = [('zlib', '1.2.8')]
+
+runtest = 'test'
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1s-foss-2016a.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1s-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a5aab91ad9f85196052bfe71076fd1398c6c95d8
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.1s-foss-2016a.eb
@@ -0,0 +1,21 @@
+name = 'OpenSSL'
+version = '1.0.1s'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+ and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+ protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+patches = ['OpenSSL-1.0.1q_icc-fixes.patch']
+
+dependencies = [('zlib', '1.2.8')]
+
+runtest = 'test'
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.2g-GCCcore-4.9.3.eb b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.2g-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..29256de39d18b47a6af5937938b906418e17865b
--- /dev/null
+++ b/easybuild/easyconfigs/o/OpenSSL/OpenSSL-1.0.2g-GCCcore-4.9.3.eb
@@ -0,0 +1,24 @@
+name = 'OpenSSL'
+version = '1.0.2g'
+
+homepage = 'http://www.openssl.org/'
+description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
+ and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
+ protocols as well as a full-strength general purpose cryptography library. """
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.openssl.org/source/']
+
+builddependencies = [
+    # use same binutils version that was used when building GCCcore toolchain
+    ('binutils', '2.25', '', True),
+]
+
+dependencies = [('zlib', '1.2.8')]
+
+runtest = 'test'
+
+moduleclass = 'system'
diff --git a/easybuild/easyconfigs/o/OptiX/OptiX-3.8.0-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/o/OptiX/OptiX-3.8.0-GNU-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..69dec5c347e9f49ad15158b66fd4e04b1c6dc912
--- /dev/null
+++ b/easybuild/easyconfigs/o/OptiX/OptiX-3.8.0-GNU-4.9.3-2.25.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Authors::   Stephane Thiell <sthiell@stanford.edu>
+##
+easyblock = 'Binary'
+
+name = 'OptiX'
+version = '3.8.0'
+
+homepage = 'https://developer.nvidia.com/optix'
+description = """OptiX is NVIDIA SDK for easy ray tracing performance.
+ It provides a simple framework for accessing the GPU’s massive ray tracing
+ power using state-of-the-art GPU algorithms."""
+
+toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
+
+# Registration required. Download links:
+# https://developer.nvidia.com/designworks/optix/download
+# https://developer.nvidia.com/designworks/optix/downloads/legacy
+sources = ['NVIDIA-OptiX-SDK-%(version)s-linux64.run']
+
+checksums = [
+    'ecf63cf32b87defa36d3cd283d085314',    # NVIDIA-OptiX-SDK-3.8.0-linux64.run
+]
+
+install_cmd = "./" + sources[0] + " --skip-license --prefix=%(installdir)s"
+
+sanity_check_paths = {
+    'files': ["include/optix.h", "include/optix_cuda.h", "lib64/liboptix.%s" % SHLIB_EXT,
+              "lib64/liboptixu.%s" % SHLIB_EXT],
+    'dirs': []
+}
+
+modextravars = {'OPTIX_HOME': '%(installdir)s'}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/o/OptiX/OptiX-3.9.0-GNU-4.9.3-2.25.eb b/easybuild/easyconfigs/o/OptiX/OptiX-3.9.0-GNU-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7960265e875aa5d7bd8accf80e803345d4e28b7c
--- /dev/null
+++ b/easybuild/easyconfigs/o/OptiX/OptiX-3.9.0-GNU-4.9.3-2.25.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Authors::   Stephane Thiell <sthiell@stanford.edu>
+##
+easyblock = 'Binary'
+
+name = 'OptiX'
+version = '3.9.0'
+
+homepage = 'https://developer.nvidia.com/optix'
+description = """OptiX is NVIDIA SDK for easy ray tracing performance.
+ It provides a simple framework for accessing the GPU’s massive ray tracing
+ power using state-of-the-art GPU algorithms."""
+
+toolchain = {'name': 'GNU', 'version': '4.9.3-2.25'}
+
+# Registration required. Download links:
+# https://developer.nvidia.com/designworks/optix/download
+# https://developer.nvidia.com/designworks/optix/downloads/legacy
+sources = ['NVIDIA-OptiX-SDK-%(version)s-linux64.sh']
+
+checksums = [
+    '13b1953af766b82e0a4aaa28766a05a1',    # NVIDIA-OptiX-SDK-3.9.0-linux64.sh
+]
+
+install_cmd = "./" + sources[0] + " --skip-license --prefix=%(installdir)s"
+
+sanity_check_paths = {
+    'files': ["include/optix.h", "include/optix_cuda.h", "lib64/liboptix.%s" % SHLIB_EXT,
+              "lib64/liboptixu.%s" % SHLIB_EXT],
+    'dirs': []
+}
+
+modextravars = {'OPTIX_HOME': '%(installdir)s'}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PCL/PCL-1.7.2-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PCL/PCL-1.7.2-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2aa079715804e7cbc15473179fbd9875d4da92cd
--- /dev/null
+++ b/easybuild/easyconfigs/p/PCL/PCL-1.7.2-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,33 @@
+easyblock = 'CMakeMake'
+
+name = 'PCL'
+version = '1.7.2'
+versionsuffix = '-Python-2.7.11'
+
+homepage = 'http://pointclouds.org/'
+description = """The Point Cloud Library (PCL) is a standalone, large scale, open project for 2D/3D image and
+ point cloud processing."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/PointCloudLibrary/pcl/archive/']
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [('CMake', '3.5.2')]
+dependencies = [
+    ('Boost', '1.60.0', versionsuffix),
+    ('Eigen', '3.2.8'),
+    ('FLANN', '1.8.4', versionsuffix),
+    ('VTK', '6.3.0', versionsuffix),
+    ('Qhull', '2015.2'),
+]
+
+configopts = '-DCMAKE_BUILD_TYPE=Release '
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['bin', 'include/pcl-%(version_major_minor)s/pcl', 'lib', 'share/pcl-%(version_major_minor)s'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PCRE/PCRE-8.38-foss-2016a.eb b/easybuild/easyconfigs/p/PCRE/PCRE-8.38-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1fe2fcb26ce05ce4e738991548f3e451db31c2b4
--- /dev/null
+++ b/easybuild/easyconfigs/p/PCRE/PCRE-8.38-foss-2016a.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'PCRE'
+version = '8.38'
+
+homepage = 'http://www.pcre.org/'
+description = """
+ The PCRE library is a set of functions that implement regular expression pattern matching using the same syntax
+ and semantics as Perl 5.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic --disable-cpp --enable-utf --enable-unicode-properties"
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PEAR/PEAR-0.9.6-goolf-1.4.10.eb b/easybuild/easyconfigs/p/PEAR/PEAR-0.9.6-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5ee2eb89d1a6840c2054edb07435099de8024bcf
--- /dev/null
+++ b/easybuild/easyconfigs/p/PEAR/PEAR-0.9.6-goolf-1.4.10.eb
@@ -0,0 +1,32 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+
+easyblock = 'ConfigureMake'
+
+name = 'PEAR'
+version = '0.9.6'
+
+homepage = 'http://sco.h-its.org/exelixis/web/software/pear/'
+description = """PEAR is an ultrafast, memory-efficient and highly accurate pair-end read merger. 
+ It is fully parallelized and can run with as low as just a few kilobytes of memory."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://sco.h-its.org/exelixis/web/software/pear/files/']
+sources = ['%(namelower)s-%(version)s-src.tar.gz']
+
+dependencies = [
+    ('zlib', '1.2.8'),  
+    ('bzip2', '1.0.6'),
+]
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/pear'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/PGI/PGI-16.3-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/p/PGI/PGI-16.3-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1b4b9a486623763745729375640d46e37072be30
--- /dev/null
+++ b/easybuild/easyconfigs/p/PGI/PGI-16.3-GCC-4.9.3-2.25.eb
@@ -0,0 +1,25 @@
+name = 'PGI'
+version = '16.3'
+
+homepage = 'http://www.pgroup.com/'
+description = "C, C++ and Fortran compilers from The Portland Group - PGI"
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86_64.tar.gz']
+checksums = ['618cb7ddbc57d4e4ed1f21a0ab25f427']
+
+gccver = '4.9.3'
+binutilsver = '2.25'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+    ('numactl', '2.0.11', '', ('GCCcore', gccver)),
+]
+
+# license file
+license_file = HOME + '/licenses/pgi/license.dat'
+
+moduleclass = 'compiler'
diff --git a/easybuild/easyconfigs/p/PHYLIP/PHYLIP-3.696-foss-2016a.eb b/easybuild/easyconfigs/p/PHYLIP/PHYLIP-3.696-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..90aea78df70dec7e58a5a7f3a96d5b85deb4d5fd
--- /dev/null
+++ b/easybuild/easyconfigs/p/PHYLIP/PHYLIP-3.696-foss-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'MakeCp'
+
+name = 'PHYLIP'
+version = '3.696'
+
+homepage = 'http://evolution.genetics.washington.edu/phylip'
+description = "PHYLIP is a free package of programs for inferring phylogenies."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://evolution.gs.washington.edu/phylip/download/']
+sources = [SOURCELOWER_TAR_GZ]
+
+buildopts = '-Csrc -fMakefile.unx all && make -Csrc -fMakefile.unx install'
+
+files_to_copy = [(['exe/*'], 'bin'), (['src/libdrawgram.so', 'src/libdrawtree.so'], 'lib')]
+
+sanity_check_paths = {
+     'files': ['lib/libdrawgram.so', 'lib/libdrawtree.so'],
+     'dirs': ['bin'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/PHYLIP/PHYLIP-3.696-intel-2016a.eb b/easybuild/easyconfigs/p/PHYLIP/PHYLIP-3.696-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..312062d04f12b7f722add394ddb02a78d1b780d3
--- /dev/null
+++ b/easybuild/easyconfigs/p/PHYLIP/PHYLIP-3.696-intel-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'MakeCp'
+
+name = 'PHYLIP'
+version = '3.696'
+
+homepage = 'http://evolution.genetics.washington.edu/phylip'
+description = "PHYLIP is a free package of programs for inferring phylogenies."
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://evolution.gs.washington.edu/phylip/download/']
+sources = [SOURCELOWER_TAR_GZ]
+
+buildopts = '-Csrc -fMakefile.unx all && make -Csrc -fMakefile.unx install'
+
+files_to_copy = [(['exe/*'], 'bin'), (['src/libdrawgram.so', 'src/libdrawtree.so'], 'lib')]
+
+sanity_check_paths = {
+     'files': ['lib/libdrawgram.so', 'lib/libdrawtree.so'],
+     'dirs': ['bin'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/PIL/PIL-1.1.7-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PIL/PIL-1.1.7-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0fd64f3fd21e34a54894d0a621acb7fb0ffa738e
--- /dev/null
+++ b/easybuild/easyconfigs/p/PIL/PIL-1.1.7-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+easyblock = 'PythonPackage'
+
+name = 'PIL'
+version = '1.1.7'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.pythonware.com/products/pil'
+description = """The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter.
+ This library supports many file formats, and provides powerful image processing and graphics capabilities."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://effbot.org/downloads/']
+sources = ['Imaging-%(version)s.tar.gz']
+
+patches = ['PIL-%(version)s-find-deps.patch']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.11'),
+    ('libjpeg-turbo', '1.4.2'),
+    ('freetype', '2.6.2'),
+]
+
+options = {'modulename': 'PIL'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['bin', 'lib/python%(pyshortver)s/site-packages/%(name)s'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.1.4-foss-2015b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.1.4-foss-2015b.eb
index 9cac08c076f5b5de372c817ae126ea7992ae7c4d..3b2363cdf9ab73db44ef945f91b34fcd2623c017 100644
--- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.1.4-foss-2015b.eb
+++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.1.4-foss-2015b.eb
@@ -25,7 +25,7 @@ dependencies = [
     ('libmatheval', '1.1.11'),
 ]
 
-preconfigopts = 'FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
+preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
 configopts = ' --exec-prefix=%(installdir)s --enable-gsl'
 prebuildopts = 'source sourceme.sh && '
 
diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.0-intel-2015b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.0-intel-2015b.eb
index c6b4f4fabd6169e02d59003a044b12f5318bff83..b547dd35fb8dade769859685dc5096050061e712 100644
--- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.0-intel-2015b.eb
@@ -25,7 +25,7 @@ dependencies = [
     ('libmatheval', '1.1.11'),
 ]
 
-preconfigopts = 'FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
+preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
 configopts = ' --exec-prefix=%(installdir)s --enable-gsl'
 prebuildopts = 'source sourceme.sh && '
 
diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-foss-2015b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-foss-2015b.eb
index f3480b9f428573e29ab9f12164b8511f8425617b..2be6013ea45f595e237c5c7545eb56d9aab3985f 100644
--- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-foss-2015b.eb
+++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-foss-2015b.eb
@@ -25,7 +25,7 @@ dependencies = [
     ('libmatheval', '1.1.11'),
 ]
 
-preconfigopts = 'FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
+preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
 configopts = ' --exec-prefix=%(installdir)s --enable-gsl'
 prebuildopts = 'source sourceme.sh && '
 
diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-intel-2015b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-intel-2015b.eb
index a8664f7399080fd7b6a5e8097efc264d8a247abd..c2a88ca7fa924f8469b33742f20d7de8948e66c9 100644
--- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.2.1-intel-2015b.eb
@@ -25,7 +25,7 @@ dependencies = [
     ('libmatheval', '1.1.11'),
 ]
 
-preconfigopts = 'FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
+preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" '
 configopts = ' --exec-prefix=%(installdir)s --enable-gsl'
 prebuildopts = 'source sourceme.sh && '
 
diff --git a/easybuild/easyconfigs/p/PLplot/PLplot-5.11.1-foss-2016a-Java-1.7.0_80-Python-2.7.11.eb b/easybuild/easyconfigs/p/PLplot/PLplot-5.11.1-foss-2016a-Java-1.7.0_80-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a77bf58f4923eef8e3ca0b2644475643337576a6
--- /dev/null
+++ b/easybuild/easyconfigs/p/PLplot/PLplot-5.11.1-foss-2016a-Java-1.7.0_80-Python-2.7.11.eb
@@ -0,0 +1,56 @@
+easyblock = 'CMakeMake'
+
+name = 'PLplot'
+version = '5.11.1'
+versionsuffix = '-Java-%(javaver)s-Python-%(pyver)s'
+
+homepage = 'http://plplot.sourceforge.net'
+description = """PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols
+ and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+    ('CMake', '3.4.3'),
+    ('SWIG', '3.0.8', '-Python-%(pyver)s'),
+    ('xproto', '7.0.28'),
+]
+
+dependencies = [
+    ('Java', '1.7.0_80', '', True),
+    ('Python', '2.7.11'),
+    ('Perl', '5.22.1'),
+    ('Tcl', '8.6.4'),
+    ('Tk', '8.6.4', '-no-X11'),
+    ('cairo', '1.14.6'),
+    ('expat', '2.1.0'),
+    ('fontconfig', '2.11.94'),
+    ('freetype', '2.6.2'),
+    ('GLib', '2.47.5'),
+    ('libICE', '1.0.9'),
+    ('libtool', '2.4.6'),
+    ('libX11', '1.6.3'),
+    ('libXau', '1.0.8'),
+    ('libxcb', '1.11.1'),
+    ('libXdmcp', '1.1.2'),
+    ('libXext', '1.3.3'),
+    ('libXrender', '0.9.9'),
+    ('Pango', '1.39.0'),
+    ('pixman', '0.34.0'),
+    ('zlib', '1.2.8')
+]
+
+separate_build_dir = True
+
+modextrapaths = {'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages'}
+
+sanity_check_paths = {
+    'files': ['lib/libplplot.so', 'lib/pkgconfig/plplot-f95.pc'],
+    'dirs': ['bin', 'include/plplot', 'lib/fortran/modules/plplot', 'lib/pkgconfig', 'share/man/man1'],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PRINSEQ/PRINSEQ-0.20.4-foss-2015b-Perl-5.20.3.eb b/easybuild/easyconfigs/p/PRINSEQ/PRINSEQ-0.20.4-foss-2015b-Perl-5.20.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1d36878e90c02a9b7bbeb6d08dfbc7897120fa56
--- /dev/null
+++ b/easybuild/easyconfigs/p/PRINSEQ/PRINSEQ-0.20.4-foss-2015b-Perl-5.20.3.eb
@@ -0,0 +1,118 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+# Modified by Adam Huffman
+# The Francis Crick Institute
+
+easyblock = 'Tarball'
+
+name = 'PRINSEQ'
+version = '0.20.4'
+
+homepage = 'http://prinseq.sourceforge.net'
+description = """A bioinformatics tool to PRe-process and show INformation of SEQuence data."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+source_urls = ['http://sourceforge.net/projects/prinseq/files/standalone/']
+sources = ['%(namelower)s-lite-%(version)s.tar.gz']
+
+perl = 'Perl'
+perlver = '5.20.3'
+versionsuffix = '-%s-%s' % (perl, perlver)
+
+dependencies = [
+    (perl, perlver),
+]
+
+# these are the perl libraries dependencies
+exts_defaultclass = 'PerlModule'
+exts_filter = ("perldoc -lm %(ext_name)s ", "")
+
+exts_list = [
+    ('ExtUtils::Depends', '0.405', {
+         'source_tmpl': 'ExtUtils-Depends-0.405.tar.gz',
+         'source_urls': ['https://cpan.metacpan.org/authors/id/X/XA/XAOC/'],
+    }),
+    ('ExtUtils::PkgConfig', '1.15', {
+         'source_tmpl': 'ExtUtils-PkgConfig-1.15.tar.gz',
+         'source_urls': ['https://cpan.metacpan.org/authors/id/X/XA/XAOC/'],
+    }),
+    ('Getopt::Long', '2.48', {
+         'source_tmpl': 'Getopt-Long-2.48.tar.gz',
+         'source_urls': ['https://cpan.metacpan.org/authors/id/J/JV/JV/'],
+    }),
+    ('Pod::Usage', '1.68', {
+        'source_tmpl': 'Pod-Usage-1.68.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAREKR/'],
+    }),
+    ('File::Temp', '0.2304', {
+        'source_tmpl': 'File-Temp-0.2304.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/'],
+    }),
+    ('Digest::MD5', '2.54', {
+        'source_tmpl': 'Digest-MD5-2.54.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS/'],
+    }),
+    ('File::Spec', '3.62', {
+        'source_tmpl': 'PathTools-3.62.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS/'],
+    }),
+    ('JSON', '2.90', {
+        'source_tmpl': 'JSON-2.90.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA/'],
+    }),
+    ('Cairo', '1.106', {
+        'source_tmpl': 'Cairo-1.106.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/X/XA/XAOC/'],
+    }),
+    ('Statistics::PCA', '0.0.1', {
+        'source_tmpl': 'Statistics-PCA-0.0.1.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSTH/'],
+    }),
+    ('MIME::Base64', '3.15', {
+        'source_tmpl': 'MIME-Base64-3.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS/'],
+    }),
+    ('Math::Cephes::Matrix', '0.5304', {
+        'source_tmpl': 'Math-Cephes-0.5304.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/'],
+    }),
+    ('Math::MatrixReal', '2.12', {
+        'source_tmpl': 'Math-MatrixReal-2.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LETO/'],
+    }),
+    ('Text::SimpleTable', '2.03', {
+        'source_tmpl': 'Text-SimpleTable-2.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MR/MRAMBERG/'],
+    }),
+    ('Contextual::Return', '0.004008', {
+        'source_tmpl': 'Contextual-Return-0.004008.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DC/DCONWAY/'],
+    }),
+    ('Want', '0.26', {
+        'source_tmpl': 'Want-0.26.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RO/ROBIN/'],
+    }),
+]
+
+# this is the script which relies in many extra Perl libraries so we verify it's working fine
+sanity_check_commands = [('perl', '%(installdir)s/prinseq-graphs.pl')]
+
+modextrapaths = {
+    'PATH': "", # add installation dir to PATH
+    'PERL5LIB': 'lib/perl5/site_perl/%s/' % (perlver)
+}
+
+postinstallcmds = [
+    "sed -i -e 's|/usr/bin/perl|/usr/bin/env\ perl|' %(installdir)s/*.pl", # fix shebang line
+    "chmod +x %(installdir)s/*.pl" # add execution permission
+]  
+
+sanity_check_paths = {
+    'files': ['prinseq-lite.pl', 'prinseq-graphs.pl', 'prinseq-graphs-noPCA.pl'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.39.0-foss-2016a.eb b/easybuild/easyconfigs/p/Pango/Pango-1.39.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..80529d5bda3c534bc2b5b7e406ebd32f0bee41bc
--- /dev/null
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.39.0-foss-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'Pango'
+version = '1.39.0'
+
+homepage = 'http://www.pango.org/'
+description = """Pango is a library for laying out and rendering of text, with an emphasis on internationalization.
+Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the
+context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+glibver = '2.47.5'
+dependencies = [
+    ('GLib', glibver),
+    ('cairo', '1.14.6'),
+    ('HarfBuzz', '1.1.3'),
+    ('GObject-Introspection', '1.47.1'),
+    ('fontconfig', '2.11.94')
+]
+
+configopts = "--disable-silent-rules --enable-introspection=yes --enable-static --enable-shared "
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/Pango/Pango-1.40.1-intel-2016a.eb b/easybuild/easyconfigs/p/Pango/Pango-1.40.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b251f8ef22a0f36213d535ae9ba577415943ae89
--- /dev/null
+++ b/easybuild/easyconfigs/p/Pango/Pango-1.40.1-intel-2016a.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'Pango'
+version = '1.40.1'
+
+homepage = 'http://www.pango.org/'
+description = """Pango is a library for laying out and rendering of text, with an emphasis on internationalization.
+Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the
+context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+glibver = '2.48.0'
+dependencies = [
+    ('GLib', glibver),
+    ('cairo', '1.14.6', '-GLib-%s' % glibver),
+    ('HarfBuzz', '1.2.7'),
+    ('GObject-Introspection', '1.48.0'),
+    ('fontconfig', '2.11.95')
+]
+
+configopts = "--disable-silent-rules --enable-introspection=yes --enable-static --enable-shared "
+
+modextrapaths = {
+    'XDG_DATA_DIRS': 'share',
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-intel-2016a.eb b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d1d34fb0577a53c7df38e86109ee93af50c5ac35
--- /dev/null
+++ b/easybuild/easyconfigs/p/ParMETIS/ParMETIS-4.0.3-intel-2016a.eb
@@ -0,0 +1,22 @@
+name = 'ParMETIS'
+version = '4.0.3'
+
+homepage = 'http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview'
+description = """ParMETIS is an MPI-based parallel library that implements a variety of algorithms for partitioning unstructured graphs,
+ meshes, and for computing fill-reducing orderings of sparse matrices. ParMETIS extends the functionality provided by METIS and includes
+ routines that are especially suited for parallel AMR computations and large scale numerical simulations. The algorithms implemented in
+ ParMETIS are based on the parallel multilevel k-way graph-partitioning, adaptive repartitioning, and parallel multi-constrained partitioning
+ schemes."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'usempi': True, 'pic': True}
+
+source_urls = [
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis',
+    'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD',
+]
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [('CMake', '3.5.2')]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/p/ParMGridGen/ParMGridGen-1.0-intel-2016a.eb b/easybuild/easyconfigs/p/ParMGridGen/ParMGridGen-1.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..081f188ad5b51539f025bebabcee961aefbcbcd5
--- /dev/null
+++ b/easybuild/easyconfigs/p/ParMGridGen/ParMGridGen-1.0-intel-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'MakeCp'
+
+name = 'ParMGridGen'
+version = '1.0'
+
+homepage = 'http://www-users.cs.umn.edu/~moulitsa/software.html'
+description = """ParMGridGen is an MPI-based parallel library that is based on the serial package MGridGen,
+ that implements (serial) algorithms for obtaining a sequence of successive coarse grids that are well-suited
+ for geometric multigrid methods."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'usempi': True, 'pic': True}
+
+source_urls = ['http://www-users.cs.umn.edu/~moulitsa/download/']
+sources = [SOURCE_TAR_GZ]
+
+patches = ['ParMGridGen-1.0_malloc_include.patch']
+
+buildopts = 'parallel CC="$CC" PARCC="$CC" PARLD="$CC" COPTIONS="$CFLAGS" LDOPTIONS="$CFLAGS" BINDIR="."'
+
+files_to_copy = [
+    (['MGridGen/Programs/mgridgen', 'ParMGridGen/Programs/parmgridgen'], 'bin'),
+    (['mgridgen.h', 'parmgridgen.h'], 'include'),
+    (['libmgrid.a', 'libparmgrid.a'], 'lib'),
+]
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2016a.eb b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..838808a7430e2ff01978cad94497c5f60727f166
--- /dev/null
+++ b/easybuild/easyconfigs/p/ParaView/ParaView-4.4.0-intel-2016a.eb
@@ -0,0 +1,45 @@
+easyblock = 'CMakeMake'
+
+name = 'ParaView'
+version = '4.4.0'
+
+homepage = "http://www.paraview.org"
+description = "ParaView is a scientific parallel visualizer."
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True, 'usempi': False}
+
+download_suffix = 'download.php?submit=Download&version=v%(version_major_minor)s&type=source&os=all&downloadFile='
+source_urls = ['http://www.paraview.org/paraview-downloads/%s' % download_suffix]
+sources = ["ParaView-v%(version)s-source.tar.gz"]
+
+patches = ['%(name)s-%(version)s_missingheader.patch']
+
+dependencies = [
+    ('libGLU', '9.0.0', '-Mesa-11.2.1'),
+    ('libXt', '1.1.5'),
+    ('Qt', '4.8.7'),
+    ('libXext', '1.3.3'),
+    ('libX11', '1.6.3'),
+    ('zlib', '1.2.8'),
+]
+
+builddependencies = [('CMake', '3.5.2')]
+
+separate_build_dir = True
+
+configopts = '-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON -DVTK_OPENGL_HAS_OSMESA=ON '
+configopts += '-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.so '
+configopts += '-DOSMESA_INCLUDE_DIR=$EBROOTMESA/include -DOSMESA_LIBRARY=$EBROOTMESA/lib/libOSMesa.so '
+# Without internet connection turn off testing (uncomment the following line)
+configopts += '-DBUILD_TESTING=OFF '
+# Or consult https://gitlab.kitware.com/vtk/vtk/blob/master/Documentation/dev/git/data.md
+# and download ExternalData to $EASYBUILD_SOURCEPATH and adjust -DExternalData_OBJECT_STORES accordingly
+# Without internet connection, comment the following two lines (configopts and prebuildopts)
+configopts += '-DExternalData_OBJECT_STORES=%(builddir)s/ExternalData '
+# The ParaView server can be cranky, test downloads are quite often failing, especially in the case
+# of parallel downloads. Using ; insted of && gives a second chance to download the test files, if the
+# first serial attempt would fail.
+prebuildopts = 'make VTKData ;'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.20.3-intel-2015a.eb b/easybuild/easyconfigs/p/Perl/Perl-5.20.3-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e4d3b47d6f8f391295c83f0b41c86ec97a04b6e7
--- /dev/null
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.20.3-intel-2015a.eb
@@ -0,0 +1,909 @@
+name = 'Perl'
+version = '5.20.3'
+
+homepage = 'http://www.perl.org/'
+description = """Larry Wall's Practical Extraction and Report Language"""
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.cpan.org/src/5.0']
+sources = [SOURCELOWER_TAR_GZ]
+
+exts_list = [
+    ('Config::General', '2.58', {
+        'source_tmpl': 'Config-General-2.58.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TL/TLINDEN'],
+    }),
+    ('File::Listing', '6.04', {
+        'source_tmpl': 'File-Listing-6.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('ExtUtils::InstallPaths', '0.011', {
+        'source_tmpl': 'ExtUtils-InstallPaths-0.011.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('ExtUtils::Helpers', '0.022', {
+        'source_tmpl': 'ExtUtils-Helpers-0.022.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('TAP::Harness::Env', '3.35', {
+        'source_tmpl': 'Test-Harness-3.35.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('ExtUtils::Config', '0.008', {
+        'source_tmpl': 'ExtUtils-Config-0.008.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Module::Build::Tiny', '0.039', {
+        'source_tmpl': 'Module-Build-Tiny-0.039.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('aliased', '0.34', {
+        'source_tmpl': 'aliased-0.34.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Text::Glob', '0.09', {
+        'source_tmpl': 'Text-Glob-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('Regexp::Common', '2013031301', {
+        'source_tmpl': 'Regexp-Common-2013031301.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABIGAIL'],
+    }),
+    ('GO::Utils', '0.15', {
+        'source_tmpl': 'go-perl-0.15.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
+    }),
+    ('Module::Pluggable', '5.2', {
+        'source_tmpl': 'Module-Pluggable-5.2.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SI/SIMONW'],
+    }),
+    ('Test::Fatal', '0.014', {
+        'source_tmpl': 'Test-Fatal-0.014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Warnings', '0.021', {
+        'source_tmpl': 'Test-Warnings-0.021.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('DateTime::Locale', '0.46', {
+        'source_tmpl': 'DateTime-Locale-0.46.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('DateTime::TimeZone', '1.93', {
+        'source_tmpl': 'DateTime-TimeZone-1.93.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Test::Requires', '0.10', {
+        'source_tmpl': 'Test-Requires-0.10.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM'],
+    }),
+    ('Module::Implementation', '0.09', {
+        'source_tmpl': 'Module-Implementation-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Module::Runtime', '0.014', {
+        'source_tmpl': 'Module-Runtime-0.014.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM'],
+    }),
+    ('Try::Tiny', '0.22', {
+        'source_tmpl': 'Try-Tiny-0.22.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Params::Validate', '1.21', {
+        'source_tmpl': 'Params-Validate-1.21.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('List::MoreUtils', '0.413', {
+        'source_tmpl': 'List-MoreUtils-0.413.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Exporter::Tiny', '0.042', {
+        'source_tmpl': 'Exporter-Tiny-0.042.tar.gz',
+        'source_urls': ['http://search.cpan.org/CPAN/authors/id/T/TO/TOBYINK'],
+    }),
+    ('Class::Singleton', '1.5', {
+        'source_tmpl': 'Class-Singleton-1.5.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
+    }),
+    ('DateTime', '1.20', {
+        'source_tmpl': 'DateTime-1.20.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('File::Find::Rule::Perl', '1.15', {
+        'source_tmpl': 'File-Find-Rule-Perl-1.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Module::Build', '0.4214', {
+        'source_tmpl': 'Module-Build-0.4214.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Readonly', '2.00', {
+        'source_tmpl': 'Readonly-2.00.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SA/SANKO'],
+    }),
+    ('Git', '0.41', {
+        'source_tmpl': 'Git-0.41.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MS/MSOUTH'],
+    }),
+    ('Tree::DAG_Node', '1.27', {
+        'source_tmpl': 'Tree-DAG_Node-1.27.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Template', '2.26', {
+        'source_tmpl': 'Template-Toolkit-2.26.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABW'],
+    }),
+    ('FreezeThaw', '0.5001', {
+        'source_tmpl': 'FreezeThaw-0.5001.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/I/IL/ILYAZ/modules'],
+    }),
+    ('DBI', '1.634', {
+        'source_tmpl': 'DBI-1.634.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TI/TIMB'],
+    }),
+    ('DBD::SQLite', '1.48', {
+        'source_tmpl': 'DBD-SQLite-1.48.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI'],
+    }),
+    ('Math::Bezier', '0.01', {
+        'source_tmpl': 'Math-Bezier-0.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AB/ABW'],
+    }),
+    ('Archive::Extract', '0.76', {
+        'source_tmpl': 'Archive-Extract-0.76.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('DBIx::Simple', '1.35', {
+        'source_tmpl': 'DBIx-Simple-1.35.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/J/JU/JUERD'],
+    }),
+    ('Shell', '0.72', {
+        'source_tmpl': 'Shell-0.72.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FE/FERREIRA'],
+    }),
+    ('File::Spec', '3.47', {
+        'source_tmpl': 'PathTools-3.47.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
+    }),
+    ('ExtUtils::MakeMaker', '7.10', {
+        'source_tmpl': 'ExtUtils-MakeMaker-7.10.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Test::Simple', '1.001014', {
+        'source_tmpl': 'Test-Simple-1.001014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Set::Scalar', '1.29', {
+        'source_tmpl': 'Set-Scalar-1.29.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DA/DAVIDO'],
+    }),
+    ('IO::WrapTie', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Encode::Locale', '1.05', {
+        'source_tmpl': 'Encode-Locale-1.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('XML::SAX::Base', '1.08', {
+        'source_tmpl': 'XML-SAX-Base-1.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('XML::NamespaceSupport', '1.11', {
+        'source_tmpl': 'XML-NamespaceSupport-1.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
+    }),
+    ('XML::SAX', '0.99', {
+        'source_tmpl': 'XML-SAX-0.99.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('Test::LeakTrace', '0.15', {
+        'source_tmpl': 'Test-LeakTrace-0.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GF/GFUJI'],
+    }),
+    ('Test::Exception', '0.40', {
+        'source_tmpl': 'Test-Exception-0.40.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Text::Table', '1.130', {
+        'source_tmpl': 'Text-Table-1.130.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('MIME::Types', '2.11', {
+        'source_tmpl': 'MIME-Types-2.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
+    }),
+    ('Module::Build::XSUtil', '0.16', {
+        'source_tmpl': 'Module-Build-XSUtil-0.16.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HI/HIDEAKIO'],
+    }),
+    ('Tie::Function', '0.02', {
+        'source_tmpl': 'Tie-Function-0.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DA/DAVIDNICO/handy_tied_functions'],
+    }),
+    ('Template::Plugin::Number::Format', '1.06', {
+        'source_tmpl': 'Template-Plugin-Number-Format-1.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DARREN'],
+    }),
+    ('HTML::Parser', '3.71', {
+        'source_tmpl': 'HTML-Parser-3.71.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Date::Handler', '1.2', {
+        'source_tmpl': 'Date-Handler-1.2.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BB/BBEAUSEJ'],
+    }),
+    ('Params::Util', '1.07', {
+        'source_tmpl': 'Params-Util-1.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('IO::HTML', '1.001', {
+        'source_tmpl': 'IO-HTML-1.001.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CJ/CJM'],
+    }),
+    ('Data::Grove', '0.08', {
+        'source_tmpl': 'libxml-perl-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KM/KMACLEOD'],
+    }),
+    ('Class::ISA', '0.36', {
+        'source_tmpl': 'Class-ISA-0.36.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
+    }),
+    ('URI', '1.69', {
+        'source_tmpl': 'URI-1.69.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Ima::DBI', '0.35', {
+        'source_tmpl': 'Ima-DBI-0.35.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PERRIN'],
+    }),
+    ('Tie::IxHash', '1.23', {
+        'source_tmpl': 'Tie-IxHash-1.23.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('GO', '0.04', {
+        'source_tmpl': 'go-db-perl-0.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SJ/SJCARBON'],
+    }),
+    ('Class::DBI::SQLite', '0.11', {
+        'source_tmpl': 'Class-DBI-SQLite-0.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('Pod::POM', '2.00', {
+        'source_tmpl': 'Pod-POM-2.00.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Math::Round', '0.07', {
+        'source_tmpl': 'Math-Round-0.07.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GROMMEL'],
+    }),
+    ('Text::Diff', '1.43', {
+        'source_tmpl': 'Text-Diff-1.43.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Log::Message::Simple', '0.10', {
+        'source_tmpl': 'Log-Message-Simple-0.10.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('IO::Socket::SSL', '2.020', {
+        'source_tmpl': 'IO-Socket-SSL-2.020.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SU/SULLR'],
+    }),
+    ('Fennec::Lite', '0.004', {
+        'source_tmpl': 'Fennec-Lite-0.004.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Sub::Uplevel', '0.25', {
+        'source_tmpl': 'Sub-Uplevel-0.25.tar.gz',
+        'source_urls': ['http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/'],
+    }),
+    ('Meta::Builder', '0.003', {
+        'source_tmpl': 'Meta-Builder-0.003.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Exporter::Declare', '0.114', {
+        'source_tmpl': 'Exporter-Declare-0.114.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('IO::Stringy', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Getopt::Long', '2.47', {
+        'source_tmpl': 'Getopt-Long-2.47.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JV/JV'],
+    }),
+    ('Log::Message', '0.08', {
+        'source_tmpl': 'Log-Message-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Mouse', 'v2.4.5', {
+        'source_tmpl': 'Mouse-v2.4.5.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SY/SYOHEX'],
+    }),
+    ('Test::Version', '2.03', {
+        'source_tmpl': 'Test-Version-2.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
+    }),
+    ('DBIx::Admin::TableInfo', '3.01', {
+        'source_tmpl': 'DBIx-Admin-TableInfo-3.01.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Net::HTTP', '6.09', {
+        'source_tmpl': 'Net-HTTP-6.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Test::Deep', '0.117', {
+        'source_tmpl': 'Test-Deep-0.117.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Warn', '0.30', {
+        'source_tmpl': 'Test-Warn-0.30.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('MRO::Compat', '0.12', {
+        'source_tmpl': 'MRO-Compat-0.12.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BO/BOBTFISH'],
+    }),
+    ('Moo', '2.000002', {
+        'source_tmpl': 'Moo-2.000002.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('Hash::Merge', '0.200', {
+        'source_urls': ['http://search.cpan.org/CPAN/authors/id/R/RE/REHSACK/'],
+        'source_tmpl': 'Hash-Merge-0.200.tar.gz',
+    }),
+    ('SQL::Abstract', '1.81', {
+        'source_tmpl': 'SQL-Abstract-1.81.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RI/RIBASUSHI'],
+    }),
+    ('HTML::Form', '6.03', {
+        'source_tmpl': 'HTML-Form-6.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('File::Copy::Recursive', '0.38', {
+        'source_tmpl': 'File-Copy-Recursive-0.38.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DM/DMUEY'],
+    }),
+    ('Number::Compare', '0.03', {
+        'source_tmpl': 'Number-Compare-0.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('IPC::Run', '0.94', {
+        'source_tmpl': 'IPC-Run-0.94.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('HTML::Entities::Interpolate', '1.05', {
+        'source_tmpl': 'HTML-Entities-Interpolate-1.05.tgz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Test::ClassAPI', '1.06', {
+        'source_tmpl': 'Test-ClassAPI-1.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Test::Most', '0.34', {
+        'source_tmpl': 'Test-Most-0.34.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/O/OV/OVID'],
+    }),
+    ('Class::Accessor', '0.34', {
+        'source_tmpl': 'Class-Accessor-0.34.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Test::Differences', '0.63', {
+        'source_tmpl': 'Test-Differences-0.63.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
+    }),
+    ('HTTP::Tiny', '0.056', {
+        'source_tmpl': 'HTTP-Tiny-0.056.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('Package::DeprecationManager', '0.14', {
+        'source_tmpl': 'Package-DeprecationManager-0.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Digest::SHA1', '2.13', {
+        'source_tmpl': 'Digest-SHA1-2.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Date::Language', '2.30', {
+        'source_tmpl': 'TimeDate-2.30.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GB/GBARR'],
+    }),
+    ('version', '0.9912', {
+        'source_tmpl': 'version-0.9912.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JP/JPEACOCK'],
+    }),
+    ('Sub::Uplevel', '0.25', {
+        'source_tmpl': 'Sub-Uplevel-0.25.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('XML::Bare', '0.53', {
+        'source_tmpl': 'XML-Bare-0.53.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CO/CODECHILD/'],
+        'patches': ['XML-Bare-0.53_icc.patch'],
+    }),
+    ('Dist::CheckConflicts', '0.11', {
+        'source_tmpl': 'Dist-CheckConflicts-0.11.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Sub::Name', '0.14', {
+        'source_tmpl': 'Sub-Name-0.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Time::Piece', '1.30', {
+        'source_tmpl': 'Time-Piece-1.30.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Digest::HMAC', '1.03', {
+        'source_tmpl': 'Digest-HMAC-1.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('HTTP::Negotiate', '6.01', {
+        'source_tmpl': 'HTTP-Negotiate-6.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('MIME::Lite', '3.030', {
+        'source_tmpl': 'MIME-Lite-3.030.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Crypt::Rijndael', '1.13', {
+        'source_tmpl': 'Crypt-Rijndael-1.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('B::Lint', '1.20', {
+        'source_tmpl': 'B-Lint-1.20.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Canary::Stability', '2006', {
+        'source_tmpl': 'Canary-Stability-2006.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
+    }),
+    ('AnyEvent', '7.11', {
+        'source_tmpl': 'AnyEvent-7.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
+    }),
+    ('Object::Accessor', '0.48', {
+        'source_tmpl': 'Object-Accessor-0.48.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Data::UUID', '1.221', {
+        'source_tmpl': 'Data-UUID-1.221.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Pod', '1.51', {
+        'source_tmpl': 'Test-Pod-1.51.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('AppConfig', '1.71', {
+        'source_tmpl': 'AppConfig-1.71.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Net::SMTP::SSL', '1.03', {
+        'source_tmpl': 'Net-SMTP-SSL-1.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('XML::Tiny', '2.06', {
+        'source_tmpl': 'XML-Tiny-2.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
+    }),
+    ('HTML::Tagset', '3.20', {
+        'source_tmpl': 'HTML-Tagset-3.20.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/P/PE/PETDANCE'],
+    }),
+    ('HTML::Tree', '5.03', {
+        'source_tmpl': 'HTML-Tree-5.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CJ/CJM'],
+    }),
+    ('Devel::GlobalDestruction', '0.13', {
+        'source_tmpl': 'Devel-GlobalDestruction-0.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('WWW::RobotRules', '6.02', {
+        'source_tmpl': 'WWW-RobotRules-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Expect', '1.32', {
+        'source_tmpl': 'Expect-1.32.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SZ/SZABGAB'],
+    }),
+    ('Term::UI', '0.46', {
+        'source_tmpl': 'Term-UI-0.46.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Net::SNMP', 'v6.0.1', {
+        'source_tmpl': 'Net-SNMP-v6.0.1.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DT/DTOWN'],
+    }),
+    ('XML::SAX::Writer', '0.56', {
+        'source_tmpl': 'XML-SAX-Writer-0.56.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
+    }),
+    ('Statistics::Descriptive', '3.0609', {
+        'source_tmpl': 'Statistics-Descriptive-3.0609.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Class::Load', '0.23', {
+        'source_tmpl': 'Class-Load-0.23.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('LWP::Simple', '6.13', {
+        'source_tmpl': 'libwww-perl-6.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Time::Piece::MySQL', '0.06', {
+        'source_tmpl': 'Time-Piece-MySQL-0.06.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Package::Stash::XS', '0.28', {
+        'source_tmpl': 'Package-Stash-XS-0.28.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('GD::Graph', '1.49', {
+        'source_tmpl': 'GDGraph-1.49.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RU/RUZ'],
+    }),
+    ('Set::Array', '0.30', {
+        'source_tmpl': 'Set-Array-0.30.tgz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('boolean', '0.45', {
+        'source_tmpl': 'boolean-0.45.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IN/INGY'],
+    }),
+    ('Number::Format', '1.75', {
+        'source_tmpl': 'Number-Format-1.75.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/W/WR/WRW'],
+    }),
+    ('Data::Stag', '0.14', {
+        'source_tmpl': 'Data-Stag-0.14.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
+    }),
+    ('Test::Tester', '1.001014', {
+        'source_tmpl': 'Test-Simple-1.001014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Test::NoWarnings', '1.04', {
+        'source_tmpl': 'Test-NoWarnings-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Crypt::DES', '2.07', {
+        'source_tmpl': 'Crypt-DES-2.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DP/DPARIS'],
+    }),
+    ('Exporter', '5.72', {
+        'source_tmpl': 'Exporter-5.72.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('Class::Inspector', '1.28', {
+        'source_tmpl': 'Class-Inspector-1.28.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Parse::RecDescent', '1.967012', {
+        'source_tmpl': 'Parse-RecDescent-1.967012.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JT/JTBRAUN'],
+    }),
+    ('Carp', '1.36', {
+        'source_tmpl': 'Carp-1.36.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('XML::XPath', '1.13', {
+        'source_tmpl': 'XML-XPath-1.13.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MS/MSERGEANT'],
+    }),
+    ('Capture::Tiny', '0.30', {
+        'source_tmpl': 'Capture-Tiny-0.30.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('JSON', '2.90', {
+        'source_tmpl': 'JSON-2.90.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA'],
+    }),
+    ('Sub::Exporter', '0.987', {
+        'source_tmpl': 'Sub-Exporter-0.987.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Class::Load::XS', '0.09', {
+        'source_tmpl': 'Class-Load-XS-0.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Set::IntSpan::Fast', '1.15', {
+        'source_tmpl': 'Set-IntSpan-Fast-1.15.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AN/ANDYA'],
+    }),
+    ('Sub::Exporter::Progressive', '0.001011', {
+        'source_tmpl': 'Sub-Exporter-Progressive-0.001011.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FR/FREW'],
+    }),
+    ('LWP', '6.13', {
+        'source_tmpl': 'libwww-perl-6.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Data::Dumper::Concise', '2.022', {
+        'source_tmpl': 'Data-Dumper-Concise-2.022.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/F/FR/FREW'],
+    }),
+    ('File::Slurp::Tiny', '0.004', {
+        'source_tmpl': 'File-Slurp-Tiny-0.004.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Algorithm::Diff', '1.1903', {
+        'source_tmpl': 'Algorithm-Diff-1.1903.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TY/TYEMQ'],
+    }),
+    ('AnyData', '0.12', {
+        'source_tmpl': 'AnyData-0.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Text::Iconv', '1.7', {
+        'source_tmpl': 'Text-Iconv-1.7.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MP/MPIOTR'],
+    }),
+    ('Class::Data::Inheritable', '0.08', {
+        'source_tmpl': 'Class-Data-Inheritable-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('Text::Balanced', '2.03', {
+        'source_tmpl': 'Text-Balanced-2.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
+    }),
+    ('strictures', '2.000001', {
+        'source_tmpl': 'strictures-2.000001.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('Switch', '2.17', {
+        'source_tmpl': 'Switch-2.17.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('File::Which', '1.19', {
+        'source_tmpl': 'File-Which-1.19.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
+    }),
+    ('Email::Date::Format', '1.005', {
+        'source_tmpl': 'Email-Date-Format-1.005.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Error', '0.17024', {
+        'source_tmpl': 'Error-0.17024.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Mock::Quick', '1.110', {
+        'source_tmpl': 'Mock-Quick-1.110.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Text::CSV', '1.33', {
+        'source_tmpl': 'Text-CSV-1.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA'],
+    }),
+    ('Test::Output', '1.03', {
+        'source_tmpl': 'Test-Output-1.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BD/BDFOY'],
+    }),
+    ('Class::DBI', 'v3.0.17', {
+        'source_tmpl': 'Class-DBI-v3.0.17.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('List::AllUtils', '0.09', {
+        'source_tmpl': 'List-AllUtils-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('UNIVERSAL::moniker', '0.08', {
+        'source_tmpl': 'UNIVERSAL-moniker-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Exception::Class', '1.39', {
+        'source_tmpl': 'Exception-Class-1.39.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('File::CheckTree', '4.42', {
+        'source_tmpl': 'File-CheckTree-4.42.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Math::VecStat', '0.08', {
+        'source_tmpl': 'Math-VecStat-0.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AS/ASPINELLI'],
+    }),
+    ('Pod::LaTeX', '0.61', {
+        'source_tmpl': 'Pod-LaTeX-0.61.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TJ/TJENNESS'],
+    }),
+    ('Eval::Closure', '0.13', {
+        'source_tmpl': 'Eval-Closure-0.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('HTTP::Request', '6.11', {
+        'source_tmpl': 'HTTP-Message-6.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('XML::Twig', '3.49', {
+        'source_tmpl': 'XML-Twig-3.49.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIROD'],
+    }),
+    ('IO::String', '1.08', {
+        'source_tmpl': 'IO-String-1.08.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('XML::Simple', '2.20', {
+        'source_tmpl': 'XML-Simple-2.20.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('Sub::Install', '0.928', {
+        'source_tmpl': 'Sub-Install-0.928.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('HTTP::Cookies', '6.01', {
+        'source_tmpl': 'HTTP-Cookies-6.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Pod::Plainer', '1.04', {
+        'source_tmpl': 'Pod-Plainer-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RM/RMBARKER'],
+    }),
+    ('Test::Exception::LessClever', '0.006', {
+        'source_tmpl': 'Test-Exception-LessClever-0.006.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('LWP::MediaTypes', '6.02', {
+        'source_tmpl': 'LWP-MediaTypes-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Scalar::Util', '1.42', {
+        'source_tmpl': 'Scalar-List-Utils-1.42.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PEVANS'],
+    }),
+    ('Data::Section::Simple', '0.07', {
+        'source_tmpl': 'Data-Section-Simple-0.07.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('IO::Scalar', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Class::Trigger', '0.14', {
+        'source_tmpl': 'Class-Trigger-0.14.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('HTTP::Daemon', '6.01', {
+        'source_tmpl': 'HTTP-Daemon-6.01.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('File::HomeDir', '1.00', {
+        'source_tmpl': 'File-HomeDir-1.00.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('HTTP::Date', '6.02', {
+        'source_tmpl': 'HTTP-Date-6.02.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Authen::SASL', '2.16', {
+        'source_tmpl': 'Authen-SASL-2.16.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GB/GBARR'],
+    }),
+    ('Clone', '0.38', {
+        'source_tmpl': 'Clone-0.38.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GARU'],
+    }),
+    ('Data::Types', '0.09', {
+        'source_tmpl': 'Data-Types-0.09.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DW/DWHEELER'],
+    }),
+    ('Import::Into', '1.002005', {
+        'source_tmpl': 'Import-Into-1.002005.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('DateTime::Tiny', '1.04', {
+        'source_tmpl': 'DateTime-Tiny-1.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('DBD::AnyData', '0.110', {
+        'source_tmpl': 'DBD-AnyData-0.110.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Text::Format', '0.59', {
+        'source_tmpl': 'Text-Format-0.59.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Devel::CheckCompiler', '0.06', {
+        'source_tmpl': 'Devel-CheckCompiler-0.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SY/SYOHEX'],
+    }),
+    ('Log::Handler', '0.87', {
+        'source_tmpl': 'Log-Handler-0.87.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BL/BLOONIX'],
+    }),
+    ('DBIx::ContextualFetch', '1.03', {
+        'source_tmpl': 'DBIx-ContextualFetch-1.03.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('HTML::Entities', '3.71', {
+        'source_tmpl': 'HTML-Parser-3.71.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Devel::StackTrace', '2.00', {
+        'source_tmpl': 'Devel-StackTrace-2.00.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Term::ReadKey', '2.33', {
+        'source_tmpl': 'TermReadKey-2.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JS/JSTOWE'],
+    }),
+    ('Set::IntSpan', '1.19', {
+        'source_tmpl': 'Set-IntSpan-1.19.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/S/SW/SWMCD'],
+    }),
+    ('Moose', '2.1603', {
+        'source_tmpl': 'Moose-2.1603.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Algorithm::Dependency', '1.110', {
+        'source_tmpl': 'Algorithm-Dependency-1.110.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Font::TTF', '1.05', {
+        'source_tmpl': 'Font-TTF-1.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MH/MHOSKEN'],
+    }),
+    ('IPC::Run3', '0.048', {
+        'source_tmpl': 'IPC-Run3-0.048.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('File::Find::Rule', '0.33', {
+        'source_tmpl': 'File-Find-Rule-0.33.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('SQL::Statement', '1.407', {
+        'source_tmpl': 'SQL-Statement-1.407.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('File::Slurp', '9999.19', {
+        'source_tmpl': 'File-Slurp-9999.19.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/U/UR/URI'],
+    }),
+    ('Package::Stash', '0.37', {
+        'source_tmpl': 'Package-Stash-0.37.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Data::OptList', '0.109', {
+        'source_tmpl': 'Data-OptList-0.109.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('CPANPLUS', '0.9154', {
+        'source_tmpl': 'CPANPLUS-0.9154.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Test::Harness', '3.35', {
+        'source_tmpl': 'Test-Harness-3.35.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('IO::Tty', '1.12', {
+        'source_tmpl': 'IO-Tty-1.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('Text::Soundex', '3.04', {
+        'source_tmpl': 'Text-Soundex-3.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Lingua::EN::PluralToSingular', '0.14', {
+        'source_tmpl': 'Lingua-EN-PluralToSingular-0.14.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/B/BK/BKB'],
+    }),
+    ('Want', '0.26', {
+        'source_tmpl': 'Want-0.26.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RO/ROBIN'],
+    }),
+    ('Cwd::Guard', '0.04', {
+        'source_tmpl': 'Cwd-Guard-0.04.tar.gz',
+        'source_urls': ['http://cpan.metacpan.org/authors/id/K/KA/KAZEBURO'],
+    }),
+    ('Bundle::BioPerl', '2.1.9', {
+        'source_tmpl': 'Bundle-BioPerl-2.1.9.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CJ/CJFIELDS'],
+    }),
+    ('Mail::Util', '2.14', {
+        'source_tmpl': 'MailTools-2.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.22.1-foss-2016a-bare.eb b/easybuild/easyconfigs/p/Perl/Perl-5.22.1-foss-2016a-bare.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9234ed61fa1561fd507d902837369b8be56473a0
--- /dev/null
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.22.1-foss-2016a-bare.eb
@@ -0,0 +1,17 @@
+name = 'Perl'
+version = '5.22.1'
+versionsuffix = '-bare'
+
+homepage = 'http://www.perl.org/'
+description = """Larry Wall's Practical Extraction and Report Language"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.cpan.org/src/%(version_major)s.0']
+sources = [SOURCELOWER_TAR_GZ]
+
+# bare, no extensions
+exts_list = []
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.22.1-foss-2016a.eb b/easybuild/easyconfigs/p/Perl/Perl-5.22.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f1ad7853f0e743374853288575fc38aa26e70314
--- /dev/null
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.22.1-foss-2016a.eb
@@ -0,0 +1,885 @@
+name = 'Perl'
+version = '5.22.1'
+
+homepage = 'http://www.perl.org/'
+description = """Larry Wall's Practical Extraction and Report Language"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.cpan.org/src/%(version_major)s.0']
+sources = [SOURCELOWER_TAR_GZ]
+
+exts_list = [
+    ('Config::General', '2.60', {
+        'source_tmpl': 'Config-General-2.60.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TL/TLINDEN'],
+    }),
+    ('File::Listing', '6.04', {
+        'source_tmpl': 'File-Listing-6.04.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('ExtUtils::InstallPaths', '0.011', {
+        'source_tmpl': 'ExtUtils-InstallPaths-0.011.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('ExtUtils::Helpers', '0.022', {
+        'source_tmpl': 'ExtUtils-Helpers-0.022.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Test::Harness', '3.36', {
+        'source_tmpl': 'Test-Harness-3.36.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('ExtUtils::Config', '0.008', {
+        'source_tmpl': 'ExtUtils-Config-0.008.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Module::Build::Tiny', '0.039', {
+        'source_tmpl': 'Module-Build-Tiny-0.039.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('aliased', '0.34', {
+        'source_tmpl': 'aliased-0.34.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Text::Glob', '0.09', {
+        'source_tmpl': 'Text-Glob-0.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('Regexp::Common', '2016020301', {
+        'source_tmpl': 'Regexp-Common-2016020301.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL'],
+    }),
+    ('GO::Utils', '0.15', {
+        'source_tmpl': 'go-perl-0.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
+    }),
+    ('Module::Pluggable', '5.2', {
+        'source_tmpl': 'Module-Pluggable-5.2.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SI/SIMONW'],
+    }),
+    ('Test::Fatal', '0.014', {
+        'source_tmpl': 'Test-Fatal-0.014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Warnings', '0.026', {
+        'source_tmpl': 'Test-Warnings-0.026.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('DateTime::Locale', '1.02', {
+        'source_tmpl': 'DateTime-Locale-1.02.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('DateTime::TimeZone', '1.95', {
+        'source_tmpl': 'DateTime-TimeZone-1.95.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Test::Requires', '0.10', {
+        'source_tmpl': 'Test-Requires-0.10.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM'],
+    }),
+    ('Module::Implementation', '0.09', {
+        'source_tmpl': 'Module-Implementation-0.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Module::Build', '0.4216', {
+        'source_tmpl': 'Module-Build-0.4216.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Module::Runtime', '0.014', {
+        'source_tmpl': 'Module-Runtime-0.014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM'],
+    }),
+    ('Try::Tiny', '0.24', {
+        'source_tmpl': 'Try-Tiny-0.24.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Params::Validate', '1.22', {
+        'source_tmpl': 'Params-Validate-1.22.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('List::MoreUtils', '0.413', {
+        'source_tmpl': 'List-MoreUtils-0.413.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Exporter::Tiny', '0.042', {
+        'source_tmpl': 'Exporter-Tiny-0.042.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TOBYINK'],
+    }),
+    ('Class::Singleton', '1.5', {
+        'source_tmpl': 'Class-Singleton-1.5.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
+    }),
+    ('DateTime', '1.25', {
+        'source_tmpl': 'DateTime-1.25.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('File::Find::Rule::Perl', '1.15', {
+        'source_tmpl': 'File-Find-Rule-Perl-1.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Readonly', '2.01', {
+        'source_tmpl': 'Readonly-2.01.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SA/SANKO'],
+    }),
+    ('Git', '0.41', {
+        'source_tmpl': 'Git-0.41.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MS/MSOUTH'],
+    }),
+    ('Tree::DAG_Node', '1.29', {
+        'source_tmpl': 'Tree-DAG_Node-1.29.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Template', '2.26', {
+        'source_tmpl': 'Template-Toolkit-2.26.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AB/ABW'],
+    }),
+    ('FreezeThaw', '0.5001', {
+        'source_tmpl': 'FreezeThaw-0.5001.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IL/ILYAZ/modules'],
+    }),
+    ('DBI', '1.634', {
+        'source_tmpl': 'DBI-1.634.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TI/TIMB'],
+    }),
+    ('DBD::SQLite', '1.50', {
+        'source_tmpl': 'DBD-SQLite-1.50.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI'],
+    }),
+    ('Math::Bezier', '0.01', {
+        'source_tmpl': 'Math-Bezier-0.01.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AB/ABW'],
+    }),
+    ('Archive::Extract', '0.76', {
+        'source_tmpl': 'Archive-Extract-0.76.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('DBIx::Simple', '1.35', {
+        'source_tmpl': 'DBIx-Simple-1.35.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JU/JUERD'],
+    }),
+    ('Shell', '0.73', {
+        'source_tmpl': 'Shell-0.73.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/F/FE/FERREIRA'],
+    }),
+    ('File::Spec', '3.62', {
+        'source_tmpl': 'PathTools-3.62.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('ExtUtils::MakeMaker', '7.10', {
+        'source_tmpl': 'ExtUtils-MakeMaker-7.10.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Test::Simple', '1.001014', {
+        'source_tmpl': 'Test-Simple-1.001014.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Set::Scalar', '1.29', {
+        'source_tmpl': 'Set-Scalar-1.29.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAVIDO'],
+    }),
+    ('IO::Stringy', '2.111', {
+        'source_tmpl': 'IO-stringy-2.111.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DS/DSKOLL'],
+    }),
+    ('Encode::Locale', '1.05', {
+        'source_tmpl': 'Encode-Locale-1.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('XML::SAX::Base', '1.08', {
+        'source_tmpl': 'XML-SAX-Base-1.08.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('XML::NamespaceSupport', '1.11', {
+        'source_tmpl': 'XML-NamespaceSupport-1.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
+    }),
+    ('XML::SAX', '0.99', {
+        'source_tmpl': 'XML-SAX-0.99.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('Test::LeakTrace', '0.15', {
+        'source_tmpl': 'Test-LeakTrace-0.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GF/GFUJI'],
+    }),
+    ('Test::Exception', '0.43', {
+        'source_tmpl': 'Test-Exception-0.43.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Text::Table', '1.130', {
+        'source_tmpl': 'Text-Table-1.130.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('MIME::Types', '2.13', {
+        'source_tmpl': 'MIME-Types-2.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
+    }),
+    ('Module::Build::XSUtil', '0.16', {
+        'source_tmpl': 'Module-Build-XSUtil-0.16.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HI/HIDEAKIO'],
+    }),
+    ('Tie::Function', '0.02', {
+        'source_tmpl': 'Tie-Function-0.02.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAVIDNICO/handy_tied_functions'],
+    }),
+    ('Template::Plugin::Number::Format', '1.06', {
+        'source_tmpl': 'Template-Plugin-Number-Format-1.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DARREN'],
+    }),
+    ('HTML::Parser', '3.72', {
+        'source_tmpl': 'HTML-Parser-3.72.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Date::Handler', '1.2', {
+        'source_tmpl': 'Date-Handler-1.2.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BB/BBEAUSEJ'],
+    }),
+    ('Params::Util', '1.07', {
+        'source_tmpl': 'Params-Util-1.07.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('IO::HTML', '1.001', {
+        'source_tmpl': 'IO-HTML-1.001.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CJ/CJM'],
+    }),
+    ('Data::Grove', '0.08', {
+        'source_tmpl': 'libxml-perl-0.08.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KM/KMACLEOD'],
+    }),
+    ('Class::ISA', '0.36', {
+        'source_tmpl': 'Class-ISA-0.36.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SM/SMUELLER'],
+    }),
+    ('URI', '1.71', {
+        'source_tmpl': 'URI-1.71.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Ima::DBI', '0.35', {
+        'source_tmpl': 'Ima-DBI-0.35.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PERRIN'],
+    }),
+    ('Tie::IxHash', '1.23', {
+        'source_tmpl': 'Tie-IxHash-1.23.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('GO', '0.04', {
+        'source_tmpl': 'go-db-perl-0.04.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SJ/SJCARBON'],
+    }),
+    ('Class::DBI::SQLite', '0.11', {
+        'source_tmpl': 'Class-DBI-SQLite-0.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('Pod::POM', '2.01', {
+        'source_tmpl': 'Pod-POM-2.01.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Math::Round', '0.07', {
+        'source_tmpl': 'Math-Round-0.07.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GROMMEL'],
+    }),
+    ('Text::Diff', '1.44', {
+        'source_tmpl': 'Text-Diff-1.44.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Log::Message::Simple', '0.10', {
+        'source_tmpl': 'Log-Message-Simple-0.10.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('IO::Socket::SSL', '2.024', {
+        'source_tmpl': 'IO-Socket-SSL-2.024.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SU/SULLR'],
+    }),
+    ('Fennec::Lite', '0.004', {
+        'source_tmpl': 'Fennec-Lite-0.004.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Sub::Uplevel', '0.25', {
+        'source_tmpl': 'Sub-Uplevel-0.25.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('Meta::Builder', '0.003', {
+        'source_tmpl': 'Meta-Builder-0.003.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Exporter::Declare', '0.114', {
+        'source_tmpl': 'Exporter-Declare-0.114.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Getopt::Long', '2.48', {
+        'source_tmpl': 'Getopt-Long-2.48.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JV/JV'],
+    }),
+    ('Log::Message', '0.08', {
+        'source_tmpl': 'Log-Message-0.08.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Mouse', 'v2.4.5', {
+        'source_tmpl': 'Mouse-v2.4.5.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SY/SYOHEX'],
+    }),
+    ('Test::Version', '2.03', {
+        'source_tmpl': 'Test-Version-2.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
+    }),
+    ('DBIx::Admin::TableInfo', '3.01', {
+        'source_tmpl': 'DBIx-Admin-TableInfo-3.01.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Net::HTTP', '6.09', {
+        'source_tmpl': 'Net-HTTP-6.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Test::Deep', '1.120', {
+        'source_tmpl': 'Test-Deep-1.120.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Warn', '0.30', {
+        'source_tmpl': 'Test-Warn-0.30.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('MRO::Compat', '0.12', {
+        'source_tmpl': 'MRO-Compat-0.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BO/BOBTFISH'],
+    }),
+    ('Moo', '2.001001', {
+        'source_tmpl': 'Moo-2.001001.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('Hash::Merge', '0.200', {
+        'source_tmpl': 'Hash-Merge-0.200.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('SQL::Abstract', '1.81', {
+        'source_tmpl': 'SQL-Abstract-1.81.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RI/RIBASUSHI'],
+    }),
+    ('HTML::Form', '6.03', {
+        'source_tmpl': 'HTML-Form-6.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('File::Copy::Recursive', '0.38', {
+        'source_tmpl': 'File-Copy-Recursive-0.38.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DM/DMUEY'],
+    }),
+    ('Number::Compare', '0.03', {
+        'source_tmpl': 'Number-Compare-0.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('IPC::Run', '0.94', {
+        'source_tmpl': 'IPC-Run-0.94.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('HTML::Entities::Interpolate', '1.09', {
+        'source_tmpl': 'HTML-Entities-Interpolate-1.09.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('Test::ClassAPI', '1.06', {
+        'source_tmpl': 'Test-ClassAPI-1.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Test::Most', '0.34', {
+        'source_tmpl': 'Test-Most-0.34.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/O/OV/OVID'],
+    }),
+    ('Class::Accessor', '0.34', {
+        'source_tmpl': 'Class-Accessor-0.34.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Test::Differences', '0.64', {
+        'source_tmpl': 'Test-Differences-0.64.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
+    }),
+    ('HTTP::Tiny', '0.056', {
+        'source_tmpl': 'HTTP-Tiny-0.056.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('Package::DeprecationManager', '0.15', {
+        'source_tmpl': 'Package-DeprecationManager-0.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Digest::SHA1', '2.13', {
+        'source_tmpl': 'Digest-SHA1-2.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Date::Language', '2.30', {
+        'source_tmpl': 'TimeDate-2.30.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GB/GBARR'],
+    }),
+    ('version', '0.9915', {
+        'source_tmpl': 'version-0.9915.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JP/JPEACOCK'],
+    }),
+    ('Sub::Uplevel', '0.25', {
+        'source_tmpl': 'Sub-Uplevel-0.25.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    # fails: uses 'gcc'
+    ('XML::Bare', '0.53', {
+        'source_tmpl': 'XML-Bare-0.53.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CO/CODECHILD'],
+    }),
+    ('Dist::CheckConflicts', '0.11', {
+        'source_tmpl': 'Dist-CheckConflicts-0.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Sub::Name', '0.14', {
+        'source_tmpl': 'Sub-Name-0.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Time::Piece', '1.31', {
+        'source_tmpl': 'Time-Piece-1.31.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ES/ESAYM'],
+    }),
+    ('Digest::HMAC', '1.03', {
+        'source_tmpl': 'Digest-HMAC-1.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('HTTP::Negotiate', '6.01', {
+        'source_tmpl': 'HTTP-Negotiate-6.01.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('MIME::Lite', '3.030', {
+        'source_tmpl': 'MIME-Lite-3.030.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Crypt::Rijndael', '1.13', {
+        'source_tmpl': 'Crypt-Rijndael-1.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('B::Lint', '1.20', {
+        'source_tmpl': 'B-Lint-1.20.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Canary::Stability', '2006', {
+        'source_tmpl': 'Canary-Stability-2006.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
+    }),
+    ('AnyEvent', '7.12', {
+        'source_tmpl': 'AnyEvent-7.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN'],
+    }),
+    ('Object::Accessor', '0.48', {
+        'source_tmpl': 'Object-Accessor-0.48.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Data::UUID', '1.221', {
+        'source_tmpl': 'Data-UUID-1.221.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Test::Pod', '1.51', {
+        'source_tmpl': 'Test-Pod-1.51.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('AppConfig', '1.71', {
+        'source_tmpl': 'AppConfig-1.71.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/N/NE/NEILB'],
+    }),
+    ('Net::SMTP::SSL', '1.03', {
+        'source_tmpl': 'Net-SMTP-SSL-1.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('XML::Tiny', '2.06', {
+        'source_tmpl': 'XML-Tiny-2.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DC/DCANTRELL'],
+    }),
+    ('HTML::Tagset', '3.20', {
+        'source_tmpl': 'HTML-Tagset-3.20.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PETDANCE'],
+    }),
+    ('HTML::Tree', '5.03', {
+        'source_tmpl': 'HTML-Tree-5.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CJ/CJM'],
+    }),
+    ('Devel::GlobalDestruction', '0.13', {
+        'source_tmpl': 'Devel-GlobalDestruction-0.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('WWW::RobotRules', '6.02', {
+        'source_tmpl': 'WWW-RobotRules-6.02.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Expect', '1.32', {
+        'source_tmpl': 'Expect-1.32.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SZ/SZABGAB'],
+    }),
+    ('Term::UI', '0.46', {
+        'source_tmpl': 'Term-UI-0.46.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('Net::SNMP', 'v6.0.1', {
+        'source_tmpl': 'Net-SNMP-v6.0.1.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DT/DTOWN'],
+    }),
+    ('XML::SAX::Writer', '0.56', {
+        'source_tmpl': 'XML-SAX-Writer-0.56.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN'],
+    }),
+    ('Statistics::Descriptive', '3.0612', {
+        'source_tmpl': 'Statistics-Descriptive-3.0612.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Class::Load', '0.23', {
+        'source_tmpl': 'Class-Load-0.23.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('LWP::Simple', '6.15', {
+        'source_tmpl': 'libwww-perl-6.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Time::Piece::MySQL', '0.06', {
+        'source_tmpl': 'Time-Piece-MySQL-0.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Package::Stash::XS', '0.28', {
+        'source_tmpl': 'Package-Stash-XS-0.28.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('GD::Graph', '1.52', {
+        'source_tmpl': 'GDGraph-1.52.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RU/RUZ'],
+    }),
+    ('Set::Array', '0.30', {
+        'source_tmpl': 'Set-Array-0.30.tgz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE'],
+    }),
+    ('boolean', '0.45', {
+        'source_tmpl': 'boolean-0.45.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IN/INGY'],
+    }),
+    ('Number::Format', '1.75', {
+        'source_tmpl': 'Number-Format-1.75.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/W/WR/WRW'],
+    }),
+    ('Data::Stag', '0.14', {
+        'source_tmpl': 'Data-Stag-0.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CM/CMUNGALL'],
+    }),
+    ('Test::NoWarnings', '1.04', {
+        'source_tmpl': 'Test-NoWarnings-1.04.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Crypt::DES', '2.07', {
+        'source_tmpl': 'Crypt-DES-2.07.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DP/DPARIS'],
+    }),
+    ('Exporter', '5.72', {
+        'source_tmpl': 'Exporter-5.72.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('Class::Inspector', '1.28', {
+        'source_tmpl': 'Class-Inspector-1.28.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Parse::RecDescent', '1.967013', {
+        'source_tmpl': 'Parse-RecDescent-1.967013.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JT/JTBRAUN'],
+    }),
+    ('Carp', '1.38', {
+        'source_tmpl': 'Carp-1.38.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('XML::XPath', '1.33', {
+        'source_tmpl': 'XML-XPath-1.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MANWAR'],
+    }),
+    ('Capture::Tiny', '0.36', {
+        'source_tmpl': 'Capture-Tiny-0.36.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN'],
+    }),
+    ('JSON', '2.90', {
+        'source_tmpl': 'JSON-2.90.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA'],
+    }),
+    ('Sub::Exporter', '0.987', {
+        'source_tmpl': 'Sub-Exporter-0.987.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Class::Load::XS', '0.09', {
+        'source_tmpl': 'Class-Load-XS-0.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Set::IntSpan::Fast', '1.15', {
+        'source_tmpl': 'Set-IntSpan-Fast-1.15.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AN/ANDYA'],
+    }),
+    ('Sub::Exporter::Progressive', '0.001011', {
+        'source_tmpl': 'Sub-Exporter-Progressive-0.001011.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/F/FR/FREW'],
+    }),
+    ('Data::Dumper::Concise', '2.022', {
+        'source_tmpl': 'Data-Dumper-Concise-2.022.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/F/FR/FREW'],
+    }),
+    ('File::Slurp::Tiny', '0.004', {
+        'source_tmpl': 'File-Slurp-Tiny-0.004.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/L/LE/LEONT'],
+    }),
+    ('Algorithm::Diff', '1.1903', {
+        'source_tmpl': 'Algorithm-Diff-1.1903.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TY/TYEMQ'],
+    }),
+    ('AnyData', '0.12', {
+        'source_tmpl': 'AnyData-0.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Text::Iconv', '1.7', {
+        'source_tmpl': 'Text-Iconv-1.7.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MP/MPIOTR'],
+    }),
+    ('Class::Data::Inheritable', '0.08', {
+        'source_tmpl': 'Class-Data-Inheritable-0.08.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('Text::Balanced', '2.03', {
+        'source_tmpl': 'Text-Balanced-2.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHAY'],
+    }),
+    ('strictures', '2.000002', {
+        'source_tmpl': 'strictures-2.000002.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('Switch', '2.17', {
+        'source_tmpl': 'Switch-2.17.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CH/CHORNY'],
+    }),
+    ('File::Which', '1.21', {
+        'source_tmpl': 'File-Which-1.21.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PL/PLICEASE'],
+    }),
+    ('Email::Date::Format', '1.005', {
+        'source_tmpl': 'Email-Date-Format-1.005.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Error', '0.17024', {
+        'source_tmpl': 'Error-0.17024.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Mock::Quick', '1.110', {
+        'source_tmpl': 'Mock-Quick-1.110.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('Text::CSV', '1.33', {
+        'source_tmpl': 'Text-CSV-1.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MAKAMAKA'],
+    }),
+    ('Test::Output', '1.03', {
+        'source_tmpl': 'Test-Output-1.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BD/BDFOY'],
+    }),
+    ('Class::DBI', 'v3.0.17', {
+        'source_tmpl': 'Class-DBI-v3.0.17.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('List::AllUtils', '0.09', {
+        'source_tmpl': 'List-AllUtils-0.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('UNIVERSAL::moniker', '0.08', {
+        'source_tmpl': 'UNIVERSAL-moniker-0.08.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KA/KASEI'],
+    }),
+    ('Exception::Class', '1.40', {
+        'source_tmpl': 'Exception-Class-1.40.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('File::CheckTree', '4.42', {
+        'source_tmpl': 'File-CheckTree-4.42.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Math::VecStat', '0.08', {
+        'source_tmpl': 'Math-VecStat-0.08.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AS/ASPINELLI'],
+    }),
+    ('Pod::LaTeX', '0.61', {
+        'source_tmpl': 'Pod-LaTeX-0.61.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TJ/TJENNESS'],
+    }),
+    ('Eval::Closure', '0.13', {
+        'source_tmpl': 'Eval-Closure-0.13.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('HTTP::Request', '6.11', {
+        'source_tmpl': 'HTTP-Message-6.11.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('XML::Twig', '3.49', {
+        'source_tmpl': 'XML-Twig-3.49.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIROD'],
+    }),
+    ('IO::String', '1.08', {
+        'source_tmpl': 'IO-String-1.08.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('XML::Simple', '2.22', {
+        'source_tmpl': 'XML-Simple-2.22.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GR/GRANTM'],
+    }),
+    ('Sub::Install', '0.928', {
+        'source_tmpl': 'Sub-Install-0.928.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('HTTP::Cookies', '6.01', {
+        'source_tmpl': 'HTTP-Cookies-6.01.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Pod::Plainer', '1.04', {
+        'source_tmpl': 'Pod-Plainer-1.04.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RM/RMBARKER'],
+    }),
+    ('Test::Exception::LessClever', '0.006', {
+        'source_tmpl': 'Test-Exception-LessClever-0.006.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/EX/EXODIST'],
+    }),
+    ('LWP::MediaTypes', '6.02', {
+        'source_tmpl': 'LWP-MediaTypes-6.02.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Scalar::Util', '1.43', {
+        'source_tmpl': 'Scalar-List-Utils-1.43.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/P/PE/PEVANS'],
+    }),
+    ('Data::Section::Simple', '0.07', {
+        'source_tmpl': 'Data-Section-Simple-0.07.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('Class::Trigger', '0.14', {
+        'source_tmpl': 'Class-Trigger-0.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA'],
+    }),
+    ('HTTP::Daemon', '6.01', {
+        'source_tmpl': 'HTTP-Daemon-6.01.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('File::HomeDir', '1.00', {
+        'source_tmpl': 'File-HomeDir-1.00.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('HTTP::Date', '6.02', {
+        'source_tmpl': 'HTTP-Date-6.02.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GAAS'],
+    }),
+    ('Authen::SASL', '2.16', {
+        'source_tmpl': 'Authen-SASL-2.16.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GB/GBARR'],
+    }),
+    ('Clone', '0.38', {
+        'source_tmpl': 'Clone-0.38.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GA/GARU'],
+    }),
+    ('Data::Types', '0.09', {
+        'source_tmpl': 'Data-Types-0.09.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DW/DWHEELER'],
+    }),
+    ('Import::Into', '1.002005', {
+        'source_tmpl': 'Import-Into-1.002005.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/H/HA/HAARG'],
+    }),
+    ('DateTime::Tiny', '1.04', {
+        'source_tmpl': 'DateTime-Tiny-1.04.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('DBD::AnyData', '0.110', {
+        'source_tmpl': 'DBD-AnyData-0.110.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('Text::Format', '0.59', {
+        'source_tmpl': 'Text-Format-0.59.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF'],
+    }),
+    ('Devel::CheckCompiler', '0.06', {
+        'source_tmpl': 'Devel-CheckCompiler-0.06.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SY/SYOHEX'],
+    }),
+    ('Log::Handler', '0.84', {
+        'source_tmpl': 'Log-Handler-0.84.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BL/BLOONIX'],
+    }),
+    ('DBIx::ContextualFetch', '1.03', {
+        'source_tmpl': 'DBIx-ContextualFetch-1.03.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TM/TMTM'],
+    }),
+    ('Devel::StackTrace', '2.01', {
+        'source_tmpl': 'Devel-StackTrace-2.01.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DR/DROLSKY'],
+    }),
+    ('Term::ReadKey', '2.33', {
+        'source_tmpl': 'TermReadKey-2.33.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/J/JS/JSTOWE'],
+    }),
+    ('Set::IntSpan', '1.19', {
+        'source_tmpl': 'Set-IntSpan-1.19.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/S/SW/SWMCD'],
+    }),
+    ('Moose', '2.1605', {
+        'source_tmpl': 'Moose-2.1605.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/E/ET/ETHER'],
+    }),
+    ('Algorithm::Dependency', '1.110', {
+        'source_tmpl': 'Algorithm-Dependency-1.110.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/A/AD/ADAMK'],
+    }),
+    ('Font::TTF', '1.05', {
+        'source_tmpl': 'Font-TTF-1.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MH/MHOSKEN'],
+    }),
+    ('IPC::Run3', '0.048', {
+        'source_tmpl': 'IPC-Run3-0.048.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('File::Find::Rule', '0.34', {
+        'source_tmpl': 'File-Find-Rule-0.34.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RC/RCLAMP'],
+    }),
+    ('SQL::Statement', '1.407', {
+        'source_tmpl': 'SQL-Statement-1.407.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RE/REHSACK'],
+    }),
+    ('File::Slurp', '9999.19', {
+        'source_tmpl': 'File-Slurp-9999.19.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/U/UR/URI'],
+    }),
+    ('Package::Stash', '0.37', {
+        'source_tmpl': 'Package-Stash-0.37.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DO/DOY'],
+    }),
+    ('Data::OptList', '0.109', {
+        'source_tmpl': 'Data-OptList-0.109.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('CPANPLUS', '0.9156', {
+        'source_tmpl': 'CPANPLUS-0.9156.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
+    }),
+    ('IO::Tty', '1.12', {
+        'source_tmpl': 'IO-Tty-1.12.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/T/TO/TODDR'],
+    }),
+    ('Text::Soundex', '3.05', {
+        'source_tmpl': 'Text-Soundex-3.05.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RJ/RJBS'],
+    }),
+    ('Lingua::EN::PluralToSingular', '0.18', {
+        'source_tmpl': 'Lingua-EN-PluralToSingular-0.18.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BK/BKB'],
+    }),
+    ('Want', '0.29', {
+        'source_tmpl': 'Want-0.29.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/R/RO/ROBIN'],
+    }),
+    ('Cwd::Guard', '0.04', {
+        'source_tmpl': 'Cwd-Guard-0.04.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/K/KA/KAZEBURO'],
+    }),
+    ('Bundle::BioPerl', '2.1.9', {
+        'source_tmpl': 'Bundle-BioPerl-2.1.9.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/C/CJ/CJFIELDS'],
+    }),
+    ('Mail::Util', '2.14', {
+        'source_tmpl': 'MailTools-2.14.tar.gz',
+        'source_urls': ['https://cpan.metacpan.org/authors/id/M/MA/MARKOV'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a.eb b/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a.eb
index ae84220ef217682aa93f459f5cb1dfa47673caf6..b58ce50af426ae2650a5977fdb0d12e2307813ca 100644
--- a/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a.eb
+++ b/easybuild/easyconfigs/p/Perl/Perl-5.22.1-intel-2016a.eb
@@ -137,7 +137,7 @@ exts_list = [
     }),
     ('FreezeThaw', '0.5001', {
         'source_tmpl': 'FreezeThaw-0.5001.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IL/ILYAZ'],
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IL/ILYAZ/modules'],
     }),
     ('DBI', '1.634', {
         'source_tmpl': 'DBI-1.634.tar.gz',
@@ -153,7 +153,7 @@ exts_list = [
     }),
     ('Archive::Extract', '0.76', {
         'source_tmpl': 'Archive-Extract-0.76.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/ / "/ "BINGOS"'],
+        'source_urls': ['https://cpan.metacpan.org/authors/id/B/BI/BINGOS'],
     }),
     ('DBIx::Simple', '1.35', {
         'source_tmpl': 'DBIx-Simple-1.35.tar.gz',
@@ -221,7 +221,7 @@ exts_list = [
     }),
     ('Tie::Function', '0.02', {
         'source_tmpl': 'Tie-Function-0.02.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAVIDNICO'],
+        'source_urls': ['https://cpan.metacpan.org/authors/id/D/DA/DAVIDNICO/handy_tied_functions'],
     }),
     ('Template::Plugin::Number::Format', '1.06', {
         'source_tmpl': 'Template-Plugin-Number-Format-1.06.tar.gz',
@@ -405,7 +405,7 @@ exts_list = [
     }),
     ('Date::Language', '2.30', {
         'source_tmpl': 'TimeDate-2.30.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/ / "/ "GBARR"'],
+        'source_urls': ['https://cpan.metacpan.org/authors/id/G/GB/GBARR'],
     }),
     ('version', '0.9915', {
         'source_tmpl': 'version-0.9915.tar.gz',
@@ -547,7 +547,7 @@ exts_list = [
     }),
     ('boolean', '0.45', {
         'source_tmpl': 'boolean-0.45.tar.gz',
-        'source_urls': ['https://cpan.metacpan.org/authors/id/ / "/ "INGY"'],
+        'source_urls': ['https://cpan.metacpan.org/authors/id/I/IN/INGY'],
     }),
     ('Number::Format', '1.75', {
         'source_tmpl': 'Number-Format-1.75.tar.gz',
diff --git a/easybuild/easyconfigs/p/Pillow/Pillow-3.2.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/Pillow/Pillow-3.2.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e08e25c6bb796ad36128af14b5a76989d5443ead
--- /dev/null
+++ b/easybuild/easyconfigs/p/Pillow/Pillow-3.2.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'Pillow'
+version = '3.2.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://pillow.readthedocs.org/'
+description = """Pillow is the 'friendly PIL fork' by Alex Clark and Contributors.
+ PIL is the Python Imaging Library by Fredrik Lundh and Contributors."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('libjpeg-turbo', '1.4.2'),
+    ('zlib', '1.2.8'),
+    ('LibTIFF', '4.0.6'),
+    ('freetype', '2.6.2'),
+]
+
+options = {'modulename': 'PIL'}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.4.7-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.4.7-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9afa456cae7888f16485d3ef0936f3a0e3582a16
--- /dev/null
+++ b/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.4.7-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,44 @@
+easyblock = 'ConfigureMake'
+
+name = 'PostgreSQL'
+version = '9.4.7'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.mysql.com/'
+description = """PostgreSQL is a powerful, open source object-relational database system.
+ It is fully ACID compliant, has full support for foreign keys,
+ joins, views, triggers, and stored procedures (in multiple languages).
+ It includes most SQL:2008 data types, including INTEGER,
+ NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, and TIMESTAMP.
+ It also supports storage of binary large objects, including pictures,
+ sounds, or video. It has native programming interfaces for C/C++, Java,
+ .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional documentation."""
+
+source_urls = ['http://ftp.postgresql.org/pub/source/v%(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.11'),
+    #    ('OpenSSL', '1.0.1i'), # OS dependency should be preferred for security reasons
+]
+
+builddependencies = [
+    ('Bison', '3.0.4'),
+    ('flex', '2.6.0'),
+    ('Perl', '5.22.1'),
+]
+
+configopts = '--with-python --with-openssl'
+
+sanity_check_paths = {
+    'files': ['bin/psql', 'bin/pg_config', 'lib/libpq.a', 'lib/libpq.%s' % SHLIB_EXT],
+    'dirs': ['share/postgresql'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.5.2-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.5.2-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fca7dea11c2a9f31082fbd373c9eb4c0c6123bd0
--- /dev/null
+++ b/easybuild/easyconfigs/p/PostgreSQL/PostgreSQL-9.5.2-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,44 @@
+easyblock = 'ConfigureMake'
+
+name = 'PostgreSQL'
+version = '9.5.2'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.mysql.com/'
+description = """PostgreSQL is a powerful, open source object-relational database system.
+ It is fully ACID compliant, has full support for foreign keys,
+ joins, views, triggers, and stored procedures (in multiple languages).
+ It includes most SQL:2008 data types, including INTEGER,
+ NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, and TIMESTAMP.
+ It also supports storage of binary large objects, including pictures,
+ sounds, or video. It has native programming interfaces for C/C++, Java,
+ .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional documentation."""
+
+source_urls = ['http://ftp.postgresql.org/pub/source/v%(version)s/']
+sources = [SOURCELOWER_TAR_GZ]
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.11'),
+    #    ('OpenSSL', '1.0.1i'), # OS dependency should be preferred for security reasons
+]
+
+builddependencies = [
+    ('Bison', '3.0.4'),
+    ('flex', '2.6.0'),
+    ('Perl', '5.22.1'),
+]
+
+configopts = '--with-python --with-openssl'
+
+sanity_check_paths = {
+    'files': ['bin/psql', 'bin/pg_config', 'lib/libpq.a', 'lib/libpq.%s' % SHLIB_EXT],
+    'dirs': ['share/postgresql'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/Postgres-XL/Postgres-XL-9.5r1-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/Postgres-XL/Postgres-XL-9.5r1-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..01c5da8a4821a492709b8a61213b8b5bd9709e33
--- /dev/null
+++ b/easybuild/easyconfigs/p/Postgres-XL/Postgres-XL-9.5r1-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,38 @@
+easyblock = 'ConfigureMake'
+
+name = 'Postgres-XL'
+version = '9.5r1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.postgres-xl.org'
+description = """Postgres-XL is a horizontally scalable open source SQL database cluster,
+flexible enough to handle varying database workloads:"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://files.postgres-xl.org']
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('zlib', '1.2.8'),
+    ('Python', '2.7.11'),
+    #    ('OpenSSL', '1.0.1i'), # OS dependency should be preferred for security reasons
+]
+
+builddependencies = [
+    ('Bison', '3.0.4'),
+    ('flex', '2.6.0'),
+    ('Perl', '5.22.1'),
+]
+
+configopts = '--with-python --with-openssl'
+
+sanity_check_paths = {
+    'files': ['bin/psql', 'bin/pg_config', 'lib/libpq.a', 'lib/libpq.%s' % SHLIB_EXT],
+    'dirs': ['share/postgresql'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/PyAMG/PyAMG-3.0.1-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PyAMG/PyAMG-3.0.1-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..25956cf16ed9fe1bbffe8889cb7397a0d6ca5725
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyAMG/PyAMG-3.0.1-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,26 @@
+easyblock = "PythonPackage"
+
+name = 'PyAMG'
+version = '3.0.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://pyamg.org'
+description = """PyAMG is a library of Algebraic Multigrid (AMG) solvers with a convenient Python interface."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+]
+
+options = {'modulename': 'pyamg'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/pyamg'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/p/PyGTS/PyGTS-0.3.1-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/PyGTS/PyGTS-0.3.1-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1438b0e86a90fcc3dfa1be0ac040288af1f29072
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyGTS/PyGTS-0.3.1-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'PyGTS'
+version = '0.3.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://sourceforge.net/projects/pygts/'
+description = """ PyGTS is a python package used to construct, manipulate, 
+ and perform computations on triangulated surfaces. 
+ It is a hand-crafted and pythonic binding for the GNU Triangulated Surface (GTS) Library. """
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('GLib', '2.48.0'),
+    ('GTS' ,'0.7.6'),
+]
+
+options = {'modulename': 'gts'}
+
+sanity_check_paths = {
+    'files': ['lib/python%%(pyshortver)s/site-packages/gts/_gts.%s' % SHLIB_EXT],
+    'dirs':[],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.2.0-foss-2016a-Python-2.7.11-zmq4.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.2.0-foss-2016a-Python-2.7.11-zmq4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c279b32410daeca3a96ec248bf2dfaa4cc710dbd
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.2.0-foss-2016a-Python-2.7.11-zmq4.eb
@@ -0,0 +1,29 @@
+easyblock = 'PythonPackage'
+
+name = 'PyZMQ'
+version = '15.2.0'
+
+homepage = 'http://www.zeromq.org/bindings:python'
+description = """Python bindings for ZeroMQ"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+zmqversion = '4.1.4'
+versionsuffix = '-Python-%%(pyver)s-zmq%s' % zmqversion.split('.')[0]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('ZeroMQ', zmqversion),
+]
+
+options = {'modulename': 'zmq'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/zmq'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.2.0-intel-2016a-Python-2.7.11-zmq4.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.2.0-intel-2016a-Python-2.7.11-zmq4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3b84d83e0c4de7c865b35e7479ee1464b31ee224
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.2.0-intel-2016a-Python-2.7.11-zmq4.eb
@@ -0,0 +1,28 @@
+easyblock = 'PythonPackage'
+
+name = 'PyZMQ'
+version = '15.2.0'
+zmqversion = '4.1.4'
+versionsuffix = '-Python-%%(pyver)s-zmq%s' % zmqversion.split('.')[0]
+
+homepage = 'http://www.zeromq.org/bindings:python'
+description = """Python bindings for ZeroMQ"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('ZeroMQ', zmqversion),
+]
+
+options = {'modulename': 'zmq'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/zmq'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.2.0-intel-2016a-Python-3.5.1-zmq4.eb b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.2.0-intel-2016a-Python-3.5.1-zmq4.eb
new file mode 100644
index 0000000000000000000000000000000000000000..40389161f72a617833209f839f2403eebbe0d7c2
--- /dev/null
+++ b/easybuild/easyconfigs/p/PyZMQ/PyZMQ-15.2.0-intel-2016a-Python-3.5.1-zmq4.eb
@@ -0,0 +1,28 @@
+easyblock = 'PythonPackage'
+
+name = 'PyZMQ'
+version = '15.2.0'
+zmqversion = '4.1.4'
+versionsuffix = '-Python-%%(pyver)s-zmq%s' % zmqversion.split('.')[0]
+
+homepage = 'http://www.zeromq.org/bindings:python'
+description = """Python bindings for ZeroMQ"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.1'),
+    ('ZeroMQ', zmqversion),
+]
+
+options = {'modulename': 'zmq'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/zmq'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/Pygments/Pygments-2.0.2-foss-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/p/Pygments/Pygments-2.0.2-foss-2015a-Python-2.7.9.eb
index 103bb389984d984835204c8c461891a1f7f74388..bfe92c90ebb9925714ee77242b6f4dcbf511c0f5 100644
--- a/easybuild/easyconfigs/p/Pygments/Pygments-2.0.2-foss-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/p/Pygments/Pygments-2.0.2-foss-2015a-Python-2.7.9.eb
@@ -3,8 +3,9 @@ easyblock = 'PythonPackage'
 name = 'Pygments'
 version = '2.0.2'
 
-homepage = 'https://pypi.python.org/pypi/requests/2.6.0'
-description = """Python http for humans"""
+homepage = 'http://pygments.org/'
+description = """Generic syntax highlighter suitable for use in code hosting, forums, wikis or other applications
+ that need to prettify source code."""
 
 toolchain = {'name': 'foss', 'version': '2015a'}
 
diff --git a/easybuild/easyconfigs/p/Pygments/Pygments-2.0.2-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/p/Pygments/Pygments-2.0.2-intel-2015a-Python-2.7.9.eb
index 06251d78729ed65fad7d46aec6481f664ed56e0a..3c3f9ad92d8973c136b926f5e93c9d8e4605483c 100644
--- a/easybuild/easyconfigs/p/Pygments/Pygments-2.0.2-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/p/Pygments/Pygments-2.0.2-intel-2015a-Python-2.7.9.eb
@@ -3,8 +3,9 @@ easyblock = 'PythonPackage'
 name = 'Pygments'
 version = '2.0.2'
 
-homepage = 'https://pypi.python.org/pypi/requests/2.6.0'
-description = """Python http for humans"""
+homepage = 'http://pygments.org/'
+description = """Generic syntax highlighter suitable for use in code hosting, forums, wikis or other applications
+ that need to prettify source code."""
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-GCC-4.9.3-2.25-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-GCC-4.9.3-2.25-bare.eb
new file mode 100644
index 0000000000000000000000000000000000000000..895d73b12812161ba0da64981aaf3b314695d6f9
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-GCC-4.9.3-2.25-bare.eb
@@ -0,0 +1,32 @@
+name = 'Python'
+version = '2.7.11'
+versionsuffix = '-bare'
+
+homepage = 'http://python.org/'
+description = """Python is a programming language that lets you work more quickly and integrate your systems
+ more effectively."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libreadline', '6.3', '', ('GCCcore', '4.9.3')),
+    ('ncurses', '6.0', '', ('GCCcore', '4.9.3')),
+    ('SQLite', '3.9.2'),
+    ('Tk', '8.6.4', '-no-X11'),
+    #   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+# bare installation: no extensions included
+exts_list = []
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2015a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2015a.eb
index b360b95e8c2be875edfde6b33eb72afdfa9bb8c5..51bd3f9ff0716514a0cb998468b655febe4273e0 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2015a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2015a.eb
@@ -123,8 +123,10 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
     }),
     ('bitstring', '3.1.3', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'source_urls': ['https://pypi.python.org/packages/source/b/bitstring'],
+        # grab tarball from GitHub rather than PyPi since 3.1.3 release on PyPi disappeared;
+        # cfr. https://github.com/scott-griffiths/bitstring/issues/159
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://github.com/scott-griffiths/bitstring/archive/'],
     }),
     ('virtualenv', '14.0.5', {
         'source_urls': ['https://pypi.python.org/packages/source/v/virtualenv'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb
index 2556554c13bb70c04346750064b38d01d40423c1..80212964f1b2a37029523317c832db73e5e048f8 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-foss-2016a.eb
@@ -123,8 +123,10 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
     }),
     ('bitstring', '3.1.3', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'source_urls': ['https://pypi.python.org/packages/source/b/bitstring'],
+        # grab tarball from GitHub rather than PyPi since 3.1.3 release on PyPi disappeared;
+        # cfr. https://github.com/scott-griffiths/bitstring/issues/159
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://github.com/scott-griffiths/bitstring/archive/'],
     }),
     ('virtualenv', '14.0.5', {
         'source_urls': ['https://pypi.python.org/packages/source/v/virtualenv'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-gimkl-2.11.5.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-gimkl-2.11.5.eb
index 9c41844d2f108ab5fd3ae20284b76448f5f1edcf..a99feb707857dd99fa8791a129d889148caffd94 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-gimkl-2.11.5.eb
@@ -126,8 +126,10 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
     }),
     ('bitstring', '3.1.3', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'source_urls': ['https://pypi.python.org/packages/source/b/bitstring'],
+        # grab tarball from GitHub rather than PyPi since 3.1.3 release on PyPi disappeared;
+        # cfr. https://github.com/scott-griffiths/bitstring/issues/159
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://github.com/scott-griffiths/bitstring/archive/'],
     }),
 ]
 
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2015b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2015b.eb
index 3976e80bf2f59c169a261cb02726b8ae876bc766..bce00fd447f743c572c23d9aea8be2016dae4308 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2015b.eb
@@ -126,8 +126,10 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
     }),
     ('bitstring', '3.1.3', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'source_urls': ['https://pypi.python.org/packages/source/b/bitstring'],
+        # grab tarball from GitHub rather than PyPi since 3.1.3 release on PyPi disappeared;
+        # cfr. https://github.com/scott-griffiths/bitstring/issues/159
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://github.com/scott-griffiths/bitstring/archive/'],
     }),
     ('virtualenv', '14.0.5', {
         'source_urls': ['https://pypi.python.org/packages/source/v/virtualenv'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b8a12d273e580d7c81b90133443002d66fe60aff
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,139 @@
+name = 'Python'
+version = '2.7.11'
+
+homepage = 'http://python.org/'
+description = """Python is a programming language that lets you work more quickly and integrate your systems
+ more effectively."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.10.1'
+scipyversion = '0.16.1'
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libreadline', '6.3'),
+    ('ncurses', '6.0'),
+    ('SQLite', '3.9.2'),
+    ('Tk', '8.6.4', '-no-X11'),
+    ('GMP', '6.1.0'),
+    #   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+# order is important!
+# package versions updated May 28th 2015
+exts_list = [
+    ('setuptools', '18.7.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '7.1.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
+        'patches': [
+            'numpy-1.8.0-mkl.patch',
+            'numpy-%s-sse42.patch' % numpyversion,
+        ],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
+    }),
+    ('blist', '1.3.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
+    }),
+    ('mpi4py', '1.3.1', {
+        'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
+    }),
+    ('paycheck', '1.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paycheck/'],
+    }),
+    ('argparse', '1.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
+    }),
+    ('pbr', '1.8.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pbr/'],
+    }),
+    ('lockfile', '0.12.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
+    }),
+    ('Cython', '0.23.4', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('six', '1.10.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
+    }),
+    ('dateutil', '2.4.2', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '1.0.2', {
+        'source_tmpl': '%(name)s-%(version)s.post2.tar.gz',
+        'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
+    }),
+    ('decorator', '4.0.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '2.1.0', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('ecdsa', '0.13', {
+        'source_urls': ['https://pypi.python.org/packages/source/e/ecdsa/'],
+    }),
+    ('paramiko', '1.16.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
+    ('pyparsing', '2.0.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pyparsing/'],
+    }),
+    ('netifaces', '0.10.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/netifaces'],
+    }),
+    ('netaddr', '0.7.18', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/netaddr'],
+    }),
+    ('funcsigs', '0.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/f/funcsigs'],
+    }),
+    ('mock', '1.3.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/m/mock'],
+    }),
+    ('pytz', '2015.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pytz'],
+    }),
+    ('pandas', '0.17.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pandas'],
+    }),
+    ('enum34', '1.1.2', {
+        'modulename': 'enum',
+        'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
+    }),
+    ('bitstring', '3.1.3', {
+        # grab tarball from GitHub rather than PyPi since 3.1.3 release on PyPi disappeared;
+        # cfr. https://github.com/scott-griffiths/bitstring/issues/159
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://github.com/scott-griffiths/bitstring/archive/'],
+    }),
+    ('virtualenv', '14.0.5', {
+        'source_urls': ['https://pypi.python.org/packages/source/v/virtualenv'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a-libX11-1.6.3.eb
index 62884700e268ce0c37f048b69796ec44027b09ad..0965b7d1e961653868fce97a1d8870269f869e4b 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a-libX11-1.6.3.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a-libX11-1.6.3.eb
@@ -128,8 +128,10 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
     }),
     ('bitstring', '3.1.3', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'source_urls': ['https://pypi.python.org/packages/source/b/bitstring'],
+        # grab tarball from GitHub rather than PyPi since 3.1.3 release on PyPi disappeared;
+        # cfr. https://github.com/scott-griffiths/bitstring/issues/159
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://github.com/scott-griffiths/bitstring/archive/'],
     }),
     ('virtualenv', '14.0.5', {
         'source_urls': ['https://pypi.python.org/packages/source/v/virtualenv'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb
index 1ecb34bdf1b7a3a7b2c0755c4db55960352f06ff..14683881485dc775e9381eb4570023302941f884 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.11-intel-2016a.eb
@@ -126,8 +126,10 @@ exts_list = [
         'source_urls': ['https://pypi.python.org/packages/source/e/enum34'],
     }),
     ('bitstring', '3.1.3', {
-        'source_tmpl': '%(name)s-%(version)s.zip',
-        'source_urls': ['https://pypi.python.org/packages/source/b/bitstring'],
+        # grab tarball from GitHub rather than PyPi since 3.1.3 release on PyPi disappeared;
+        # cfr. https://github.com/scott-griffiths/bitstring/issues/159
+        'source_tmpl': '%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://github.com/scott-griffiths/bitstring/archive/'],
     }),
     ('virtualenv', '14.0.5', {
         'source_urls': ['https://pypi.python.org/packages/source/v/virtualenv'],
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.3-foss-2015b.eb b/easybuild/easyconfigs/p/Python/Python-2.7.3-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7bff359058f43cd65ee21d95630b9dfac5e985f9
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.3-foss-2015b.eb
@@ -0,0 +1,91 @@
+name = 'Python'
+version = '2.7.3'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.6.1'
+scipyversion = '0.10.1'
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libreadline', '6.2'),
+    ('ncurses', '5.9'),
+    #   ('OpenSSL', '1.0.1f'),  # OS dependency should be preferred for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+# order is important!
+exts_list = [
+    ('setuptools', '0.6c11', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '1.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.1.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': [('http://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
+        'patches': [
+            'numpy-%s_distutils_multiple-lib-dirs.patch' % numpyversion,
+        ],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': [('http://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
+    }),
+    ('mpi4py', '1.3', {
+        'source_urls': ['http://bitbucket.org/mpi4py/mpi4py/downloads/'],
+    }),
+    ('paycheck', '1.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paycheck/'],
+    }),
+    ('argparse', '1.2.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
+    }),
+    ('lockfile', '0.9.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
+    }),
+    ('Cython', '0.17.2', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('six', '1.1.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
+    }),
+    ('dateutil', '2.1', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '0.9.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '1.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('ecdsa', '0.8', {
+        'source_urls': ['https://pypi.python.org/packages/source/e/ecdsa/'],
+    }),
+    ('paramiko', '1.12.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.8-ictce-7.1.2.eb b/easybuild/easyconfigs/p/Python/Python-2.7.8-ictce-7.1.2.eb
index bcf88e98c962784d043c09e37df6aabfb2cadcfb..a7caba4faefa586132a5cf7a48abbfb0b1d111ea 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.8-ictce-7.1.2.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.8-ictce-7.1.2.eb
@@ -14,7 +14,7 @@ source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
 sources = [SOURCE_TGZ]
 
 configopts = ' --enable-unicode=ucs4 '
-preconfigopts = ' LDFLAGS="-lstdc++" '
+preconfigopts = 'env LDFLAGS="-lstdc++" '
 
 # libffi build in python is still broken, see http://bugs.python.org/issue4130
 patches = ['python-2.7_libffi-include-xmmintrin.patch']
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06-XC-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06-bare.eb
similarity index 95%
rename from easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06-XC-bare.eb
rename to easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06-bare.eb
index ae58dbb4981ba8f7e3fa4a24d912746158309c3e..92748077e8fa6a40c10130748bba83351a0dd22d 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06-XC-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06-bare.eb
@@ -5,7 +5,7 @@ versionsuffix = '-bare'
 homepage = 'http://python.org/'
 description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True, 'opt': True}
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06.eb
similarity index 98%
rename from easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06.eb
index d2018b8970d1c19f5770a69212389329693296f1..21613bcfb7b1f115bba75831af9747b1f6e81e94 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.06.eb
@@ -4,7 +4,7 @@ version = '2.7.9'
 homepage = 'http://python.org/'
 description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
 numpyversion = '1.9.1'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11-XC-bare.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11-bare.eb
similarity index 95%
rename from easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11-XC-bare.eb
rename to easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11-bare.eb
index f91af70f07c39da621e4fc0bd63a3f1f1c15331a..f7679002a18e7975cfa4c1ceb0c954ab1b18a3e9 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11-XC-bare.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11-bare.eb
@@ -5,7 +5,7 @@ versionsuffix = '-bare'
 homepage = 'http://python.org/'
 description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True, 'opt': True}
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11.eb
similarity index 98%
rename from easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11.eb
index da85447313263436c9a053d861790257b413dc74..995830889256293017fc2801333def200068bdfc 100644
--- a/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-CrayGNU-2015.11.eb
@@ -4,7 +4,7 @@ version = '2.7.9'
 homepage = 'http://python.org/'
 description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
 numpyversion = '1.9.1'
diff --git a/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.16.eb b/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..70860e49fae83bae772200301bb1c9ac2afe26f4
--- /dev/null
+++ b/easybuild/easyconfigs/p/Python/Python-2.7.9-goolf-1.5.16.eb
@@ -0,0 +1,116 @@
+name = 'Python'
+version = '2.7.9'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+numpyversion = '1.9.1'
+scipyversion = '0.14.1'
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.8'),
+    ('libreadline', '6.3'),
+    ('ncurses', '5.9'),
+    ('SQLite', '3.8.8.1'),
+    ('Tk', '8.6.3', '-no-X11'),
+#    ('OpenSSL', '1.0.1k'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+# order is important!
+# package versions updated Jan 19th 2015
+exts_list = [
+    ('setuptools', '11.3.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '6.0.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
+    }),
+    ('numpy', numpyversion, {
+        'source_urls': [('https://sourceforge.net/projects/numpy/files/NumPy/%s' % numpyversion, 'download')],
+    }),
+    ('scipy', scipyversion, {
+        'source_urls': [('https://sourceforge.net/projects/scipy/files/scipy/%s' % scipyversion, 'download')],
+    }),
+    ('blist', '1.3.6', {
+        'source_urls': ['https://pypi.python.org/packages/source/b/blist/'],
+    }),
+    ('mpi4py', '1.3.1', {
+        'source_urls': ['https://bitbucket.org/mpi4py/mpi4py/downloads/'],
+    }),
+    ('paycheck', '1.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paycheck/'],
+    }),
+    ('argparse', '1.2.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/a/argparse/'],
+    }),
+    ('pbr', '0.10.8', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pbr/'],
+    }),
+    ('lockfile', '0.10.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/l/lockfile/'],
+    }),
+    ('Cython', '0.21.2', {
+        'source_urls': ['http://www.cython.org/release/'],
+    }),
+    ('six', '1.9.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/six/'],
+    }),
+    ('dateutil', '2.4.0', {
+        'source_tmpl': 'python-%(name)s-%(version)s.tar.gz',
+        'source_urls': ['https://pypi.python.org/packages/source/p/python-dateutil/'],
+    }),
+    ('deap', '1.0.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/deap/'],
+    }),
+    ('decorator', '3.4.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/d/decorator/'],
+    }),
+    ('arff', '2.0.1', {
+        'source_tmpl': 'liac-%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/l/liac-arff/'],
+    }),
+    ('pycrypto', '2.6.1', {
+        'modulename': 'Crypto',
+        'source_urls': ['https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/'],
+    }),
+    ('ecdsa', '0.11', {
+        'source_urls': ['https://pypi.python.org/packages/source/e/ecdsa/'],
+    }),
+    ('paramiko', '1.15.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/paramiko/'],
+    }),
+    ('pyparsing', '2.0.3', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pyparsing/'],
+    }),
+    ('netifaces', '0.10.4', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/netifaces'],
+    }),
+    ('netaddr', '0.7.13', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/netaddr'],
+    }),
+    ('mock', '1.0.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/m/mock'],
+    }),
+    ('pytz', '2014.10', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pytz'],
+    }),
+    ('pandas', '0.16.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pandas'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-3.5.0-intel-2015b.eb b/easybuild/easyconfigs/p/Python/Python-3.5.0-intel-2015b.eb
index ae86e7bce7760f87ac06bac560da523691b9d3bf..6b562baa0c5a440a364a9665f8b470d3b6713b5a 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.5.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.5.0-intel-2015b.eb
@@ -19,6 +19,9 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '5.9'),
+    ('SQLite', '3.9.2'),
+    ('Tk', '8.6.4', '-no-X11'),
+    ('GMP', '6.1.0'),
     #   ('OpenSSL', '1.0.1p'),  # OS dependency should be preferred if the os version is more recent then this version, it's
     #   nice to have an up to date openssl for security reasons
 ]
diff --git a/easybuild/easyconfigs/p/Python/Python-3.5.1-foss-2016a.eb b/easybuild/easyconfigs/p/Python/Python-3.5.1-foss-2016a.eb
index 38309ea23d1b40771aa80291f01dc6ac6e7f0e0d..c11711336fab9a27acfda522da1aee2e14e1959b 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.5.1-foss-2016a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.5.1-foss-2016a.eb
@@ -19,6 +19,10 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
+    ('SQLite', '3.9.2'),
+    ('Tk', '8.6.4', '-no-X11'),
+    ('GMP', '6.1.0'),
+    ('XZ', '5.2.2'),
 #   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
 #   nice to have an up to date openssl for security reasons
 ]
@@ -104,6 +108,9 @@ exts_list = [
     ('netaddr', '0.7.18', {
         'source_urls': ['https://pypi.python.org/packages/source/n/netaddr'],
     }),
+    ('pandas', '0.17.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pandas'],
+    }),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/Python/Python-3.5.1-intel-2016a.eb b/easybuild/easyconfigs/p/Python/Python-3.5.1-intel-2016a.eb
index e610aff618e6c81daaed7da080f81490faf4af7b..f0600eefc0fcfb7da096b2802d560121632bc252 100644
--- a/easybuild/easyconfigs/p/Python/Python-3.5.1-intel-2016a.eb
+++ b/easybuild/easyconfigs/p/Python/Python-3.5.1-intel-2016a.eb
@@ -19,6 +19,10 @@ dependencies = [
     ('zlib', '1.2.8'),
     ('libreadline', '6.3'),
     ('ncurses', '6.0'),
+    ('SQLite', '3.9.2'),
+    ('Tk', '8.6.4', '-no-X11'),
+    ('GMP', '6.1.0'),
+    ('XZ', '5.2.2'),
 #   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
 #   nice to have an up to date openssl for security reasons
 ]
@@ -108,6 +112,9 @@ exts_list = [
     ('netaddr', '0.7.18', {
         'source_urls': ['https://pypi.python.org/packages/source/n/netaddr'],
     }),
+    ('pandas', '0.17.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pandas'],
+    }),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/p/p11-kit/p11-kit-0.23.2-foss-2016a.eb b/easybuild/easyconfigs/p/p11-kit/p11-kit-0.23.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..75ecf0ad6a159e33f37f87ed4504990413376401
--- /dev/null
+++ b/easybuild/easyconfigs/p/p11-kit/p11-kit-0.23.2-foss-2016a.eb
@@ -0,0 +1,29 @@
+easyblock = 'ConfigureMake'
+
+name = 'p11-kit'
+version = '0.23.2'
+
+homepage = 'http://p11-glue.freedesktop.org/p11-kit.html'
+description = """Provides a way to load and enumerate PKCS#11 modules.
+ Provides a standard configuration setup for installing
+ PKCS#11 modules in such a way that they're discoverable.
+ Also solves problems with coordinating the use of PKCS#11
+ by different components or libraries living in the same process."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://p11-glue.freedesktop.org/releases/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('libtasn1', '4.7'),
+    ('libffi', '3.2.1'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/p11-kit', 'bin/trust'] +
+             ['lib/libp11-kit.%s' % SHLIB_EXT],
+    'dirs': ['include/p11-kit-1/p11-kit'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/p4vasp/p4vasp-0.3.29-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/p4vasp/p4vasp-0.3.29-intel-2016a-Python-2.7.11.eb
index 699eafed53332b41c5297b49cda7312a158db613..ab6efabad77290e9c6d1b21f20f9c564a6ffa517 100644
--- a/easybuild/easyconfigs/p/p4vasp/p4vasp-0.3.29-intel-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/p/p4vasp/p4vasp-0.3.29-intel-2016a-Python-2.7.11.eb
@@ -22,7 +22,7 @@ dependencies = [
 skipsteps = ['configure', 'build']
 
 # redefine $HOME to specify installation prefix O_o
-preinstallopts = "HOME=%(installdir)s make local &&"
+preinstallopts = "env HOME=%(installdir)s make local &&"
 
 sanity_check_paths = {
     'files': ['p4vasp/bin/p4v', 'p4vasp/lib/libODP.a', 'p4vasp/lib/libp4vasp.a'],
diff --git a/easybuild/easyconfigs/p/packmol/packmol-13.243-ictce-4.1.13.eb b/easybuild/easyconfigs/p/packmol/packmol-13.243-ictce-4.1.13.eb
index 29c565eb8dc8f69ec04b33f9df4e1767c7c26d13..669406175ccb18dd46fcdeb09cae4995d3c5595f 100644
--- a/easybuild/easyconfigs/p/packmol/packmol-13.243-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/packmol/packmol-13.243-ictce-4.1.13.eb
@@ -3,13 +3,13 @@ easyblock = "MakeCp"
 name = 'packmol'
 version = '13.243'
 
-homepage = 'http://www.cmbi.ru.nl/molden/'
+homepage = 'http://www.ime.unicamp.br/~martinez/packmol/'
 description = "Packing Optimization for Molecular Dynamics Simulations"
 
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['https://packmol.googlecode.com/files']
+source_urls = ['http://leandro.iqm.unicamp.br/packmol/versionhistory']
 
 buildopts = 'FORTRAN="$F90"'
 
diff --git a/easybuild/easyconfigs/p/packmol/packmol-16.103-intel-2016a.eb b/easybuild/easyconfigs/p/packmol/packmol-16.103-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a5ed58eedd87f63682fbecf68248453e0145fe81
--- /dev/null
+++ b/easybuild/easyconfigs/p/packmol/packmol-16.103-intel-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = "MakeCp"
+
+name = 'packmol'
+version = '16.103'
+
+homepage = 'http://www.ime.unicamp.br/~martinez/packmol/'
+description = "Packing Optimization for Molecular Dynamics Simulations"
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://leandro.iqm.unicamp.br/packmol/versionhistory']
+
+buildopts = 'FORTRAN="$F90"'
+
+files_to_copy = [(['packmol'], 'bin'), 'COPYING', 'AUTHORS', 'LICENSE']
+
+sanity_check_paths = {
+    'files': ['bin/packmol', 'COPYING', 'AUTHORS', 'LICENSE'],
+    'dirs': [],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.18.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/pandas/pandas-0.18.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..69e84f6fa3e9201d721cd8380b6b08a9197a9279
--- /dev/null
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.18.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'pandas'
+version = '0.18.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = "https://pypi.python.org/pypi/pandas/"
+description = """pandas is an open source, BSD-licensed library providing high-performance, easy-to-use data structures
+ and data analysis tools for the Python programming language."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '2.7.11')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/pandas/pandas-0.18.0-intel-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/p/pandas/pandas-0.18.0-intel-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a3d2dbb5d1482fce95a75c4fedce4de787fdea82
--- /dev/null
+++ b/easybuild/easyconfigs/p/pandas/pandas-0.18.0-intel-2016a-Python-3.5.1.eb
@@ -0,0 +1,23 @@
+easyblock = 'PythonPackage'
+
+name = 'pandas'
+version = '0.18.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = "https://pypi.python.org/pypi/pandas/"
+description = """pandas is an open source, BSD-licensed library providing high-performance, easy-to-use data structures
+ and data analysis tools for the Python programming language."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('Python', '3.5.1')]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/picard/picard-2.1.1-Java-1.8.0_74.eb b/easybuild/easyconfigs/p/picard/picard-2.1.1-Java-1.8.0_74.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b7bb2304d457885752499862b29e5d4bd4304bd7
--- /dev/null
+++ b/easybuild/easyconfigs/p/picard/picard-2.1.1-Java-1.8.0_74.eb
@@ -0,0 +1,18 @@
+name = 'picard'
+version = '2.1.1'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'http://broadinstitute.github.io/picard/'
+description = """A set of tools (in Java) for working with next generation sequencing data in the BAM
+  (http://samtools.github.io/hts-specs) format."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://github.com/broadinstitute/picard/releases/download/%(version)s/']
+sources = ['%(name)s-tools-%(version)s.zip']
+
+dependencies = [('Java', '1.8.0_74')]
+
+modloadmsg = "To execute picard run: java -jar \\${EBROOTPICARD}/%(name)s.jar"
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/p/pixman/pixman-0.34.0-foss-2016a.eb b/easybuild/easyconfigs/p/pixman/pixman-0.34.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..896aab1550556e67ffdaae8d5b66dd439ed0d1c9
--- /dev/null
+++ b/easybuild/easyconfigs/p/pixman/pixman-0.34.0-foss-2016a.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = "pixman"
+version = '0.34.0'
+
+homepage = 'http://www.pixman.org/'
+description = """Pixman is a low-level software library for pixel manipulation, providing features such as image
+compositing and trapezoid rasterization. Important users of pixman are the cairo graphics library and the X server."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://cairographics.org/releases/']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['lib/libpixman-1.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-foss-2016a.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2796515752da9aa5f57dc829609f683fe184a9db
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29-foss-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'pkg-config'
+version = '0.29'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/pkg-config/'
+description = """pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the
+ correct compiler options on the command line so an application can use
+  gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
+ for instance, rather than hard-coding values on where to find glib (or other libraries)."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://pkgconfig.freedesktop.org/releases/']
+
+# don't use PAX, it might break.
+tar_config_opts = True
+
+configopts = " --with-internal-glib"
+
+sanity_check_paths = {
+    'files': ['bin/pkg-config'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-foss-2016a.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bb2fea6cae6d26a2621d6a087fb567e6be5a6ea0
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-foss-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'pkg-config'
+version = '0.29.1'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/pkg-config/'
+description = """pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the
+ correct compiler options on the command line so an application can use
+  gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
+ for instance, rather than hard-coding values on where to find glib (or other libraries)."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://pkgconfig.freedesktop.org/releases/']
+
+# don't use PAX, it might break.
+tar_config_opts = True
+
+configopts = " --with-internal-glib"
+
+sanity_check_paths = {
+    'files': ['bin/pkg-config'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-intel-2016a.eb b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eeb50eabb138ec6a49adf5c33a0d6238ff5ede9b
--- /dev/null
+++ b/easybuild/easyconfigs/p/pkg-config/pkg-config-0.29.1-intel-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'pkg-config'
+version = '0.29.1'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/pkg-config/'
+description = """pkg-config is a helper tool used when compiling applications and libraries. It helps you insert the
+ correct compiler options on the command line so an application can use
+  gcc -o test test.c `pkg-config --libs --cflags glib-2.0`
+ for instance, rather than hard-coding values on where to find glib (or other libraries)."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://pkgconfig.freedesktop.org/releases/']
+
+# don't use PAX, it might break.
+tar_config_opts = True
+
+configopts = " --with-internal-glib"
+
+sanity_check_paths = {
+    'files': ['bin/pkg-config'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/p/pomkl/pomkl-2016.03.eb b/easybuild/easyconfigs/p/pomkl/pomkl-2016.03.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6b7d80bf525e6e079720b8009efaace0cceb455b
--- /dev/null
+++ b/easybuild/easyconfigs/p/pomkl/pomkl-2016.03.eb
@@ -0,0 +1,20 @@
+easyblock = "Toolchain"
+
+name = 'pomkl'
+version = '2016.03'
+
+homepage = 'http://www.pgroup.com/index.htm'
+description = """Toolchain with PGI C, C++ and Fortran compilers, alongside Intel MKL & OpenMPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '16.3'
+gccsuff = '-GCC-4.9.3-2.25'
+
+dependencies = [
+    ('PGI', compver, gccsuff),
+    ('OpenMPI', '1.10.2', '', ('PGI', '%s%s' % (compver, gccsuff))),
+    ('imkl', '11.3.2.181', '', ('pompi', '%s' % (version))),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/p/pompi/pompi-2016.03.eb b/easybuild/easyconfigs/p/pompi/pompi-2016.03.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0bf9bb7552e8887551d2570a22a76e39b895b8dd
--- /dev/null
+++ b/easybuild/easyconfigs/p/pompi/pompi-2016.03.eb
@@ -0,0 +1,19 @@
+easyblock = "Toolchain"
+
+name = 'pompi'
+version = '2016.03'
+pgisuffix = '-GCC-4.9.3-2.25'
+
+homepage = 'http://www.pgroup.com/index.htm'
+description = """Toolchain with PGI C, C++ and Fortran compilers, alongside OpenMPI."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+compver = '16.3'
+
+dependencies = [
+    ('PGI', compver, pgisuffix),
+    ('OpenMPI', '1.10.2', '', ('PGI', '%s%s' % (compver, pgisuffix))),
+]
+
+moduleclass = 'toolchain'
diff --git a/easybuild/easyconfigs/p/popt/popt-1.16.eb b/easybuild/easyconfigs/p/popt/popt-1.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4b05ae3e4e8e0340a6605761b633e1d56ba9b56a
--- /dev/null
+++ b/easybuild/easyconfigs/p/popt/popt-1.16.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'popt'
+version = "1.16"
+
+homepage = "http://freecode.com/projects/popt"
+description = """Popt is a C library for parsing command line parameters."""
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['http://rpm5.org/files/popt/']
+sources = [SOURCE_TAR_GZ]
+
+toolchainopts = {'optarch': False}
+sanity_check_paths = {
+    'files': ['include/popt.h',
+              ('lib/libpopt.a',  'lib64/libpopt.a'),
+              ('lib/libpopt.%s' % SHLIB_EXT, 'lib64/libpopt.%s' % SHLIB_EXT)],
+    'dirs': [],
+}
+
+maxparallel = 1
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb
index dacbb816a73bd4b3f209dcc7734044df662dd439..3f72d96af428130ed678758aeb01f1b826b3e9dc 100644
--- a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-goolf-1.4.10.eb
@@ -6,7 +6,7 @@ version = '1.0.5'
 homepage = 'http://xorg.freedesktop.org/'
 description = """X.org PrintProto protocol headers."""
 
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
diff --git a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb
index db2b6fad9418f0c0e9d31f04580a209a1abf28ea..83069f50b6f04633a35ef24802b9b693fb095287 100644
--- a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-4.1.13.eb
@@ -6,7 +6,7 @@ version = '1.0.5'
 homepage = 'http://xorg.freedesktop.org/'
 description = """X.org PrintProto protocol headers."""
 
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
diff --git a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-5.3.0.eb b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-5.3.0.eb
index ae82f5006157fa4cea97f4fa5ddb9445ef2f424d..bd1a54770562a2dca225a090d027b8570c672e75 100644
--- a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-ictce-5.3.0.eb
@@ -6,7 +6,7 @@ version = '1.0.5'
 homepage = 'http://xorg.freedesktop.org/'
 description = """X.org PrintProto protocol headers."""
 
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
diff --git a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-intel-2015a.eb b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-intel-2015a.eb
index 0e5bfb142cd6eaf48127e9d4517a25365982e535..38e0bbe3cc68d2ddb81f9220aedf315ee4eb64a0 100644
--- a/easybuild/easyconfigs/p/printproto/printproto-1.0.5-intel-2015a.eb
+++ b/easybuild/easyconfigs/p/printproto/printproto-1.0.5-intel-2015a.eb
@@ -6,7 +6,7 @@ version = '1.0.5'
 homepage = 'http://xorg.freedesktop.org/'
 description = """X.org PrintProto protocol headers."""
 
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 sources = [SOURCELOWER_TAR_GZ]
 
 toolchain = {'name': 'intel', 'version': '2015a'}
diff --git a/easybuild/easyconfigs/p/pscom/pscom-5.0.48-1.eb b/easybuild/easyconfigs/p/pscom/pscom-5.0.48-1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..13b9a47c545bc7b49554c2ab114d1a44a4ce7da4
--- /dev/null
+++ b/easybuild/easyconfigs/p/pscom/pscom-5.0.48-1.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'pscom'
+version = '5.0.48-1'
+
+homepage = 'http://www.par-tec.com'
+description = "ParaStation is a robust and efficient cluster middleware, consisting of a high-performance communication layer (MPI) and a sophisticated management layer."
+
+toolchain = {'version': '', 'name': 'dummy'}
+
+sources = ['%(version)s.zip']
+source_urls = ['https://github.com/ParaStation/%(name)s/archive/']
+
+builddependencies = [
+    ('popt', '1.16'),
+]
+
+sanity_check_paths = {
+    'files': ['include/%(name)s.h', ('lib/libpscom.so', 'lib64/libpscom.so'), ('lib/libpscom4mxm.so', 'lib64/libpscom4mxm.so')],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-GCC-4.9.2.eb b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-GCC-4.9.2.eb
index 3e04c7775f5125de2a275b0ca6cfa32f8275ea86..dfba4ffaa841fa2d45ab9c8d9eb7118b18db6446 100644
--- a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-GCC-4.9.2.eb
+++ b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-GCC-4.9.2.eb
@@ -1,11 +1,11 @@
-easyblock = 'ConfigureMake'
-
 name = 'psmpi'
 version = '5.1.0-1'
 
 homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI as part of the ParaStationV5 cluster suite provides robust, flexible and scalable communication and management functions for Linux-based compute clusters. Beside parallel applications based on the Message Passing Interface specification, version 2 (MPI2), also serial applications are supported."""
-
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with 
+various batch systems for tighter process control.
+"""
 toolchain = {'name': 'GCC', 'version': '4.9.2'}
 
 sources = [
@@ -17,26 +17,10 @@ source_urls = [
     'https://trac.mpich.org/projects/openpa/raw-attachment/wiki/Downloads/',
 ]
 
-# MPICH configure wants F90/F90FLAGS to be renamed to FC/FCFLAGS.
-preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset F90FLAGS; '
-
-# Build shared libraries
-configopts = '--with-confset=gcc --enable-shared --enable-static'
+mpich_opts = '--enable-static'
 
-dependencies = [('pscom', '5.0.44-1')]
-
-sanity_check_paths = {
-    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
-              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h',
-              ('lib/libfmpich.a', 'lib64/libfmpich.a'),
-              ('lib/libfmpich.%s' % SHLIB_EXT, 'lib64/libfmpich.%s' % SHLIB_EXT),
-              ('lib/libmpich.a', 'lib64/libmpich.a'),
-              ('lib/libmpich.%s' % SHLIB_EXT, 'lib64/libmpich.%s' % SHLIB_EXT),
-              ('lib/libmpichcxx.a', 'lib64/libmpichcxx.a'),
-              ('lib/libmpichcxx.%s' % SHLIB_EXT, 'lib64/libmpichcxx.%s' % SHLIB_EXT),
-              ('lib/libmpichf90.a', 'lib64/libmpichf90.a'),
-              ('lib/libmpichf90.%s' % SHLIB_EXT, 'lib64/libmpichf90.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
+dependencies = [
+    ('pscom', '5.0.48-1', '', True),
+]
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-iccifort-2015.1.133.eb b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-iccifort-2015.1.133.eb
index 4bb1ff6f7abd3013b7fc5e2d052d19d260129e2f..e8adea5cddac4ec9c75b51694e3cc76c48693e4e 100644
--- a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-iccifort-2015.1.133.eb
+++ b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.0-1-iccifort-2015.1.133.eb
@@ -1,11 +1,11 @@
-easyblock = 'ConfigureMake'
-
 name = 'psmpi'
 version = '5.1.0-1'
 
 homepage = 'https://github.com/ParaStation/psmpi2'
-description = """ParaStation MPI as part of the ParaStationV5 cluster suite provides robust, flexible and scalable communication and management functions for Linux-based compute clusters. Beside parallel applications based on the Message Passing Interface specification, version 2 (MPI2), also serial applications are supported."""
-
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with 
+various batch systems for tighter process control.
+"""
 toolchain = {'name': 'iccifort', 'version': '2015.1.133'}
 
 sources = [
@@ -17,26 +17,10 @@ source_urls = [
     'https://trac.mpich.org/projects/openpa/attachment/wiki/Downloads',
 ]
 
-# MPICH configure wants F90/F90FLAGS to be renamed to FC/FCFLAGS.
-preconfigopts = 'export FC="$F90"; export FCFLAGS="$F90FLAGS"; unset F90; unset F90FLAGS; '
-
-# Build shared libraries
-configopts = '--with-confset=intel --enable-shared --enable-static --enable-romio --enable-mpe'
+mpich_opts = '--enable-static'
 
-dependencies = [('pscom', '5.0.44-1')]
-
-sanity_check_paths = {
-    'files': ['bin/mpicc', 'bin/mpicxx', 'bin/mpic++', 'bin/mpif77', 'bin/mpif90',
-              'include/mpi.h', 'include/mpi.mod', 'include/mpif.h',
-              ('lib/libfmpich.a', 'lib64/libfmpich.a'),
-              ('lib/libfmpich.%s' % SHLIB_EXT, 'lib64/libfmpich.%s' % SHLIB_EXT),
-              ('lib/libmpich.a', 'lib64/libmpich.a'),
-              ('lib/libmpich.%s' % SHLIB_EXT, 'lib64/libmpich.%s' % SHLIB_EXT),
-              ('lib/libmpichcxx.a', 'lib64/libmpichcxx.a'),
-              ('lib/libmpichcxx.%s' % SHLIB_EXT, 'lib64/libmpichcxx.%s' % SHLIB_EXT),
-              ('lib/libmpichf90.a', 'lib64/libmpichf90.a'),
-              ('lib/libmpichf90.%s' % SHLIB_EXT, 'lib64/libmpichf90.%s' % SHLIB_EXT)],
-    'dirs': [],
-}
+dependencies = [
+    ('pscom', '5.0.48-1', '', True),
+]
 
 moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.5-1-GCC-4.9.3-mt.eb b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.5-1-GCC-4.9.3-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1bfdad4fb7a2a0584063e3d3d930217bcda72c46
--- /dev/null
+++ b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.5-1-GCC-4.9.3-mt.eb
@@ -0,0 +1,26 @@
+name = 'psmpi'
+version = '5.1.5-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with 
+various batch systems for tighter process control.
+"""
+
+toolchain = {'version': '4.9.3', 'name': 'GCC'}
+
+toolchainopts = {'defaultopt': True}
+
+sources = ['%(version)s.tar.gz']
+source_urls = ['https://github.com/ParaStation/psmpi2/archive/']
+
+mpich_opts = '--enable-static'
+
+threaded = True
+
+dependencies = [
+    ('pscom', '5.0.48-1', '', True),
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.5-1-GCC-4.9.3.eb b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.5-1-GCC-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..93f76f8af097b0fda025ac15d57174cc0798de67
--- /dev/null
+++ b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.5-1-GCC-4.9.3.eb
@@ -0,0 +1,23 @@
+name = 'psmpi'
+version = '5.1.5-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with 
+various batch systems for tighter process control.
+"""
+
+toolchain = {'version': '4.9.3', 'name': 'GCC'}
+
+toolchainopts = {'defaultopt': True}
+
+sources = ['%(version)s.tar.gz']
+source_urls = ['https://github.com/ParaStation/psmpi2/archive/']
+
+mpich_opts = '--enable-static'
+
+dependencies = [
+    ('pscom', '5.0.48-1', '', True),
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.5-1-iccifort-2015.1.133-mt.eb b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.5-1-iccifort-2015.1.133-mt.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9bf66b57282fe31fa6b489a7e075fc5bc5ecbc7c
--- /dev/null
+++ b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.5-1-iccifort-2015.1.133-mt.eb
@@ -0,0 +1,26 @@
+name = 'psmpi'
+version = '5.1.5-1'
+versionsuffix = '-mt'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with 
+various batch systems for tighter process control.
+"""
+
+toolchain = {'version': '2015.1.133', 'name': 'iccifort'}
+
+toolchainopts = {'defaultopt': True}
+
+sources = ['%(version)s.tar.gz']
+source_urls = ['https://github.com/ParaStation/psmpi2/archive/']
+
+mpich_opts = '--enable-static'
+
+threaded = True
+
+dependencies = [
+    ('pscom', '5.0.48-1', '', True),
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/p/psmpi/psmpi-5.1.5-1-iccifort-2015.1.133.eb b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.5-1-iccifort-2015.1.133.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8251dde430d1a68b16b1e47c95128387c74efee1
--- /dev/null
+++ b/easybuild/easyconfigs/p/psmpi/psmpi-5.1.5-1-iccifort-2015.1.133.eb
@@ -0,0 +1,23 @@
+name = 'psmpi'
+version = '5.1.5-1'
+
+homepage = 'https://github.com/ParaStation/psmpi2'
+description = """ParaStation MPI is an open source high-performance MPI 3.0 implementation,
+based on MPICH v3. It provides extra low level communication libraries and integration with 
+various batch systems for tighter process control.
+"""
+
+toolchain = {'version': '2015.1.133', 'name': 'iccifort'}
+
+toolchainopts = {'defaultopt': True}
+
+sources = ['%(version)s.tar.gz']
+source_urls = ['https://github.com/ParaStation/psmpi2/archive/']
+
+mpich_opts = '--enable-static'
+
+dependencies = [
+    ('pscom', '5.0.48-1', '', True),
+]
+
+moduleclass = 'mpi'
diff --git a/easybuild/easyconfigs/p/pydicom/pydicom-0.9.9-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/p/pydicom/pydicom-0.9.9-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ab11ff4c9f26d30c97ce8acc2f5a51387f821b9f
--- /dev/null
+++ b/easybuild/easyconfigs/p/pydicom/pydicom-0.9.9-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,26 @@
+easyblock = 'PythonPackage'
+
+name = 'pydicom'
+version = '0.9.9'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://github.com/darcymason/pydicom'
+description = """Read, modify and write DICOM files with python code"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://github.com/darcymason/pydicom/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [('Python', '2.7.11')]
+
+start_dir = 'source'
+
+options = {'modulename': 'dicom'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/pydicom-%(version)s-py%(pyshortver)s.egg'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/p/pymatgen/pymatgen-3.5.0-intel-2016.02-GCC-4.9-Python-2.7.11.eb b/easybuild/easyconfigs/p/pymatgen/pymatgen-3.5.0-intel-2016.02-GCC-4.9-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f6c2197ee20de400bb0835df6fbd09a20de87b00
--- /dev/null
+++ b/easybuild/easyconfigs/p/pymatgen/pymatgen-3.5.0-intel-2016.02-GCC-4.9-Python-2.7.11.eb
@@ -0,0 +1,26 @@
+easyblock = "PythonPackage"
+
+name = 'pymatgen'
+version = '3.5.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/pymatgen'
+description = """Python Materials Genomics is a robust materials analysis code that defines core object
+ representations for structures and molecules with support for many electronic structure codes."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('spglib', '1.9.2'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages']
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.6.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.6.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eacf9a8384c836d3e7cd441341fa27f762a3d460
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.6.eb
@@ -0,0 +1,16 @@
+name = 'Qt'
+version = '4.8.6'
+
+homepage = 'http://qt-project.org/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = [ 'http://download.qt.io/official_releases/qt/4.8/%(version)s' ]
+sources = [ 'qt-everywhere-opensource-src-%(version)s.tar.gz' ]
+
+configopts  = ' -opensource -nomake tests -nomake examples -confirm-license -release'
+configopts  += ' -shared -no-accessibility -no-sql-mysql -no-sql-sqlite -no-webkit'
+platform = 'linux-g++-64'
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.7-foss-2016a-GLib-2.48.0.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.7-foss-2016a-GLib-2.48.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8616257c5ce38ea0cda53270f0bf98ad2eb115ad
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.7-foss-2016a-GLib-2.48.0.eb
@@ -0,0 +1,27 @@
+name = 'Qt'
+version = '4.8.7'
+
+homepage = 'http://qt.io/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [
+    'http://download.qt.io/official_releases/qt/%(version_major_minor)s/%(version)s/',
+    'http://download.qt.io/archive/qt/%(version_major_minor)s/%(version)s/'
+]
+sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
+
+patches = ['Qt-%(version)s_phonon-export.patch']
+
+glib_ver = '2.48.0'
+versionsuffix = '-GLib-%s' % glib_ver
+
+dependencies = [
+    ('GLib', glib_ver),
+    ('libX11', '1.6.3'),
+    ('libXt', '1.1.5'),
+    ('libXrender', '0.9.9'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt/Qt-4.8.7-foss-2016a.eb b/easybuild/easyconfigs/q/Qt/Qt-4.8.7-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fd0d5932c94a509baea1f04b5a93e9e1e79bc07f
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt/Qt-4.8.7-foss-2016a.eb
@@ -0,0 +1,24 @@
+name = 'Qt'
+version = '4.8.7'
+
+homepage = 'http://qt.io/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [
+    'http://download.qt.io/official_releases/qt/%(version_major_minor)s/%(version)s/',
+    'http://download.qt.io/archive/qt/%(version_major_minor)s/%(version)s/'
+]
+sources = ['%(namelower)s-everywhere-opensource-src-%(version)s.tar.gz']
+
+patches = ['Qt-%(version)s_phonon-export.patch']
+
+dependencies = [
+    ('GLib', '2.47.5'),
+    ('libX11', '1.6.3'),
+    ('libXt', '1.1.5'),
+    ('libXrender', '0.9.9'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt5/Qt5-5.6.0-foss-2016a.eb b/easybuild/easyconfigs/q/Qt5/Qt5-5.6.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..27b1514a37daac0be65a9152ebf4c01ae979b049
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt5/Qt5-5.6.0-foss-2016a.eb
@@ -0,0 +1,39 @@
+easyblock = 'EB_Qt'
+
+name = 'Qt5'
+version = '5.6.0'
+
+homepage = 'http://qt.io/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+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']
+
+dependencies = [
+    ('GLib', '2.48.0'),
+    ('libX11', '1.6.3'),
+    ('libXt', '1.1.5'),
+    ('libXi', '1.7.6'),
+    ('xcb-util', '0.4.0'),
+    ('xcb-util-image', '0.4.0'),
+    ('xcb-util-keysyms', '0.4.0'),
+    ('xcb-util-renderutil', '0.3.9'),
+    ('xcb-util-wm', '0.4.1'),
+    ('libxkbcommon', '0.6.1'),
+    ('libXrender', '0.9.9'),
+    ('fontconfig', '2.11.95'),
+    ('freetype', '2.6.3'),
+    ('libXfixes', '5.0.1'),
+    ('libXcursor', '1.1.14'),
+    ('libXinerama', '1.1.3'),
+    ('libXrandr', '1.5.0'),
+    ('libpng', '1.6.21'),
+    ('libGLU', '9.0.0', '-Mesa-11.2.1'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/Qt5/Qt5-5.6.0-intel-2016a.eb b/easybuild/easyconfigs/q/Qt5/Qt5-5.6.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f4f0ab35bde7c33b7925cac361f0fef7b8095f19
--- /dev/null
+++ b/easybuild/easyconfigs/q/Qt5/Qt5-5.6.0-intel-2016a.eb
@@ -0,0 +1,39 @@
+easyblock = 'EB_Qt'
+
+name = 'Qt5'
+version = '5.6.0'
+
+homepage = 'http://qt.io/'
+description = "Qt is a comprehensive cross-platform C++ application framework."
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+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']
+
+dependencies = [
+    ('GLib', '2.48.0'),
+    ('libX11', '1.6.3'),
+    ('libXt', '1.1.5'),
+    ('libXi', '1.7.6'),
+    ('xcb-util', '0.4.0'),
+    ('xcb-util-image', '0.4.0'),
+    ('xcb-util-keysyms', '0.4.0'),
+    ('xcb-util-renderutil', '0.3.9'),
+    ('xcb-util-wm', '0.4.1'),
+    ('libxkbcommon', '0.6.1'),
+    ('libXrender', '0.9.9'),
+    ('fontconfig', '2.11.95'),
+    ('freetype', '2.6.3'),
+    ('libXfixes', '5.0.1'),
+    ('libXcursor', '1.1.14'),
+    ('libXinerama', '1.1.3'),
+    ('libXrandr', '1.5.0'),
+    ('libpng', '1.6.21'),
+    ('libGLU', '9.0.0', '-Mesa-11.2.1'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/q/QuickFF/QuickFF-2.0.1-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/q/QuickFF/QuickFF-2.0.1-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1920995e1b75ef9dafe43d858b56bd43dbf90c19
--- /dev/null
+++ b/easybuild/easyconfigs/q/QuickFF/QuickFF-2.0.1-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,29 @@
+easyblock = 'PythonPackage'
+
+name = 'QuickFF'
+version = '2.0.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://molmod.github.io/QuickFF/'
+description = """QuickFF is a Python package developed at the Center for
+Molecular Modeling (CMM) to quickly derive accurate force fields from ab initio
+calculations."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://github.com/molmod/QuickFF/releases/download/v%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.10'),
+    ('matplotlib', '1.5.0', versionsuffix),
+    ('molmod', '1.1', versionsuffix),
+    ('yaff', '1.0.develop.2.14', '%s-HDF5-1.8.15-patch1-serial' % versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(namelower)s'],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/q/qrupdate/qrupdate-1.1.2-foss-2016a.eb b/easybuild/easyconfigs/q/qrupdate/qrupdate-1.1.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..27976f981b01e5d894ec62edbf1b060351436f99
--- /dev/null
+++ b/easybuild/easyconfigs/q/qrupdate/qrupdate-1.1.2-foss-2016a.eb
@@ -0,0 +1,28 @@
+easyblock = 'MakeCp'
+
+name = 'qrupdate'
+version = '1.1.2'
+
+homepage = 'https://sourceforge.net/projects/qrupdate/'
+description = """qrupdate is a Fortran library for fast updates of QR and Cholesky decompositions."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [SOURCEFORGE_SOURCE]
+
+patches = ['%(name)s-%(version)s_makeconf.patch']
+
+buildopts = 'lib'
+
+files_to_copy = [(['libqrupdate.a'], 'lib')]
+
+sanity_check_paths = {
+    'files': ['lib/libqrupdate.a'],
+    'dirs': [],
+}
+
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.2-foss-2016a-R-3.2.3.eb b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.2-foss-2016a-R-3.2.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..13ad83c7743c43ade92aece403358eff3176e16a
--- /dev/null
+++ b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.2-foss-2016a-R-3.2.3.eb
@@ -0,0 +1,153 @@
+easyblock = 'Bundle'
+
+name = 'R-bundle-Bioconductor'
+version = '3.2'
+versionsuffix = '-R-%(rver)s'
+
+homepage = 'http://www.r-project.org/'
+description = """R is a free software environment for statistical computing and graphics."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+# these are extensions for R
+exts_defaultclass = 'RPackage'
+exts_filter = ("R -q --no-save", "library(%(ext_name)s)")
+
+rver = '3.2.3'
+versionsuffix = '-R-%s' % rver
+dependencies = [('R', rver)]
+
+name_tmpl = '%(name)s_%(version)s.tar.gz'
+ext_options = {
+    'source_urls': [
+        'http://cran.r-project.org/src/contrib/Archive/%(name)s',  # package archive
+        'http://cran.r-project.org/src/contrib/',  # current version of packages
+        'http://cran.freestatistics.org/src/contrib',  # mirror alternative for current packages
+    ],
+    'source_tmpl': name_tmpl,
+}
+bioconductor_options = {
+    'source_urls': [
+        'http://www.bioconductor.org/packages/3.2/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/3.2/data/annotation/src/contrib/',
+        'http://www.bioconductor.org/packages/3.2/data/experiment/src/contrib/',
+    ],
+    'source_tmpl': name_tmpl,
+}
+
+# CRAN packages on which these Bioconductor packages depend are available in R module on which this depends
+# !! order of packages is important !!
+exts_list = [
+    ('BiocGenerics', '0.16.1', bioconductor_options),
+    ('Biobase', '2.30.0', bioconductor_options),
+    ('S4Vectors', '0.8.11', bioconductor_options),
+    ('IRanges', '2.4.8', bioconductor_options),
+    ('GenomeInfoDb', '1.6.3', bioconductor_options),
+    ('AnnotationDbi', '1.32.3', bioconductor_options),
+    ('zlibbioc', '1.16.0', bioconductor_options),
+    ('XVector', '0.10.0', bioconductor_options),
+    ('Biostrings', '2.38.4', bioconductor_options),
+    ('GenomicRanges', '1.22.4', bioconductor_options),
+    ('BiocParallel', '1.4.3', bioconductor_options),
+    ('Rsamtools', '1.22.0', bioconductor_options),
+    ('lambda.r', '1.1.7', ext_options),
+    ('futile.options', '1.0.0', ext_options),
+    ('futile.logger', '1.4.1', ext_options),
+    ('SummarizedExperiment', '1.0.2', bioconductor_options),
+    ('GenomicAlignments', '1.6.3', bioconductor_options),
+    ('ShortRead', '1.28.0', bioconductor_options),
+    ('graph', '1.48.0', bioconductor_options),
+    ('affyio', '1.40.0', bioconductor_options),
+    ('BiocInstaller', '1.20.1', bioconductor_options),
+    ('preprocessCore', '1.32.0', bioconductor_options),
+    ('affy', '1.48.0', bioconductor_options),
+    ('GO.db', '3.2.2', bioconductor_options),
+    ('limma', '3.26.9', bioconductor_options),
+    ('RBGL', '1.46.0', bioconductor_options),
+    ('org.Hs.eg.db', '3.2.3', bioconductor_options),
+    ('AnnotationForge', '1.12.2', bioconductor_options),
+    ('KEGG.db', '3.2.2', bioconductor_options),
+    ('annaffy', '1.42.0', bioconductor_options),
+    ('gcrma', '2.42.0', bioconductor_options),
+    ('oligoClasses', '1.32.0', bioconductor_options),
+    ('edgeR', '3.12.1', bioconductor_options),
+    ('PFAM.db', '3.2.2', bioconductor_options),
+    ('perm', '1.0-0.0', ext_options),
+    ('baySeq', '2.4.1', bioconductor_options),
+    ('qvalue', '2.2.2', bioconductor_options),
+    ('impute', '1.44.0', bioconductor_options),
+    ('samr', '2.0', ext_options),
+    ('DEGseq', '1.24.0', bioconductor_options),
+    ('hgu133plus2.db', '3.2.2', bioconductor_options),
+    ('illuminaio', '0.12.0', bioconductor_options),
+    ('rtracklayer', '1.30.4', bioconductor_options),
+    ('biomaRt', '2.26.1', bioconductor_options),
+    ('GenomicFeatures', '1.22.13', bioconductor_options),
+    ('bumphunter', '1.10.0', bioconductor_options),
+    ('multtest', '2.26.0', bioconductor_options),
+    ('siggenes', '1.44.0', bioconductor_options),
+    ('DynDoc', '1.48.0', bioconductor_options),
+    ('genoset', '1.24.0', bioconductor_options),
+    ('NOISeq', '2.14.1', bioconductor_options),
+    ('Rgraphviz', '2.14.0', bioconductor_options),
+    ('RNASeqPower', '1.10.0', bioconductor_options),
+    ('annotate', '1.48.0', bioconductor_options),
+    ('GSEABase', '1.32.0', bioconductor_options),
+    ('genefilter', '1.52.1', bioconductor_options),
+    ('Category', '2.36.0', bioconductor_options),
+    ('GOstats', '2.36.0', bioconductor_options),
+    ('BSgenome', '1.38.0', bioconductor_options),
+    ('VariantAnnotation', '1.16.4', bioconductor_options),
+    ('biovizBase', '1.18.0', bioconductor_options),
+    ('OrganismDbi', '1.12.1', bioconductor_options),
+    ('ggbio', '1.18.5', bioconductor_options),
+    ('geneplotter', '1.48.0', bioconductor_options),
+    ('DESeq2', '1.10.1', bioconductor_options),
+    ('ReportingTools', '2.10.0', bioconductor_options),
+    ('affycoretools', '1.42.0', bioconductor_options),
+    ('TxDb.Hsapiens.UCSC.hg19.knownGene', '3.2.2', bioconductor_options),
+    ('Homo.sapiens', '1.3.1', bioconductor_options),
+    ('BSgenome.Hsapiens.UCSC.hg19', '1.4.0', bioconductor_options),
+    ('AgiMicroRna', '2.20.0', bioconductor_options),
+    ('GenomeGraphs', '1.30.0', bioconductor_options),
+    ('geneLenDataBase', '1.6.0', bioconductor_options),
+    ('goseq', '1.22.0', bioconductor_options),
+    ('KEGGREST', '1.10.1', bioconductor_options),
+    ('KEGGgraph', '1.28.0', bioconductor_options),
+    ('KEGGprofile', '1.12.0', bioconductor_options),
+    ('GEOquery', '2.36.0', bioconductor_options),
+    ('mixOmics', '5.2.0', ext_options),
+    ('minfi', '1.16.1', bioconductor_options),
+    ('FDb.InfiniumMethylation.hg19', '2.2.0', bioconductor_options),
+    ('methylumi', '2.16.0', bioconductor_options),
+    ('lumi', '2.22.1', bioconductor_options),
+    ('widgetTools', '1.48.0', bioconductor_options),
+    ('tkWidgets', '1.48.0', bioconductor_options),
+    ('Mfuzz', '2.30.0', bioconductor_options),
+    ('maSigPro', '1.42.0', bioconductor_options),
+    ('SPIA', '2.22.0', bioconductor_options),
+    ('Gviz', '1.14.7', bioconductor_options),
+    ('cummeRbund', '2.12.1', bioconductor_options),
+    ('GenomicFiles', '1.6.2', bioconductor_options),
+    ('derfinderHelper', '1.4.1', bioconductor_options),
+    ('derfinder', '1.4.4', bioconductor_options),
+    ('polyester', '1.6.0', bioconductor_options),
+    ('Rsubread', '1.20.5', bioconductor_options),
+    ('pcaMethods', '1.60.0', bioconductor_options),
+    ('marray', '1.48.0', bioconductor_options),
+    ('CGHbase', '1.30.0', bioconductor_options),
+    ('sigaR', '1.14.0', bioconductor_options),
+    ('HCsnip', '1.10.0', bioconductor_options),
+    ('metagenomeSeq', '1.12.0', bioconductor_options),
+    ('gdsfmt', '1.6.2', bioconductor_options),
+    ('SNPRelate', '1.4.2', bioconductor_options),
+]
+
+modextrapaths = {'R_LIBS': ''}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['AnnotationDbi', 'BiocInstaller', 'GenomicFeatures'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.2-intel-2016a-R-3.2.3.eb b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.2-intel-2016a-R-3.2.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..64a35be205030a61fc66e1a25896026a77a9d632
--- /dev/null
+++ b/easybuild/easyconfigs/r/R-bundle-Bioconductor/R-bundle-Bioconductor-3.2-intel-2016a-R-3.2.3.eb
@@ -0,0 +1,152 @@
+easyblock = 'Bundle'
+
+name = 'R-bundle-Bioconductor'
+version = '3.2'
+
+homepage = 'http://www.r-project.org/'
+description = """R is a free software environment for statistical computing and graphics."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+# these are extensions for R
+exts_defaultclass = 'RPackage'
+exts_filter = ("R -q --no-save", "library(%(ext_name)s)")
+
+rver = '3.2.3'
+versionsuffix = '-R-%s' % rver
+dependencies = [('R', rver)]
+
+name_tmpl = '%(name)s_%(version)s.tar.gz'
+ext_options = {
+    'source_urls': [
+        'http://cran.r-project.org/src/contrib/Archive/%(name)s',  # package archive
+        'http://cran.r-project.org/src/contrib/',  # current version of packages
+        'http://cran.freestatistics.org/src/contrib',  # mirror alternative for current packages
+    ],
+    'source_tmpl': name_tmpl,
+}
+bioconductor_options = {
+    'source_urls': [
+        'http://www.bioconductor.org/packages/3.2/bioc/src/contrib/',
+        'http://www.bioconductor.org/packages/3.2/data/annotation/src/contrib/',
+        'http://www.bioconductor.org/packages/3.2/data/experiment/src/contrib/',
+    ],
+    'source_tmpl': name_tmpl,
+}
+
+# CRAN packages on which these Bioconductor packages depend are available in R module on which this depends
+# !! order of packages is important !!
+exts_list = [
+    ('BiocGenerics', '0.16.1', bioconductor_options),
+    ('Biobase', '2.30.0', bioconductor_options),
+    ('S4Vectors', '0.8.11', bioconductor_options),
+    ('IRanges', '2.4.8', bioconductor_options),
+    ('GenomeInfoDb', '1.6.3', bioconductor_options),
+    ('AnnotationDbi', '1.32.3', bioconductor_options),
+    ('zlibbioc', '1.16.0', bioconductor_options),
+    ('XVector', '0.10.0', bioconductor_options),
+    ('Biostrings', '2.38.4', bioconductor_options),
+    ('GenomicRanges', '1.22.4', bioconductor_options),
+    ('BiocParallel', '1.4.3', bioconductor_options),
+    ('Rsamtools', '1.22.0', bioconductor_options),
+    ('lambda.r', '1.1.7', ext_options),
+    ('futile.options', '1.0.0', ext_options),
+    ('futile.logger', '1.4.1', ext_options),
+    ('SummarizedExperiment', '1.0.2', bioconductor_options),
+    ('GenomicAlignments', '1.6.3', bioconductor_options),
+    ('ShortRead', '1.28.0', bioconductor_options),
+    ('graph', '1.48.0', bioconductor_options),
+    ('affyio', '1.40.0', bioconductor_options),
+    ('BiocInstaller', '1.20.1', bioconductor_options),
+    ('preprocessCore', '1.32.0', bioconductor_options),
+    ('affy', '1.48.0', bioconductor_options),
+    ('GO.db', '3.2.2', bioconductor_options),
+    ('limma', '3.26.9', bioconductor_options),
+    ('RBGL', '1.46.0', bioconductor_options),
+    ('org.Hs.eg.db', '3.2.3', bioconductor_options),
+    ('AnnotationForge', '1.12.2', bioconductor_options),
+    ('KEGG.db', '3.2.2', bioconductor_options),
+    ('annaffy', '1.42.0', bioconductor_options),
+    ('gcrma', '2.42.0', bioconductor_options),
+    ('oligoClasses', '1.32.0', bioconductor_options),
+    ('edgeR', '3.12.1', bioconductor_options),
+    ('PFAM.db', '3.2.2', bioconductor_options),
+    ('perm', '1.0-0.0', ext_options),
+    ('baySeq', '2.4.1', bioconductor_options),
+    ('qvalue', '2.2.2', bioconductor_options),
+    ('impute', '1.44.0', bioconductor_options),
+    ('samr', '2.0', ext_options),
+    ('DEGseq', '1.24.0', bioconductor_options),
+    ('hgu133plus2.db', '3.2.2', bioconductor_options),
+    ('illuminaio', '0.12.0', bioconductor_options),
+    ('rtracklayer', '1.30.4', bioconductor_options),
+    ('biomaRt', '2.26.1', bioconductor_options),
+    ('GenomicFeatures', '1.22.13', bioconductor_options),
+    ('bumphunter', '1.10.0', bioconductor_options),
+    ('multtest', '2.26.0', bioconductor_options),
+    ('siggenes', '1.44.0', bioconductor_options),
+    ('DynDoc', '1.48.0', bioconductor_options),
+    ('genoset', '1.24.0', bioconductor_options),
+    ('NOISeq', '2.14.1', bioconductor_options),
+    ('Rgraphviz', '2.14.0', bioconductor_options),
+    ('RNASeqPower', '1.10.0', bioconductor_options),
+    ('annotate', '1.48.0', bioconductor_options),
+    ('GSEABase', '1.32.0', bioconductor_options),
+    ('genefilter', '1.52.1', bioconductor_options),
+    ('Category', '2.36.0', bioconductor_options),
+    ('GOstats', '2.36.0', bioconductor_options),
+    ('BSgenome', '1.38.0', bioconductor_options),
+    ('VariantAnnotation', '1.16.4', bioconductor_options),
+    ('biovizBase', '1.18.0', bioconductor_options),
+    ('OrganismDbi', '1.12.1', bioconductor_options),
+    ('ggbio', '1.18.5', bioconductor_options),
+    ('geneplotter', '1.48.0', bioconductor_options),
+    ('DESeq2', '1.10.1', bioconductor_options),
+    ('ReportingTools', '2.10.0', bioconductor_options),
+    ('affycoretools', '1.42.0', bioconductor_options),
+    ('TxDb.Hsapiens.UCSC.hg19.knownGene', '3.2.2', bioconductor_options),
+    ('Homo.sapiens', '1.3.1', bioconductor_options),
+    ('BSgenome.Hsapiens.UCSC.hg19', '1.4.0', bioconductor_options),
+    ('AgiMicroRna', '2.20.0', bioconductor_options),
+    ('GenomeGraphs', '1.30.0', bioconductor_options),
+    ('geneLenDataBase', '1.6.0', bioconductor_options),
+    ('goseq', '1.22.0', bioconductor_options),
+    ('KEGGREST', '1.10.1', bioconductor_options),
+    ('KEGGgraph', '1.28.0', bioconductor_options),
+    ('KEGGprofile', '1.12.0', bioconductor_options),
+    ('GEOquery', '2.36.0', bioconductor_options),
+    ('mixOmics', '5.2.0', ext_options),
+    ('minfi', '1.16.1', bioconductor_options),
+    ('FDb.InfiniumMethylation.hg19', '2.2.0', bioconductor_options),
+    ('methylumi', '2.16.0', bioconductor_options),
+    ('lumi', '2.22.1', bioconductor_options),
+    ('widgetTools', '1.48.0', bioconductor_options),
+    ('tkWidgets', '1.48.0', bioconductor_options),
+    ('Mfuzz', '2.30.0', bioconductor_options),
+    ('maSigPro', '1.42.0', bioconductor_options),
+    ('SPIA', '2.22.0', bioconductor_options),
+    ('Gviz', '1.14.7', bioconductor_options),
+    ('cummeRbund', '2.12.1', bioconductor_options),
+    ('GenomicFiles', '1.6.2', bioconductor_options),
+    ('derfinderHelper', '1.4.1', bioconductor_options),
+    ('derfinder', '1.4.4', bioconductor_options),
+    ('polyester', '1.6.0', bioconductor_options),
+    ('Rsubread', '1.20.5', bioconductor_options),
+    ('pcaMethods', '1.60.0', bioconductor_options),
+    ('marray', '1.48.0', bioconductor_options),
+    ('CGHbase', '1.30.0', bioconductor_options),
+    ('sigaR', '1.14.0', bioconductor_options),
+    ('HCsnip', '1.10.0', bioconductor_options),
+    ('metagenomeSeq', '1.12.0', bioconductor_options),
+    ('gdsfmt', '1.6.2', bioconductor_options),
+    ('SNPRelate', '1.4.2', bioconductor_options),
+]
+
+modextrapaths = {'R_LIBS': ''}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['AnnotationDbi', 'BiocInstaller', 'GenomicFeatures'],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/R/R-3.2.3-foss-2015b.eb b/easybuild/easyconfigs/r/R/R-3.2.3-foss-2015b.eb
index dcabcfedb0580e2d3ab4c3409a1b0f2984590b78..966d48e3c9aa0ed601be64d7d66f34c514cdc19e 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.3-foss-2015b.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.3-foss-2015b.eb
@@ -438,6 +438,7 @@ exts_list = [
     ('qgraph', '1.3.2', ext_options),
     ('diveRsity', '1.9.89', ext_options),
     ('doSNOW', '1.0.14', ext_options),
+    ('phangorn', '2.0.2', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-3.2.3-foss-2016a.eb b/easybuild/easyconfigs/r/R/R-3.2.3-foss-2016a.eb
index bc318c4a600cf06716f8d719d6bddb137077e87e..323a1f250777823cc2eb4c9ea7c1607cd157be60 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.3-foss-2016a.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.3-foss-2016a.eb
@@ -438,6 +438,7 @@ exts_list = [
     ('qgraph', '1.3.2', ext_options),
     ('diveRsity', '1.9.89', ext_options),
     ('doSNOW', '1.0.14', ext_options),
+    ('phangorn', '2.0.2', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
index 49fadf4c1f303808294e0721dda3b0fdcde32837..2fead5c7204c579706565f131e803492e1915bf5 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a-libX11-1.6.3.eb
@@ -450,6 +450,7 @@ exts_list = [
     ('qgraph', '1.3.2', ext_options),
     ('diveRsity', '1.9.89', ext_options),
     ('doSNOW', '1.0.14', ext_options),
+    ('phangorn', '2.0.2', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a.eb b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a.eb
index ddf0479c120e770253f62bf064c775580306f66a..91dc12b96403ac3e8230df209a2d11a6f8552e5d 100644
--- a/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a.eb
+++ b/easybuild/easyconfigs/r/R/R-3.2.3-intel-2016a.eb
@@ -438,6 +438,7 @@ exts_list = [
     ('qgraph', '1.3.2', ext_options),
     ('diveRsity', '1.9.89', ext_options),
     ('doSNOW', '1.0.14', ext_options),
+    ('phangorn', '2.0.2', ext_options),
 ]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.30.06-goolf-1.4.10.eb b/easybuild/easyconfigs/r/ROOT/ROOT-v5.30.06-goolf-1.4.10.eb
new file mode 100755
index 0000000000000000000000000000000000000000..9a78780f34e26d9309cc5305250f7ad203b3eba6
--- /dev/null
+++ b/easybuild/easyconfigs/r/ROOT/ROOT-v5.30.06-goolf-1.4.10.eb
@@ -0,0 +1,35 @@
+name = 'ROOT'
+version = 'v5.30.06'
+
+homepage = 'http://root.cern.ch/drupal/'
+description = """The ROOT system provides a set of OO frameworks with all the functionality
+    needed to handle and analyze large amounts of data in a very efficient way."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+toolchainopts = {'pic': True}
+
+sources = ['%(namelower)s_%(version)s.source.tar.gz']
+source_urls = ['ftp://root.cern.ch/root/']
+
+python = 'Python'
+pyver = '2.7.5'
+
+dependencies = [
+    ('GSL', '1.16'),
+    ('libxml2', '2.9.1', '-%s-%s' % (python, pyver)),
+    (python, pyver),
+]
+
+# architecture
+arch = 'linuxx8664gcc'
+
+# disable features
+configopts = ' --disable-xft --disable-x11 --disable-xrootd --disable-mysql'
+# enable features
+configopts += ' --enable-unuran --enable-table --enable-explicitlink --enable-minuit2 --enable-roofit'
+configopts += ' --with-gsl-incdir=$EBROOTGSL/include/gsl --with-gsl-libdir=$EBROOTGSL/lib'
+configopts += ' --with-fftw3-incdir=$FFTW_INC_DIR --with-fftw3-libdir=$FFTW_LIB_DIR'
+configopts += ' --with-xml-incdir=$EBROOTLIBXML2/include/libxml2/libxml --with-xml-libdir=$EBROOTLIBXML2/lib'
+configopts += ' --with-python-libdir=$EBROOTPYTHON/lib'
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.26-intel-2015a.eb b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.26-intel-2015a.eb
index 4f0b4fda48da4b8fcf859cdf836237c41d6f456c..05baffbd1658d53e4c159d201a0f0bc0d65f70ed 100644
--- a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.26-intel-2015a.eb
+++ b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.26-intel-2015a.eb
@@ -34,7 +34,7 @@ dependencies = [
 ]
 
 # use external ZLIB
-preconfigopts = 'ZLIB=$EBROOTZLIB '
+preconfigopts = 'env ZLIB=$EBROOTZLIB '
 
 # architecture
 arch = 'linuxx8664icc'
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.34-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.34-intel-2016a-Python-2.7.11.eb
index 59556c19fd33f9f8a7840a96f130070731a13984..fc6f18713c5b439b46c0eafb5fd7efeedc035fda 100644
--- a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.34-intel-2016a-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.34-intel-2016a-Python-2.7.11.eb
@@ -32,7 +32,7 @@ dependencies = [
 ]
 
 # use external ZLIB
-preconfigopts = 'ZLIB=$EBROOTZLIB '
+preconfigopts = 'env ZLIB=$EBROOTZLIB '
 
 # architecture
 arch = 'linuxx8664icc'
diff --git a/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.36-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.36-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7d1106317bf4dd1f00f68fe0e33eccc22497579d
--- /dev/null
+++ b/easybuild/easyconfigs/r/ROOT/ROOT-v5.34.36-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,55 @@
+name = 'ROOT'
+version = 'v5.34.36'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://root.cern.ch/drupal/'
+description = """The ROOT system provides a set of OO frameworks with all the functionality
+    needed to handle and analyze large amounts of data in a very efficient way."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = ['%(namelower)s_%(version)s.source.tar.gz']
+source_urls = ['ftp://root.cern.ch/root/']
+patches = [
+    'configure_FftwFromMkl_28.patch',
+    'ROOT-v5_recent-ifort.patch',
+    'ROOT-v5.34.26_libX.patch',
+]
+
+dependencies = [
+    ('GSL', '2.1'),
+    ('Mesa', '11.1.2'),
+    ('libxml2', '2.9.3'),
+    ('PCRE', '8.38'),
+    ('CFITSIO', '3.38'),
+    ('freetype', '2.6.2'),
+    ('Python', '2.7.11'),
+    ('zlib', '1.2.8'),
+    ('libXft', '2.3.2'),
+    ('libXpm', '3.5.11'),
+    ('libXext', '1.3.3'),
+]
+
+# use external ZLIB
+preconfigopts = 'env ZLIB=$EBROOTZLIB '
+
+# architecture
+arch = 'linuxx8664icc'
+
+# disable features
+configopts = ' --disable-xrootd --disable-mysql --disable-krb5 --disable-odbc '
+configopts += ' --disable-oracle --disable-pgsql --disable-qt --disable-sqlite'
+# enable features
+configopts += ' --enable-unuran --enable-table --enable-explicitlink --enable-minuit2 --enable-roofit'
+configopts += ' --with-gsl-incdir=$EBROOTGSL/include/gsl --with-gsl-libdir=$EBROOTGSL/lib'
+configopts += ' --with-fftw3-incdir=$MKLROOT/mkl/include/fftw --with-fftw3-libdir=$MKLROOT/mkl/lib/intel64'
+configopts += ' --with-xml-incdir=$EBROOTLIBXML2/include/libxml2/libxml --with-xml-libdir=$EBROOTLIBXML2/lib'
+configopts += ' --with-python-libdir=$EBROOTPYTHON/lib'
+configopts += ' --with-cfitsio-incdir=$EBROOTCFITSIO/include --with-cfitsio-libdir=$EBROOTCFITSIO/lib'
+configopts += ' --with-opengl-incdir=$EBROOTMESA/include --with-opengl-libdir=$EBROOTMESA/lib'
+configopts += ' --with-x11-libdir=$EBROOTLIBX11/lib --with-xext-libdir=$EBROOTLIBXEXT/lib'
+configopts += ' --with-xft-libdir=$EBROOTLIBXFT/lib'
+configopts += ' --with-xpm-incdir=$EBROOTLIBXPM/include --with-xpm-libdir=$EBROOTLIBXPM/lib'
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/r/RSeQC/RSeQC-2.6.3-foss-2015b-Python-2.7.10-R-3.2.3.eb b/easybuild/easyconfigs/r/RSeQC/RSeQC-2.6.3-foss-2015b-Python-2.7.10-R-3.2.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d3a31d723c1a6e81544ad1fe513ea86143d5baf4
--- /dev/null
+++ b/easybuild/easyconfigs/r/RSeQC/RSeQC-2.6.3-foss-2015b-Python-2.7.10-R-3.2.3.eb
@@ -0,0 +1,38 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Adam Huffman
+# The Francis Crick Institute
+
+easyblock = 'PythonPackage'
+
+name = 'RSeQC'
+version = '2.6.3'
+versionsuffix = '-Python-%(pyver)s-R-%(rver)s'
+
+homepage = 'http://rseqc.sourceforge.net/'
+description = """RSeQC provides a number of useful modules that can 
+ comprehensively evaluate high throughput sequence data especially RNA-seq 
+ data. Some basic modules quickly inspect sequence quality, nucleotide 
+ composition bias, PCR bias and GC bias, while RNA-seq specific modules 
+ evaluate sequencing saturation, mapped reads distribution, coverage 
+ uniformity, strand specificity, transcript level RNA integrity etc."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [SOURCEFORGE_SOURCE]
+
+dependencies = [
+    ('R', '3.2.3'),
+    ('Python', '2.7.10'),
+]
+
+runtest = "python setup.py test"
+
+sanity_check_paths = {
+    'files': ['bin/bam_stat.py', 'bin/overlay_bigwig.py', 'bin/split_paired_bam.py'],
+    'dirs': ['lib']
+}
+
+options = {'modulename': 'qcmodule'}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/Rosetta/Rosetta-2016.13.58602-foss-2016a.eb b/easybuild/easyconfigs/r/Rosetta/Rosetta-2016.13.58602-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..86250d9275bb021104f14638157113a877ea0ca7
--- /dev/null
+++ b/easybuild/easyconfigs/r/Rosetta/Rosetta-2016.13.58602-foss-2016a.eb
@@ -0,0 +1,20 @@
+name = 'Rosetta'
+version = '2016.13.58602'
+
+homepage = 'https://www.rosettacommons.org'
+description = """Rosetta is the premier software suite for modeling macromolecular structures. As a flexible,
+multi-purpose application, it includes tools for structure prediction, design, and remodeling of proteins and
+nucleic acids."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'usempi': True}
+
+sources = ['%(namelower)s_src_%(version)s_bundle.tgz']
+
+builddependencies = [('SCons', '2.4.1', '-Python-2.7.11')]
+
+modextravars = {
+    'ROSETTA3_DB': '$root/database',
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/Ruby/Ruby-2.3.1.eb b/easybuild/easyconfigs/r/Ruby/Ruby-2.3.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..873541fd4215c66c9d5d70d1d72f9006eb4773f4
--- /dev/null
+++ b/easybuild/easyconfigs/r/Ruby/Ruby-2.3.1.eb
@@ -0,0 +1,63 @@
+#    With <3 for EasyBuild
+#
+#    EasyConfig for Ruby 2.1:
+#    ----------------------------------------------------------------------------
+#    Copyright: 2014 - Gregor Mendel Institute of Molecular Plant Biology GmBH
+#    License: MIT
+#    Authors: Aaron <aaron.zauner@gmi.oeaw.ac.at> Zauner
+#    ----------------------------------------------------------------------------
+
+name = 'Ruby'
+version = '2.3.1'
+
+homepage = 'https://www.ruby-lang.org'
+description = """Ruby is a dynamic, open source programming language with 
+ a focus on simplicity and productivity. It has an elegant syntax that is 
+ natural to read and easy to write."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://cache.ruby-lang.org/pub/ruby/']
+
+ext_options = {
+    'source_urls': ['http://rubygems.org/downloads/'],
+    'source_tmpl': '%(name)s-%(version)s.gem',
+}
+
+exts_list = [
+    ('ffi', '1.9.10', ext_options),
+    ('childprocess', '0.5.9', ext_options),
+    ('json', '1.8.3', ext_options),
+    ('cabin', '0.8.1', ext_options),
+    ('backports', '3.6.8', ext_options),
+    ('arr-pm', '0.0.10', ext_options),
+    ('clamp', '1.0.0', ext_options),
+    ('multipart-post', '2.0.0', ext_options),
+    ('faraday', '0.9.2', ext_options),
+    ('faraday_middleware', '0.10.0', ext_options),
+    ('highline', '1.7.8', ext_options),
+    ('net-http-pipeline', '1.0.1', ext_options),
+    ('net-http-persistent', '2.9.4', ext_options),
+    ('multi_json', '1.11.3', ext_options),
+    ('addressable', '2.4.0', ext_options),
+    ('gh', '0.14.0', ext_options),
+    ('launchy', '2.4.3', ext_options),
+    ('ethon', '0.8.1', ext_options),
+    ('typhoeus', '0.8.0', ext_options),
+    ('websocket', '1.2.3', ext_options),
+    ('pusher-client', '0.6.2', ext_options),
+    ('diff-lcs', '1.2.5', ext_options),
+    ('rspec-support', '3.4.1', ext_options),
+    ('rspec-mocks', '3.4.1', ext_options),
+    ('rspec-expectations', '3.4.0', ext_options),
+    ('rspec-core', '3.4.4', ext_options),
+    ('rspec', '3.4.0', ext_options),
+    ('rack', '1.6.4', ext_options),
+    ('rack-protection', '1.5.3', ext_options),
+    ('tilt', '2.0.2', ext_options),
+    ('sinatra', '1.4.7', ext_options),
+    ('rack-test', '0.6.3', ext_options),
+]
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.8.0-foss-2016a.eb b/easybuild/easyconfigs/r/Rust/Rust-1.8.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2254e51fbf4d62bf0b1c008096b87be65f6f639c
--- /dev/null
+++ b/easybuild/easyconfigs/r/Rust/Rust-1.8.0-foss-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'Rust'
+version = '1.8.0'
+
+homepage = 'https://www.rust-lang.org'
+description = """Rust is a systems programming language that runs blazingly fast, prevents segfaults,
+ and guarantees thread safety."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://static.rust-lang.org/dist/']
+sources = ['rustc-%(version)s-src.tar.gz']
+
+builddependencies = [('Python', '2.7.11')]
+
+sanity_check_paths = {
+    'files': ['bin/rustc', 'bin/rustdoc'],
+    'dirs': ['share/doc', 'share/man', 'lib/rustlib'],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/rainbow/rainbow-2.0.4-goolf-1.4.10.eb b/easybuild/easyconfigs/r/rainbow/rainbow-2.0.4-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c431cc2a4f1f63a6eb90a4db86b69cb47260f1d3
--- /dev/null
+++ b/easybuild/easyconfigs/r/rainbow/rainbow-2.0.4-goolf-1.4.10.eb
@@ -0,0 +1,31 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+
+easyblock = 'MakeCp'
+
+name = 'rainbow'
+version = '2.0.4'
+
+homepage = 'https://sourceforge.net/projects/bio-rainbow/'
+description = """Efficient tool for clustering and assembling short reads, especially for RAD."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://downloads.sourceforge.net/project/bio-rainbow/']
+sources = ['%(name)s_%(version)s.tar.gz']
+
+buildopts = ' CC=$CC'
+
+files_to_copy = [(['rainbow', 'ezmsim', 'rbasm', 'select_sec_rbcontig.pl', 
+		   'select_best_rbcontig_plus_read1.pl', 'select_sec_rbcontig.pl', 'select_all_rbcontig.pl'], 'bin')]
+
+parallel = 1
+                
+sanity_check_paths = {
+    'files': ['bin/rainbow', 'bin/ezmsim', 'bin/rbasm'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-foss-2016a.eb b/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d480848616fe72d362a6cf60f364809735fbf69f
--- /dev/null
+++ b/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-foss-2016a.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'randrproto'
+version = '1.5.0'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = "Xrandr protocol and ancillary headers"
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_PROTO_SOURCE]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/%s' % x for x in ['randr.h', 'randrproto.h']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-intel-2015b.eb b/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-intel-2015b.eb
index cb2cc76a3b8e79dcc4f91cee0e9f2f684b141640..87f1456d12d58e843c0d35800279b750d6719c12 100644
--- a/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-intel-2015b.eb
@@ -9,7 +9,7 @@ description = "Xrandr protocol and ancillary headers"
 toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['randr.h', 'randrproto.h']],
diff --git a/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-intel-2016a.eb b/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-intel-2016a.eb
index 278cc7bbbf7aa54167749740705e27543f7ec4c4..563fbfcbf25b676ddf3cb8ee1287f7f415d87d4e 100644
--- a/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-intel-2016a.eb
+++ b/easybuild/easyconfigs/r/randrproto/randrproto-1.5.0-intel-2016a.eb
@@ -9,7 +9,7 @@ description = "Xrandr protocol and ancillary headers"
 toolchain = {'name': 'intel', 'version': '2016a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['randr.h', 'randrproto.h']],
diff --git a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-foss-2014b.eb b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-foss-2014b.eb
index 3119cd29b721b57ae53f946768735dedd3331478..a354245bf676604bf7aa570ef845b1d5a342f678 100644
--- a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-foss-2014b.eb
+++ b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-foss-2014b.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'foss', 'version': '2014b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
diff --git a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-foss-2016a.eb b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9f19fc4dfc381775433af5eea118394612287d81
--- /dev/null
+++ b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-foss-2016a.eb
@@ -0,0 +1,20 @@
+easyblock = 'ConfigureMake'
+
+name = 'renderproto'
+version = '0.11'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = "Xrender protocol and ancillary headers"
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_PROTO_SOURCE]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-gimkl-2.11.5.eb b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-gimkl-2.11.5.eb
index c363620cb60d32b98eb1f1dd3e93a922a669e82a..c2eb005cc676296141c5f7f164ea4a33c9d5f09e 100644
--- a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-gimkl-2.11.5.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
diff --git a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2014b.eb b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2014b.eb
index 9d7f0c2a916d893acf619aebfdf89b6d32ca8ac5..c0cb8f56f1269a1becca66d52fa9e27802ad41ff 100644
--- a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2014b.eb
+++ b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2014b.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2014b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
diff --git a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015a.eb b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015a.eb
index 87042e0e65a33495253997ade34dbd8fe1e928e5..59a429868799ef40ce82a0c36eb6323e04d42eb7 100644
--- a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015a.eb
+++ b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015a.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
diff --git a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015b.eb b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015b.eb
index b16c201ac171d94b2b57a1b4f50ff493b9835986..20a477feb642ff6c71364c04b87d522c127a15e6 100644
--- a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015b.eb
+++ b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2015b.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
diff --git a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2016a.eb b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2016a.eb
index 37b516e535b512543e6bc7ad3d0a50aaa1bd118f..c3ac221b114445cabfaadc034a6080383e195def 100644
--- a/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2016a.eb
+++ b/easybuild/easyconfigs/r/renderproto/renderproto-0.11-intel-2016a.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2016a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in ['render.h', 'renderproto.h']],
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3-foss-2016a.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..96d3b95f0f589aff38d705a2139fa9632ce9afb8
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3-foss-2016a.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Robert Schmidt <roschmidt@ohri.ca>, Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+##
+name = 'SAMtools'
+version = '1.3'
+
+homepage = 'http://www.htslib.org/'
+description = """SAM Tools provide various utilities for manipulating alignments in the SAM format, 
+ including sorting, merging, indexing and generating alignments in a per-position format."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['https://github.com/samtools/%(namelower)s/releases/download/%(version)s']
+sources = [SOURCELOWER_TAR_BZ2]
+
+# Patch Makefile to link against zlib provided by EB
+patches = ['SAMtools-1.3_Makefile.patch']
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3-intel-2016a.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d869d21007896411d990c56c08f20a99c0b6d3c6
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3-intel-2016a.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Robert Schmidt <roschmidt@ohri.ca>, Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+##
+name = 'SAMtools'
+version = '1.3'
+
+homepage = 'http://www.htslib.org/'
+description = """SAM Tools provide various utilities for manipulating alignments in the SAM format, 
+ including sorting, merging, indexing and generating alignments in a per-position format."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['https://github.com/samtools/%(namelower)s/releases/download/%(version)s']
+sources = [SOURCELOWER_TAR_BZ2]
+
+# Patch Makefile to link against zlib provided by EB
+patches = ['SAMtools-1.3_Makefile.patch']
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1-foss-2015b.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a7026c36d0ea34c5ca96e7cf06b3861a2b2b5e04
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1-foss-2015b.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Robert Schmidt <roschmidt@ohri.ca>, Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# Modified by: Adam Huffman
+# The Francis Crick Institute
+##
+name = 'SAMtools'
+version = '1.3.1'
+
+homepage = 'http://www.htslib.org/'
+description = """SAM Tools provide various utilities for manipulating alignments in the SAM format, 
+ including sorting, merging, indexing and generating alignments in a per-position format."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['https://github.com/samtools/%(namelower)s/releases/download/%(version)s']
+sources = [SOURCELOWER_TAR_BZ2]
+
+# Patch Makefile to link against zlib provided by EB
+patches = ['SAMtools-%(version)s_Makefile.patch']
+
+dependencies = [
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1-foss-2016a.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7fa65122da6adf2cade52e15cb64bf0a93dc0977
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1-foss-2016a.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Robert Schmidt <roschmidt@ohri.ca>, Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# Modified by: Adam Huffman
+# The Francis Crick Institute
+##
+name = 'SAMtools'
+version = '1.3.1'
+
+homepage = 'http://www.htslib.org/'
+description = """SAM Tools provide various utilities for manipulating alignments in the SAM format, 
+ including sorting, merging, indexing and generating alignments in a per-position format."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['https://github.com/samtools/%(namelower)s/releases/download/%(version)s']
+sources = [SOURCELOWER_TAR_BZ2]
+
+# Patch Makefile to link against zlib provided by EB
+patches = ['SAMtools-%(version)s_Makefile.patch']
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1-intel-2016a.eb b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..91ca187c34fd6563aafe6d71bdd9d9fdb090844c
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1-intel-2016a.eb
@@ -0,0 +1,33 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Robert Schmidt <roschmidt@ohri.ca>, Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# Modified by: Adam Huffman
+# The Francis Crick Institute
+##
+name = 'SAMtools'
+version = '1.3.1'
+
+homepage = 'http://www.htslib.org/'
+description = """SAM Tools provide various utilities for manipulating alignments in the SAM format, 
+ including sorting, merging, indexing and generating alignments in a per-position format."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['https://github.com/samtools/%(namelower)s/releases/download/%(version)s']
+sources = [SOURCELOWER_TAR_BZ2]
+
+# Patch Makefile to link against zlib provided by EB
+patches = ['SAMtools-%(version)s_Makefile.patch']
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('zlib', '1.2.8'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1_Makefile.patch b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1_Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4d74b2e9b1504e8ac548efa9bfe85ad41a2a798a
--- /dev/null
+++ b/easybuild/easyconfigs/s/SAMtools/SAMtools-1.3.1_Makefile.patch
@@ -0,0 +1,22 @@
+# Use EB modules for zlib and ncurses
+# Author: Adam Huffman
+# The Francis Crick Institute
+diff -u samtools-1.3.1/Makefile samtools-1.3.1.new/Makefile
+--- samtools-1.3.1/Makefile	2016-04-22 10:51:16.000000000 +0100
++++ samtools-1.3.1.new/Makefile	2016-04-23 23:53:26.266962157 +0100
+@@ -82,13 +82,13 @@
+ # TODO Use configure or htslib.pc to add -rdynamic/-ldl conditionally
+ ALL_CPPFLAGS = -I. $(HTSLIB_CPPFLAGS) $(CPPFLAGS)
+ ALL_LDFLAGS  = -rdynamic $(HTSLIB_LDFLAGS) $(LDFLAGS)
+-ALL_LIBS     = -lz -ldl $(LIBS)
++ALL_LIBS     = -L$(EBROOTZLIB)/lib -lz -ldl $(LIBS)
+ 
+ # Usually config.mk and config.h are generated by running configure
+ # or config.status, but if those aren't used create defaults here.
+ 
+ config.mk:
+-	@sed -e '/^prefix/,/^LIBS/d;s/@Hsource@//;s/@Hinstall@/#/;s#@HTSDIR@#htslib-1.3.1#g;s/@HTSLIB_CPPFLAGS@/-I$$(HTSDIR)/g;s/@CURSES_LIB@/-lcurses/g' config.mk.in > $@
++	@sed -e '/^prefix/,/^LIBS/d;s/@Hsource@//;s/@Hinstall@/#/;s#@HTSDIR@#htslib-1.3.1#g;s/@HTSLIB_CPPFLAGS@/-I$$(HTSDIR)/g;s/@CURSES_LIB@/-L$$(EBROOTNCURSES)\/lib -lcurses/g' config.mk.in > $@
+ 
+ config.h:
+ 	echo '/* Basic config.h generated by Makefile */' > $@
diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.7.1.1-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.7.1.1-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..eb5338d3762f2749bffa8f3b90083133d9ca2977
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.7.1.1-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,27 @@
+easyblock = 'PythonPackage'
+
+name = 'SCOOP'
+version = '0.7.1.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://code.google.com/p/scoop/'
+description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module
+ allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('Greenlet', '0.4.9', versionsuffix),
+    ('PyZMQ', '15.2.0', versionsuffix + '-zmq4'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/python%(pyshortver)s/site-packages/scoop-%(version)s-py%(pyshortver)s.egg'],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SCOOP/SCOOP-0.7.1.1-intel-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.7.1.1-intel-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..21ced6bf4782334d54c3009c7ddb3bf8e96a1787
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCOOP/SCOOP-0.7.1.1-intel-2016a-Python-3.5.1.eb
@@ -0,0 +1,27 @@
+easyblock = 'PythonPackage'
+
+name = 'SCOOP'
+version = '0.7.1.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://code.google.com/p/scoop/'
+description = """SCOOP (Scalable COncurrent Operations in Python) is a distributed task module
+ allowing concurrent parallel programming on various environments, from heterogeneous grids to supercomputers."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_LOWER_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.1'),
+    ('Greenlet', '0.4.9', versionsuffix),
+    ('PyZMQ', '15.2.0', versionsuffix + '-zmq4'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/python%(pyshortver)s/site-packages/scoop-%(version)s-py%(pyshortver)s.egg'],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2016a.eb b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a90bb75fa5ab8b3ced38be0d8b099fb943f09f3b
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCOTCH/SCOTCH-6.0.4-intel-2016a.eb
@@ -0,0 +1,14 @@
+name = 'SCOTCH'
+version = '6.0.4'
+
+homepage = 'http://gforge.inria.fr/projects/scotch/'
+description = """Software package and libraries for sequential and parallel graph partitioning,
+static mapping, and sparse matrix block ordering, and sequential mesh and hypergraph partitioning."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = ['http://gforge.inria.fr/frs/download.php/file/34618/']
+sources = ['%(namelower)s_%(version)s.tar.gz']
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/SCons/SCons-2.4.1-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/s/SCons/SCons-2.4.1-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..35083b9098da1b895fabf52646774e4641202f33
--- /dev/null
+++ b/easybuild/easyconfigs/s/SCons/SCons-2.4.1-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,24 @@
+easyblock = 'PythonPackage'
+
+name = 'SCons'
+version = '2.4.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.scons.org/'
+description = "SCons is a software construction tool."
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://prdownloads.sourceforge.net/%(namelower)s']
+
+dependencies = [('Python', '2.7.11')]
+
+sanity_check_paths = {
+    'files': ['bin/scons', 'bin/scons-time', 'bin/sconsign'],
+    'dirs': ['lib/%(namelower)s-%(version)s/%(name)s'],
+}
+
+options = {'modulename': False}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/SHAPEIT/SHAPEIT-2.r837.GLIBCv2.12.eb b/easybuild/easyconfigs/s/SHAPEIT/SHAPEIT-2.r837.GLIBCv2.12.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f2424bbea4413d3d1572131a13c8a3739e01a1ea
--- /dev/null
+++ b/easybuild/easyconfigs/s/SHAPEIT/SHAPEIT-2.r837.GLIBCv2.12.eb
@@ -0,0 +1,25 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Ravi Tripathi
+# Email: ravi89@uab.edu
+
+easyblock = "Tarball"
+
+name = 'SHAPEIT'
+version = '2.r837'
+versionsuffix = '.GLIBCv2.12'
+
+homepage = 'https://mathgen.stats.ox.ac.uk/genetics_software/shapeit/shapeit.html'
+description = """SHAPEIT is a fast and accurate method for estimation of 
+haplotypes (aka phasing) from genotype or sequencing data."""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['https://mathgen.stats.ox.ac.uk/genetics_software/shapeit/']
+sources = ['shapeit.v%(version)s%(versionsuffix)s.Linux.static.tgz']
+
+sanity_check_paths = {
+    'files': ["bin/shapeit", "LICENCE"],
+    'dirs': ["example"]
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SIONlib/SIONlib-1.6.1-foss-2016a-tools.eb b/easybuild/easyconfigs/s/SIONlib/SIONlib-1.6.1-foss-2016a-tools.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e7737796170140164d3121fac915aa6df14c4aeb
--- /dev/null
+++ b/easybuild/easyconfigs/s/SIONlib/SIONlib-1.6.1-foss-2016a-tools.eb
@@ -0,0 +1,43 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2016 Juelich Supercomputing Centre, Germany
+# Authors::   Markus Geimer <m.geimer@fz-juelich.de>
+# License::   3-clause BSD
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'SIONlib'
+version = '1.6.1'
+# Provide a stripped-down version with renamed symbols for tools,
+# see description for further details
+versionsuffix = '-tools'
+
+homepage = 'http://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html'
+description = """SIONlib is a scalable I/O library for parallel access to task-local files.
+ The library not only supports writing and reading binary data to or from several thousands of
+ processors into a single or a small number of physical files, but also provides global open
+ and close functions to access SIONlib files in parallel. This package provides a stripped-down
+ installation of SIONlib for use with performance tools (e.g., Score-P), with renamed symbols
+ to avoid conflicts when an application using SIONlib itself is linked against a tool requiring
+ a different SIONlib version."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = ['sionlib-%(version)sl.tar.gz']
+source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)sl']
+
+checksums = [
+    '57208e08309cf8892fe3daee90567d21',     # sionlib-1.6.1l.tar.gz
+]
+
+configopts = '--disable-cxx --disable-fortran --disable-ompi'
+
+sanity_check_paths = {
+    'files': ['bin/sionconfig'] +
+             ['lib/lib%s_64.a' % x for x in ['lsioncom', 'lsiongen', 'lsionser']],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/s/SIONlib/SIONlib-1.6.1-foss-2016a.eb b/easybuild/easyconfigs/s/SIONlib/SIONlib-1.6.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a093e042cbd71ccbe35f739b1e144d6ebe562fdb
--- /dev/null
+++ b/easybuild/easyconfigs/s/SIONlib/SIONlib-1.6.1-foss-2016a.eb
@@ -0,0 +1,37 @@
+##
+# This is an easyconfig file for EasyBuild, see https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2016 Juelich Supercomputing Centre, Germany
+# Authors::   Markus Geimer <m.geimer@fz-juelich.de>
+# License::   3-clause BSD
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'SIONlib'
+version = '1.6.1'
+
+homepage = 'http://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html'
+description = """SIONlib is a scalable I/O library for parallel access to task-local files.
+ The library not only supports writing and reading binary data to or from several thousands of
+ processors into a single or a small number of physical files, but also provides global open
+ and close functions to access SIONlib files in parallel. SIONlib provides different interfaces:
+ parallel access using MPI, OpenMP, or their combination, and sequential access for post-processing
+ utilities."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://apps.fz-juelich.de/jsc/sionlib/download.php?version=%(version)s']
+
+checksums = [
+    '47113ebc00ae38c4f0965659427a0242',     # sionlib-1.6.1.tar.gz
+]
+
+sanity_check_paths = {
+    'files': ['bin/sionconfig'] +
+             ['lib/lib%s_64.a' % x for x in ['sioncom', 'siongen', 'sionser']],
+    'dirs': []
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/s/SNAPE-pooled/SNAPE-pooled-r32-foss-2016a.eb b/easybuild/easyconfigs/s/SNAPE-pooled/SNAPE-pooled-r32-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ee4b4bad14b688a0ebdadd273ae6fb16361211c2
--- /dev/null
+++ b/easybuild/easyconfigs/s/SNAPE-pooled/SNAPE-pooled-r32-foss-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'MakeCp'
+
+name = 'SNAPE-pooled'
+version = 'r32'
+
+homepage = 'https://code.google.com/archive/p/snape-pooled/'
+description = """SNAPE-pooled computes the probability distribution for the frequency of the minor allele
+ in a certain population, at a certain position in the genome."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/snape-pooled/']
+sources = ['source-archive.zip']
+
+patches = ['SNAPE-pooled-%(version)s_fix-hardcoding-Makefile.patch']
+
+# commit 32, Aug 12th 2013
+checksums = ['0e9741a45731a2e92d84c129125db3f1']
+
+dependencies = [
+    ('OCaml', '4.02.3'),
+]
+
+start_dir = 'trunk'
+
+buildopts = "snape-pooled snape-pooled-fast"
+
+files_to_copy = [(['snape-pooled', 'snape-pooled-fast'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/snape-pooled', 'bin/snape-pooled-fast'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SNAPE-pooled/SNAPE-pooled-r32_fix-hardcoding-Makefile.patch b/easybuild/easyconfigs/s/SNAPE-pooled/SNAPE-pooled-r32_fix-hardcoding-Makefile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..85d8d5a910d7a649be70c94f4979c104ee23736a
--- /dev/null
+++ b/easybuild/easyconfigs/s/SNAPE-pooled/SNAPE-pooled-r32_fix-hardcoding-Makefile.patch
@@ -0,0 +1,12 @@
+fix hardcoded 'gcc' + add optimization flags through $CFLAGS
+author: Kenneth Hoste (HPC-UGent)
+--- snape-pooled/trunk/Makefile.orig	2016-03-10 10:23:16.000000000 +0100
++++ snape-pooled/trunk/Makefile	2016-03-10 10:23:32.000000000 +0100
+@@ -8,6 +8,6 @@
+ 	latex $<
+ 	dvips -o snape-pooled-manual.ps snape-pooled-manual.dvi
+ snape-pooled-fast: snape-pooled.c
+-	gcc -g -o $@ $< -lm
++	${CC} ${CFLAGS} -g -o $@ $< -lm
+ clean:
+ 	rm *.cmx *.cmi *.cmo pooled.o snape-pooled *.log *.ps *.dvi *.aux
diff --git a/easybuild/easyconfigs/s/SNPhylo/SNPhylo-20140701-foss-2016a.eb b/easybuild/easyconfigs/s/SNPhylo/SNPhylo-20140701-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f27160e9e4592c498128e0c047227ae174fe6f55
--- /dev/null
+++ b/easybuild/easyconfigs/s/SNPhylo/SNPhylo-20140701-foss-2016a.eb
@@ -0,0 +1,23 @@
+name = 'SNPhylo'
+version = '20140701'
+
+homepage = 'http://chibba.pgml.uga.edu/snphylo/'
+description = """SNPhylo: a pipeline to generate a phylogenetic tree from huge SNP data"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+# download from http://chibba.pgml.uga.edu/snphylo/snphylo.tar.gz and rename
+# see http://chibba.pgml.uga.edu/snphylo/ for version
+sources = [SOURCELOWER_TAR_GZ]
+
+checksums = ['80f31c46f1fa9c0c459f18d3acf9fa25']
+
+dependencies = [
+    ('R', '3.2.3'),
+    ('R-bundle-Bioconductor', '3.2', '-R-%(rver)s'),
+    ('Python', '2.7.11'),
+    ('MUSCLE', '3.8.31'),
+    ('PHYLIP', '3.696'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SNPhylo/SNPhylo-20140701-intel-2016a.eb b/easybuild/easyconfigs/s/SNPhylo/SNPhylo-20140701-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d54fcc2b47d0a4260f0acc70f07af470d41551e9
--- /dev/null
+++ b/easybuild/easyconfigs/s/SNPhylo/SNPhylo-20140701-intel-2016a.eb
@@ -0,0 +1,23 @@
+name = 'SNPhylo'
+version = '20140701'
+
+homepage = 'http://chibba.pgml.uga.edu/snphylo/'
+description = """SNPhylo: a pipeline to generate a phylogenetic tree from huge SNP data"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+# download from http://chibba.pgml.uga.edu/snphylo/snphylo.tar.gz and rename
+# see http://chibba.pgml.uga.edu/snphylo/ for version
+sources = [SOURCELOWER_TAR_GZ]
+
+checksums = ['80f31c46f1fa9c0c459f18d3acf9fa25']
+
+dependencies = [
+    ('R', '3.2.3'),
+    ('R-bundle-Bioconductor', '3.2', '-R-%(rver)s'),
+    ('Python', '2.7.11'),
+    ('MUSCLE', '3.8.31'),
+    ('PHYLIP', '3.696'),
+]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/SPRNG/SPRNG-2.0b-foss-2016a.eb b/easybuild/easyconfigs/s/SPRNG/SPRNG-2.0b-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..59be5269fa9a9619efc6548bf2a963fbc932f25b
--- /dev/null
+++ b/easybuild/easyconfigs/s/SPRNG/SPRNG-2.0b-foss-2016a.eb
@@ -0,0 +1,34 @@
+easyblock = 'MakeCp'
+
+name = 'SPRNG'
+version = '2.0b'
+
+homepage = 'http://www.sprng.org/'
+description = "Scalable Parallel Pseudo Random Number Generators Library"
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['http://www.sprng.org/Version2.0/']
+sources = ['%(namelower)s%(version)s.tar.gz']
+
+patches = ['SPRNG-2.0_fix-metropolis-test.patch']
+
+dependencies = [('GMP', '6.1.0')]
+
+buildopts = 'PLAT=INTEL MPIDEF="-DSPRNG_MPI" CC="$CC" F77="$F77" PMLCGDEF="-DUSE_PMLCG" GMPLIB="-L$EBROOTGMP/lib -lgmp" FFXN="-DAdd_"'
+
+# does not support parallel build
+parallel = 1
+
+files_to_copy = [
+    (['lib/libsprng.a'], 'lib'),
+    (['include/interface.h', 'include/sprng.h', 'include/sprng_f.h'], 'include'),
+]
+
+sanity_check_paths = {
+    'files': ["lib/libsprng.a"],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.4.1-goolf-1.4.10.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.4.1-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5d1c89464a85b0bc991c5951a630715a26d2c566
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.4.1-goolf-1.4.10.eb
@@ -0,0 +1,36 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Luxembourg Centre for Systems Biomedicine
+# Authors::   Fotis Georgatos <fotis.georgatos@uni.lu>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+easyblock = 'ConfigureMake'
+
+name = 'SQLite'
+version = '3.8.4.1'
+
+homepage = 'http://www.hwaci.com/sw/sqlite/'
+description = "SQLite: SQL Database Engine in a C Library"
+
+# eg. http://www.hwaci.com/sw/sqlite/2013/sqlite-autoconf-3080100.tar.gz
+source_urls = ['http://www.hwaci.com/sw/sqlite/2014']
+sources = ['sqlite-autoconf-%s0%s0%s0%s.tar.gz' % tuple(version.split('.'))]  # very weird way to calculate your filename
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+dependencies = [
+    ('libreadline', '6.2'),
+    ('Tcl', '8.6.1'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/sqlite3'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.8.8.1-goolf-1.5.16.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.8.1-goolf-1.5.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6946daaee7f143abbc3a051e200b92ec5a0a968e
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.8.8.1-goolf-1.5.16.eb
@@ -0,0 +1,38 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'SQLite'
+version = '3.8.8.1'
+
+homepage = 'http://www.sqlite.org/'
+description = 'SQLite: SQL Database Engine in a C Library'
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+
+# eg. http://www.sqlite.org/2014/sqlite-autoconf-3080600.tar.gz
+source_urls = ['http://www.sqlite.org/2015/']
+version_str = '%(version_major)s' + ''.join('%02d' % int(x) for x in version.split('.')[1:])
+sources = ['sqlite-autoconf-%s.tar.gz' % version_str]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('Tcl', '8.6.3'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/sqlite3'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5c86155323d7709e14db16f8a7c3c658989eaa9d
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-GCC-4.9.3-2.25.eb
@@ -0,0 +1,41 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'SQLite'
+version = '3.9.2'
+
+homepage = 'http://www.sqlite.org/'
+description = 'SQLite: SQL Database Engine in a C Library'
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+# eg. http://www.sqlite.org/2014/sqlite-autoconf-3080600.tar.gz
+source_urls = ['http://www.sqlite.org/2015/']
+version_str = '%%(version_major)s%s00' % ''.join('%02d' % int(x) for x in version.split('.')[1:])
+sources = ['sqlite-autoconf-%s.tar.gz' % version_str]
+
+dependencies = [
+    ('libreadline', '6.3', '', ('GCCcore', '4.9.3')),
+    ('Tcl', '8.6.4'),
+]
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a',
+              'lib/libsqlite3.%s' % SHLIB_EXT],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3555a7ac4c102670c5f006fe4693418ae1790fbc
--- /dev/null
+++ b/easybuild/easyconfigs/s/SQLite/SQLite-3.9.2-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,40 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'SQLite'
+version = '3.9.2'
+
+homepage = 'http://www.sqlite.org/'
+description = 'SQLite: SQL Database Engine in a C Library'
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+# eg. http://www.sqlite.org/2014/sqlite-autoconf-3080600.tar.gz
+source_urls = ['http://www.sqlite.org/2015/']
+version_str = '%%(version_major)s%s00' % ''.join('%02d' % int(x) for x in version.split('.')[1:])
+sources = ['sqlite-autoconf-%s.tar.gz' % version_str]
+
+dependencies = [
+    ('libreadline', '6.3'),
+    ('Tcl', '8.6.4'),
+]
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
+    'dirs': ['lib/pkgconfig'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/SWIG/SWIG-3.0.8-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/s/SWIG/SWIG-3.0.8-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2ffde034da80de1fad049bc171c5a88a81f7bc5c
--- /dev/null
+++ b/easybuild/easyconfigs/s/SWIG/SWIG-3.0.8-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,23 @@
+name = 'SWIG'
+version = '3.0.8'
+
+homepage = 'http://www.swig.org/'
+description = """SWIG is a software development tool that connects programs written in C and C++ with
+ a variety of high-level programming languages."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+python = 'Python'
+pythonversion = '2.7.11'
+versionsuffix = '-%s-%s' % (python, pythonversion)
+
+dependencies = [
+    (python, pythonversion),
+    ('PCRE', '8.38'),
+]
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/Saxon-HE/Saxon-HE-9.7.0.4-Java-1.7.0_79.eb b/easybuild/easyconfigs/s/Saxon-HE/Saxon-HE-9.7.0.4-Java-1.7.0_79.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d38576ab53b5e95fe1675fd7a8041ea68a4b2e2f
--- /dev/null
+++ b/easybuild/easyconfigs/s/Saxon-HE/Saxon-HE-9.7.0.4-Java-1.7.0_79.eb
@@ -0,0 +1,26 @@
+easyblock = 'Tarball'
+
+name = 'Saxon-HE'
+version = '9.7.0.4'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'http://saxon.sourceforge.net'
+description = """Open Source SAXON XSLT processor developed by Saxonica Limited."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['SaxonHE%sJ.zip' % version.replace(".","-")]
+source_urls = ['https://sourceforge.net/projects/saxon/files/Saxon-HE/%(version_major_minor)s' , 'download']
+
+dependencies = [('Java', '1.7.0_79')]
+
+jarfiles = ['saxon%(version_major)she.jar', 'saxon%(version_major)s-test.jar', 'saxon%(version_major)s-xqj.jar']
+
+sanity_check_paths = {
+    'files': jarfiles,
+    'dirs': [],
+}
+
+modextrapaths = {'CLASSPATH': jarfiles}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9cf751a2adbde42aed0c560253cdb088c0303c2a
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmpich-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0.eb
@@ -0,0 +1,25 @@
+name = 'ScaLAPACK'
+version = '2.0.2'
+
+homepage = 'http://www.netlib.org/scalapack/'
+description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines
+ redesigned for distributed memory MIMD parallel computers."""
+
+toolchain = {'name': 'gmpich', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TGZ]
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.15'
+blassuff = '-LAPACK-3.6.0'
+
+versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
+
+dependencies = [(blaslib, blasver, blassuff, ('GCC', '4.9.3-2.25'))]
+
+# parallel build tends to fail, so disabling it
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ea5206c7ec5f11e9d788f9b1114fabfd194ab775
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gmvapich2-2016a-OpenBLAS-0.2.15-LAPACK-3.6.0.eb
@@ -0,0 +1,25 @@
+name = 'ScaLAPACK'
+version = '2.0.2'
+
+homepage = 'http://www.netlib.org/scalapack/'
+description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines
+ redesigned for distributed memory MIMD parallel computers."""
+
+toolchain = {'name': 'gmvapich2', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TGZ]
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.15'
+blassuff = '-LAPACK-3.6.0'
+
+versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
+
+dependencies = [(blaslib, blasver, blassuff, ('GCC', '4.9.3-2.25'))]
+
+# parallel build tends to fail, so disabling it
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016.04-OpenBLAS-0.2.18-LAPACK-3.6.0.eb b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016.04-OpenBLAS-0.2.18-LAPACK-3.6.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..326e2d8f437ac9f113474cdebbc9ee9f97e57343
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScaLAPACK/ScaLAPACK-2.0.2-gompi-2016.04-OpenBLAS-0.2.18-LAPACK-3.6.0.eb
@@ -0,0 +1,25 @@
+name = 'ScaLAPACK'
+version = '2.0.2'
+
+homepage = 'http://www.netlib.org/scalapack/'
+description = """The ScaLAPACK (or Scalable LAPACK) library includes a subset of LAPACK routines
+ redesigned for distributed memory MIMD parallel computers."""
+
+toolchain = {'name': 'gompi', 'version': '2016.04'}
+toolchainopts = {'pic': True}
+
+source_urls = [homepage]
+sources = [SOURCELOWER_TGZ]
+
+blaslib = 'OpenBLAS'
+blasver = '0.2.18'
+blassuff = '-LAPACK-3.6.0'
+
+versionsuffix = "-%s-%s%s" % (blaslib, blasver, blassuff)
+
+dependencies = [(blaslib, blasver, blassuff, ('GCC', '5.3.0-2.26'))]
+
+# parallel build tends to fail, so disabling it
+parallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb
index b783e38692876a6955d9002b0069b9377c381c32..4bda8955d910e34b45847b6199621f039be60cd5 100644
--- a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-gmpolf-1.4.8-Python-2.7.3.eb
@@ -10,9 +10,11 @@ description = """ScientificPython is a collection of Python modules for scientif
 
 toolchain = {'name': 'gmpolf', 'version': '1.4.8'}
 
-source_urls = ['https://sourcesup.renater.fr/frs/download.php/2309']
+source_urls = ['https://sourcesup.cru.fr/frs/download.php/file/2309']
 sources = [SOURCE_TAR_GZ]
 
+checksums = ['82d8592635d6ae8608b3073dacf9e694']
+
 python = "Python"
 pythonversion = '2.7.3'
 pythonshortversion = ".".join(pythonversion.split(".")[:-1])
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb
index f3c253971bf6d91b2e03dae4bd9f12f9a1dec91a..068d4b4ca314510c1d6be000b72aaf89dcd4e4e2 100644
--- a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-goalf-1.1.0-no-OFED-Python-2.7.3.eb
@@ -10,9 +10,11 @@ description = """ScientificPython is a collection of Python modules for scientif
 
 toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 
-source_urls = ['https://sourcesup.renater.fr/frs/download.php/2309']
+source_urls = ['https://sourcesup.cru.fr/frs/download.php/file/2309']
 sources = [SOURCE_TAR_GZ]
 
+checksums = ['82d8592635d6ae8608b3073dacf9e694']
+
 python = "Python"
 pythonversion = '2.7.3'
 pythonshortversion = ".".join(pythonversion.split(".")[:-1])
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-goolf-1.4.10-Python-2.7.3.eb
index ed6a708c5fa5042c01726bc0c267b60f91332cd7..20d9d4b75ebf67912e9516a0d0cbb22426aff1b3 100644
--- a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-goolf-1.4.10-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-goolf-1.4.10-Python-2.7.3.eb
@@ -10,9 +10,11 @@ and parallelization."""
 
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
-source_urls = ['https://sourcesup.renater.fr/frs/download.php/2309']
+source_urls = ['https://sourcesup.cru.fr/frs/download.php/file/2309']
 sources = [SOURCE_TAR_GZ]
 
+checksums = ['82d8592635d6ae8608b3073dacf9e694']
+
 python = "Python"
 pythonversion = '2.7.3'
 pythonshortversion = ".".join(pythonversion.split(".")[:-1])
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-4.0.6-Python-2.7.3.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-4.0.6-Python-2.7.3.eb
index 20336396df026456472e68ee53d46bc562830190..3ee6263cb6ce3d044de8acc0258cc1f30642f50c 100644
--- a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-4.0.6-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-4.0.6-Python-2.7.3.eb
@@ -10,9 +10,11 @@ description = """ScientificPython is a collection of Python modules for scientif
 
 toolchain = {'name': 'ictce', 'version': '4.0.6'}
 
-source_urls = ['https://sourcesup.renater.fr/frs/download.php/2309']
+source_urls = ['https://sourcesup.cru.fr/frs/download.php/file/2309']
 sources = [SOURCE_TAR_GZ]
 
+checksums = ['82d8592635d6ae8608b3073dacf9e694']
+
 python = "Python"
 pythonversion = '2.7.3'
 pythonshortversion = ".".join(pythonversion.split(".")[:-1])
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-5.2.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-5.2.0-Python-2.7.3.eb
index fcc68a81ed11ccddd629a47ca8a707b917425167..ad2c58bbad408535d2b062aa5336791c817061ec 100644
--- a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-5.2.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-5.2.0-Python-2.7.3.eb
@@ -10,9 +10,11 @@ description = """ScientificPython is a collection of Python modules for scientif
 
 toolchain = {'name': 'ictce', 'version': '5.2.0'}
 
-source_urls = ['https://sourcesup.renater.fr/frs/download.php/2309']
+source_urls = ['https://sourcesup.cru.fr/frs/download.php/file/2309']
 sources = [SOURCE_TAR_GZ]
 
+checksums = ['82d8592635d6ae8608b3073dacf9e694']
+
 python = "Python"
 pythonversion = '2.7.3'
 pythonshortversion = ".".join(pythonversion.split(".")[:-1])
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-5.3.0-Python-2.7.3.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-5.3.0-Python-2.7.3.eb
index 997b8a167387c3d75856f42d74de8d515e0d5186..e3c41d44f53c8d5b213218e3b8e960b16e2ea54a 100644
--- a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-5.3.0-Python-2.7.3.eb
+++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8-ictce-5.3.0-Python-2.7.3.eb
@@ -10,9 +10,11 @@ description = """ScientificPython is a collection of Python modules for scientif
 
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
-source_urls = ['https://sourcesup.renater.fr/frs/download.php/2309']
+source_urls = ['https://sourcesup.cru.fr/frs/download.php/file/2309']
 sources = [SOURCE_TAR_GZ]
 
+checksums = ['82d8592635d6ae8608b3073dacf9e694']
+
 python = "Python"
 pythonversion = '2.7.3'
 pythonshortversion = ".".join(pythonversion.split(".")[:-1])
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8.1-intel-2014b-Python-2.7.8.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8.1-intel-2014b-Python-2.7.8.eb
index 2446abe86fddf7ef1e4067cdf965c38675752116..cd80c02eeadd72c8b5e698e0f7e823c2a4734549 100644
--- a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8.1-intel-2014b-Python-2.7.8.eb
+++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.8.1-intel-2014b-Python-2.7.8.eb
@@ -10,9 +10,11 @@ description = """ScientificPython is a collection of Python modules for scientif
 
 toolchain = {'name': 'intel', 'version': '2014b'}
 
-source_urls = ['https://sourcesup.renater.fr/frs/download.php/2309']
+source_urls = ['https://sourcesup.cru.fr/frs/download.php/file/4411']
 sources = [SOURCE_TAR_GZ]
 
+checksums = ['73ee0df19c7b58cdf2954261f0763c77']
+
 python = "Python"
 pythonversion = '2.7.8'
 pythonshortversion = ".".join(pythonversion.split(".")[:-1])
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-foss-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-foss-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..267282ee9720e542c2a63de23041e8c7d863ad3e
--- /dev/null
+++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-foss-2016a-Python-2.7.11.eb
@@ -0,0 +1,31 @@
+easyblock = 'PythonPackage'
+
+name = 'ScientificPython'
+version = '2.9.4'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://sourcesup.cru.fr/projects/scientific-py/'
+description = """ScientificPython is a collection of Python modules for scientific computing.
+ It contains support for geometry, mathematical functions, statistics, physical units, IO, visualization,
+ and parallelization."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://sourcesup.cru.fr/frs/download.php/file/4570']		
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    # older version of numpy than the one included in Python module required
+    # cfr. https://bitbucket.org/khinsen/scientificpython/issue/13/numpy-19-has-dropped-support-for
+    ('numpy', '1.8.2', versionsuffix),
+]
+
+options = {'modulename': 'Scientific'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/Scientific'],
+}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-intel-2015a-Python-2.7.9.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-intel-2015a-Python-2.7.9.eb
index 0170615e9cd30b1f399f51cf88b1b6ba9fc605dc..c9512ff0dac3e202dd1ed2ad38c5f3c58510a925 100644
--- a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-intel-2015a-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-intel-2015a-Python-2.7.9.eb
@@ -10,9 +10,11 @@ description = """ScientificPython is a collection of Python modules for scientif
 
 toolchain = {'name': 'intel', 'version': '2015a'}
 
-source_urls = ['https://sourcesup.renater.fr/frs/download.php/4570']
+source_urls = ['https://sourcesup.cru.fr/frs/download.php/file/4570']
 sources = [SOURCE_TAR_GZ]
 
+checksums = ['dc2987089e106cb807b4ccecf7adc071']
+
 python = 'Python'
 pythonversion = '2.7.9'
 pythonshortversion = '.'.join(pythonversion.split('.')[:-1])
diff --git a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-intel-2015b-Python-2.7.11.eb
index 47671f1164cf4fd0e29bc09208daaddca11b5766..2de9301a37213725d0cca897f9ef66ae8c7be3da 100644
--- a/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/s/ScientificPython/ScientificPython-2.9.4-intel-2015b-Python-2.7.11.eb
@@ -10,9 +10,11 @@ description = """ScientificPython is a collection of Python modules for scientif
 
 toolchain = {'name': 'intel', 'version': '2015b'}
 
-source_urls = ['https://sourcesup.renater.fr/frs/download.php/4570']
+source_urls = ['https://sourcesup.cru.fr/frs/download.php/file/4570']
 sources = [SOURCE_TAR_GZ]
 
+checksums = ['dc2987089e106cb807b4ccecf7adc071']
+
 pyver = '2.7.11'
 pyshortver = '.'.join(pyver.split('.')[:2])
 
diff --git a/easybuild/easyconfigs/s/Singularity/Singularity-1.0-GCC-4.9.3-2.25.eb b/easybuild/easyconfigs/s/Singularity/Singularity-1.0-GCC-4.9.3-2.25.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8d785f5395bb2e1f0c97cf4b6da806ac42161ab4
--- /dev/null
+++ b/easybuild/easyconfigs/s/Singularity/Singularity-1.0-GCC-4.9.3-2.25.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'Singularity'
+version = '1.0'
+
+homepage = 'http://gmkurtzer.github.io/singularity'
+description = """Singularity is a portable application stack packaging and runtime utility."""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+
+source_urls = ['https://github.com/gmkurtzer/singularity/archive/']
+sources = ['%(version)s.tar.gz']
+
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = './autogen.sh && '
+
+sanity_check_paths = {
+    'files': ['bin/sapprun', 'bin/singularity'],
+    'dirs': ['libexec/singularity'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SoX/SoX-14.4.2-foss-2015a.eb b/easybuild/easyconfigs/s/SoX/SoX-14.4.2-foss-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a71ba0bca64cad483c78615003a8e682aa316559
--- /dev/null
+++ b/easybuild/easyconfigs/s/SoX/SoX-14.4.2-foss-2015a.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Author:    Stephane Thiell <sthiell@stanford.edu>
+###
+
+easyblock = 'ConfigureMake'
+
+name = 'SoX'
+version = '14.4.2'
+
+homepage = 'http://http://sox.sourceforge.net/'
+description = """Sound eXchange, the Swiss Army knife of audio manipulation"""
+
+toolchain = {'name': 'foss', 'version': '2015a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['https://sourceforge.net/projects/sox/files/sox/%(version)s']
+
+# These are not strictly mandatory but add flac and mp3 support to SoX
+dependencies = [
+    ('FLAC', '1.3.1'),
+    ('LAME', '3.99.5')
+]
+
+sanity_check_paths = {
+    'files': ['bin/sox', 'include/sox.h', 'lib/libsox.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.3.3-intel-2015b-Python-2.7.11.eb b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.3.3-intel-2015b-Python-2.7.11.eb
index 3813e03737da16b580757c521935f2a0be5dfcbf..be559f9b4210725cda3d6be5cbbc1a64c15f52b5 100644
--- a/easybuild/easyconfigs/s/Sphinx/Sphinx-1.3.3-intel-2015b-Python-2.7.11.eb
+++ b/easybuild/easyconfigs/s/Sphinx/Sphinx-1.3.3-intel-2015b-Python-2.7.11.eb
@@ -13,7 +13,6 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 
 # this is a bundle of Python packages
 exts_defaultclass = 'PythonPackage'
-exts_filter = ('python -c "import %(ext_name)s"', '')
 
 pyver = '2.7.11'
 pyshortver = '.'.join(pyver.split('.')[0:2])
diff --git a/easybuild/easyconfigs/s/Subread/Subread-1.5.0-p1-foss-2015b.eb b/easybuild/easyconfigs/s/Subread/Subread-1.5.0-p1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..612c514399d551d78cb161032f962944f479ac10
--- /dev/null
+++ b/easybuild/easyconfigs/s/Subread/Subread-1.5.0-p1-foss-2015b.eb
@@ -0,0 +1,27 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Adam Huffman
+# The Francis Crick Institute
+easyblock = 'MakeCp'
+
+name = 'Subread'
+version = '1.5.0-p1'
+
+homepage = 'http://subread.sourceforge.net/'
+description = """High performance read alignment, quantification and mutation discovery"""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+
+sources = ['%(namelower)s-%(version)s-source.tar.gz']
+source_urls = [('https://sourceforge.net/projects/%(namelower)s/files/%(namelower)s-%(version)s', 'download')]
+
+start_dir = 'src'
+buildopts = '-f Makefile.Linux'
+
+files_to_copy = ['bin', 'annotation', 'doc', 'LICENSE', 'README.txt', 'src', 'test']
+
+sanity_check_paths = {
+    'files': ['LICENSE', 'README.txt'],
+    'dirs': ['bin', 'annotation', 'doc', 'src', 'test']
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/Subread/Subread-1.5.0-p1-foss-2016a.eb b/easybuild/easyconfigs/s/Subread/Subread-1.5.0-p1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e525a015c81350f03cc3ebe31807e95b770d5bf7
--- /dev/null
+++ b/easybuild/easyconfigs/s/Subread/Subread-1.5.0-p1-foss-2016a.eb
@@ -0,0 +1,27 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Adam Huffman
+# The Francis Crick Institute
+easyblock = 'MakeCp'
+
+name = 'Subread'
+version = '1.5.0-p1'
+
+homepage = 'http://subread.sourceforge.net/'
+description = """High performance read alignment, quantification and mutation discovery"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = ['%(namelower)s-%(version)s-source.tar.gz']
+source_urls = [('https://sourceforge.net/projects/%(namelower)s/files/%(namelower)s-%(version)s', 'download')]
+
+start_dir = 'src'
+buildopts = '-f Makefile.Linux'
+
+files_to_copy = ['bin', 'annotation', 'doc', 'LICENSE', 'README.txt', 'src', 'test']
+
+sanity_check_paths = {
+    'files': ['LICENSE', 'README.txt'],
+    'dirs': ['bin', 'annotation', 'doc', 'src', 'test']
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/Subversion/Subversion-1.6.23-goolf-1.4.10.eb b/easybuild/easyconfigs/s/Subversion/Subversion-1.6.23-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..07b1072638f1bed794fca80b87d3645af8260346
--- /dev/null
+++ b/easybuild/easyconfigs/s/Subversion/Subversion-1.6.23-goolf-1.4.10.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'Subversion'
+version = '1.6.23'
+
+homepage = 'http://subversion.apache.org/'
+description = " Subversion is an open source version control system."
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://archive.apache.org/dist/subversion/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('APR', '1.5.0'),
+    ('APR-util', '1.5.3'),
+    ('SQLite', '3.8.4.1'),
+    ('zlib', '1.2.7'),
+    ('neon', '0.30.0'),
+]
+
+configopts = "--with-apr=$EBROOTAPR/bin/apr-1-config --with-apr-util=$EBROOTAPRMINUTIL/bin/apu-1-config "
+configopts += "--with-zlib=$EBROOTZLIB --with-neon=$EBROOTNEON"
+
+sanity_check_paths = {
+    'files': ["bin/svn", "bin/svnversion"],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.5.2-intel-2016a-METIS-5.1.0.eb b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.5.2-intel-2016a-METIS-5.1.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..63fe3bdb3be678da562e103a9315afd6aa606ca2
--- /dev/null
+++ b/easybuild/easyconfigs/s/SuiteSparse/SuiteSparse-4.5.2-intel-2016a-METIS-5.1.0.eb
@@ -0,0 +1,24 @@
+name = 'SuiteSparse'
+version = '4.5.2'
+
+homepage = 'http://faculty.cse.tamu.edu/davis/suitesparse.html'
+description = """SuiteSparse is a collection of libraries manipulate sparse matrices."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'opt': True, 'unroll': True, 'pic': True}
+
+source_urls = ['http://faculty.cse.tamu.edu/davis/SuiteSparse/']
+sources = [SOURCE_TAR_GZ]
+
+metis = 'METIS'
+metis_ver = '5.1.0'
+versionsuffix = '-%s-%s' % (metis, metis_ver)
+dependencies = [(metis, metis_ver)]
+
+preconfigopts = 'MY_METIS_LIB="$EBROOTMETIS/lib/libmetis.so" ' 
+prebuildopts = 'MY_METIS_LIB="$EBROOTMETIS/lib/libmetis.so" ' 
+preinstallopts = 'MY_METIS_LIB="$EBROOTMETIS/lib/libmetis.so" ' 
+
+maxparallel = 1
+
+moduleclass = 'numlib'
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-2015.06.eb
similarity index 91%
rename from easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-2015.06.eb
index a075d53839250dd22721a7b8efaff6461e1fb149..de900f73b252c87ce2f6cfc2d5885146de032751 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-2015.06.eb
@@ -6,7 +6,7 @@ version = '2.1'
 homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/'
 description = "Szip compression software, providing lossless compression of scientific data"
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True, }
 
 source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src']
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-2015.11.eb
similarity index 91%
rename from easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-2015.11.eb
index 6340c632112c384d955af8b0eee29fb2fe98b5d5..58f5db7a334f89214d49c51ef553a445326582b4 100644
--- a/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-CrayGNU-2015.11.eb
@@ -6,7 +6,7 @@ version = '2.1'
 homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/'
 description = "Szip compression software, providing lossless compression of scientific data"
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True, }
 
 source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src']
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.5.16.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.5.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..73e27f5f6c2ae1da254097346241e3b5bf9d5dcf
--- /dev/null
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-goolf-1.5.16.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'Szip'
+version = '2.1'
+
+homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/'
+description = "Szip compression software, providing lossless compression of scientific data"
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+sanity_check_paths = {
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
+             ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d8f05c9dd2119a02a337f3de3715ae021e6b90e8
--- /dev/null
+++ b/easybuild/easyconfigs/s/Szip/Szip-2.1-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'Szip'
+version = '2.1'
+
+homepage = 'http://www.hdfgroup.org/doc_resource/SZIP/'
+description = "Szip compression software, providing lossless compression of scientific data"
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+source_urls = ['http://www.hdfgroup.org/ftp/lib-external/szip/%(version)s/src']
+sources = [SOURCELOWER_TAR_GZ]
+
+configopts = "--with-pic"
+
+sanity_check_paths = {
+    'files': ["lib/libsz.a", "lib/libsz.%s" % SHLIB_EXT] +
+             ["include/%s" % x for x in ["ricehdf.h", "szip_adpt.h", "szlib.h"]],
+    'dirs': [],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..50d044b41cef911148b52fa1ebdc19e23b2d0d62
--- /dev/null
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'scikit-learn'
+version = '0.17.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://scikit-learn.org/stable/index.html'
+description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
+building upon numpy, scipy, and matplotlib. As a machine-learning module,
+it provides versatile tools for data mining and analysis in any field of science and engineering.
+It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('matplotlib', '1.5.1', versionsuffix),
+]
+
+options = {'modulename': 'sklearn'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/sklearn'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-intel-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-intel-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f49a608d871cb080efcd44216fe98eb1a48ced87
--- /dev/null
+++ b/easybuild/easyconfigs/s/scikit-learn/scikit-learn-0.17.1-intel-2016a-Python-3.5.1.eb
@@ -0,0 +1,30 @@
+easyblock = 'PythonPackage'
+
+name = 'scikit-learn'
+version = '0.17.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://scikit-learn.org/stable/index.html'
+description = """Scikit-learn integrates machine learning algorithms in the tightly-knit scientific Python world,
+building upon numpy, scipy, and matplotlib. As a machine-learning module,
+it provides versatile tools for data mining and analysis in any field of science and engineering.
+It strives to be simple and efficient, accessible to everybody, and reusable in various contexts."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.5.1'),
+    ('matplotlib', '1.5.1', versionsuffix),
+]
+
+options = {'modulename': 'sklearn'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/sklearn'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.15.1-CrayGNU-2015.06-XC-Python-2.7.9.eb b/easybuild/easyconfigs/s/scipy/scipy-0.15.1-CrayGNU-2015.06-Python-2.7.9.eb
similarity index 89%
rename from easybuild/easyconfigs/s/scipy/scipy-0.15.1-CrayGNU-2015.06-XC-Python-2.7.9.eb
rename to easybuild/easyconfigs/s/scipy/scipy-0.15.1-CrayGNU-2015.06-Python-2.7.9.eb
index b47cc99c57917c30efa851c2c1b044f28306db0c..bec11c9016eb3c71d2882641a367c1d0c268089d 100644
--- a/easybuild/easyconfigs/s/scipy/scipy-0.15.1-CrayGNU-2015.06-XC-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.15.1-CrayGNU-2015.06-Python-2.7.9.eb
@@ -6,7 +6,7 @@ homepage = 'http://www.scipy.org'
 description = """SciPy is a collection of mathematical algorithms and convenience
  functions built on the Numpy extension for Python."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True}
 
 source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')]
diff --git a/easybuild/easyconfigs/s/scipy/scipy-0.15.1-CrayGNU-2015.11-XC-Python-2.7.9.eb b/easybuild/easyconfigs/s/scipy/scipy-0.15.1-CrayGNU-2015.11-Python-2.7.9.eb
similarity index 89%
rename from easybuild/easyconfigs/s/scipy/scipy-0.15.1-CrayGNU-2015.11-XC-Python-2.7.9.eb
rename to easybuild/easyconfigs/s/scipy/scipy-0.15.1-CrayGNU-2015.11-Python-2.7.9.eb
index b69de1aa3b6a1eeed4a305755f4cfd602f563f0f..35ad3eac2480d502058797ab29136e960c0ef81c 100644
--- a/easybuild/easyconfigs/s/scipy/scipy-0.15.1-CrayGNU-2015.11-XC-Python-2.7.9.eb
+++ b/easybuild/easyconfigs/s/scipy/scipy-0.15.1-CrayGNU-2015.11-Python-2.7.9.eb
@@ -6,7 +6,7 @@ homepage = 'http://www.scipy.org'
 description = """SciPy is a collection of mathematical algorithms and convenience
  functions built on the Numpy extension for Python."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True}
 
 source_urls = [('http://sourceforge.net/projects/scipy/files/scipy/%(version)s', 'download')]
diff --git a/easybuild/easyconfigs/s/segemehl/segemehl-0.2.0-goolf-1.4.10.eb b/easybuild/easyconfigs/s/segemehl/segemehl-0.2.0-goolf-1.4.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..39c950b357de89b301a95036ce25a19d4ae03cbf
--- /dev/null
+++ b/easybuild/easyconfigs/s/segemehl/segemehl-0.2.0-goolf-1.4.10.eb
@@ -0,0 +1,39 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# sciCORE - University of Basel
+# SIB Swiss Institute of Bioinformatics 
+
+easyblock = 'MakeCp'
+
+name = "segemehl"
+version = "0.2.0"
+
+homepage = 'http://www.bioinf.uni-leipzig.de/Software/segemehl/'
+description = """ segemehl is a software to map short sequencer reads to reference genomes. 
+ Unlike other methods, segemehl is able to detect not only mismatches but also insertions 
+ and deletions. Furthermore, segemehl is not limited to a specific read length and is able 
+ to mapprimer- or polyadenylation contaminated reads correctly. segemehl implements a matching 
+ strategy based on enhanced suffix arrays (ESA). Segemehl now supports the SAM format, reads 
+ gziped queries to save both disk and memory space and allows bisulfite sequencing mapping 
+ and split read mapping. """
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://www.bioinf.uni-leipzig.de/Software/segemehl/']
+sources = ['%s_%s.tar.gz' % (name, version.replace('.','_'))]
+
+parallel = 1
+
+dependencies = [
+    ('ncurses', '5.9'),
+    ('zlib', '1.2.8'),
+]
+
+files_to_copy = [(["lack.x", "segemehl.x", "testrealign.x"], "bin")]
+
+sanity_check_paths = {
+    'files': ["bin/%s" % x for x in ["lack.x" , "segemehl.x", "testrealign.x"]],
+    'dirs': ["."]
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/setuptools/setuptools-18.4-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/s/setuptools/setuptools-18.4-goolf-1.4.10-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..0b0cd4ff22bb1c9a099dee8cb4ce7730dbd03965
--- /dev/null
+++ b/easybuild/easyconfigs/s/setuptools/setuptools-18.4-goolf-1.4.10-Python-2.7.3.eb
@@ -0,0 +1,29 @@
+easyblock = "PythonPackage"
+
+name = "setuptools"
+version = "18.4"
+
+homepage = "http://pypi.python.org/pypi/setuptools/"
+description = """Download, build, install, upgrade, and uninstall Python packages -- easily!"""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = ['http://pypi.python.org/packages/source/s/%s/' % name]
+sources = [SOURCE_TAR_GZ]
+
+python = "Python"
+pythonversion = "2.7.3"
+
+versionsuffix = "-%s-%s" % (python, pythonversion)
+
+dependencies = [(python, pythonversion)]
+
+py_short_ver = ".".join(pythonversion.split(".")[0:2])
+pylibdir = "lib/python%s/site-packages/%s" % (py_short_ver, name)
+
+sanity_check_paths = {
+    'files': ["bin/easy_install", "%s-%s-py%s.egg" % (pylibdir, version, py_short_ver)],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-foss-2016a.eb b/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d835154d866639d354f03baf064b5f2777afaacc
--- /dev/null
+++ b/easybuild/easyconfigs/s/sparsehash/sparsehash-2.0.2-foss-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'sparsehash'
+version = '2.0.2'
+
+homepage = 'https://code.google.com/p/sparsehash/'
+description = """An extremely memory-efficient hash_map
+ implementation. 2 bits/entry overhead! The SparseHash library
+ contains several hash-map implementations, including
+ implementations that optimize for space or speed."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['https://sparsehash.googlecode.com/files/']
+
+sanity_check_paths = {
+    'files': ['include/google/type_traits.h'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-2015.06.eb
similarity index 88%
rename from easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-2015.06.eb
index bdb5c45a5a9171ee84f0ee11a3f7c10074520d56..7601dde60169068f27a25309ada3b0e4d3bf58ab 100644
--- a/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-2015.06.eb
@@ -6,7 +6,7 @@ version = '1.7.3'
 homepage = 'http://spglib.sourceforge.net/'
 description = """Spglib is a C library for finding and handling crystal symmetries."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-2015.11.eb
similarity index 88%
rename from easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-2015.11.eb
index 68086c7c98bd733066f7b980cb755a5b9026aa78..0395e331ecd9a547bf39cd528f00167e17b134af 100644
--- a/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/s/spglib/spglib-1.7.3-CrayGNU-2015.11.eb
@@ -6,7 +6,7 @@ version = '1.7.3'
 homepage = 'http://spglib.sourceforge.net/'
 description = """Spglib is a C library for finding and handling crystal symmetries."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
diff --git a/easybuild/easyconfigs/s/spglib/spglib-1.9.2-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/s/spglib/spglib-1.9.2-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8451bf0c50071a015ca75070463c991dcfaf0bc5
--- /dev/null
+++ b/easybuild/easyconfigs/s/spglib/spglib-1.9.2-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,21 @@
+easyblock = 'ConfigureMake'
+
+name = 'spglib'
+version = '1.9.2'
+
+homepage = 'http://spglib.sourceforge.net/'
+description = """Spglib is a C library for finding and handling crystal symmetries."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+patches = ['spglib-%(version)s_remove_duplicate.patch']
+
+sanity_check_paths = {
+    'files': ['lib/libsymspg.a', 'lib/libsymspg.%s' % SHLIB_EXT],
+    'dirs': ['include/spglib'],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/s/spglib/spglib-1.9.2_remove_duplicate.patch b/easybuild/easyconfigs/s/spglib/spglib-1.9.2_remove_duplicate.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8382a4ebe32853b212cf3ae0ac4c70828d3d1730
--- /dev/null
+++ b/easybuild/easyconfigs/s/spglib/spglib-1.9.2_remove_duplicate.patch
@@ -0,0 +1,13 @@
+debug.h is already in $(spglib_h), which causes make install to fail
+author: Miguel Dias Costa (National University of Singapore)
+--- src/Makefile.in.orig	2016-04-26 16:21:29.900203000 +0800
++++ src/Makefile.in	2016-04-26 16:21:43.531192514 +0800
+@@ -562,7 +562,7 @@
+ version.h
+ 
+ libsymspg_la_SOURCES = $(spglib_c) $(spglib_h)
+-pkginclude_HEADERS = $(spglib_h) debug.h
++pkginclude_HEADERS = $(spglib_h)
+ # libsymspg_la_LDFLAGS = -version-info 0:1:0
+ libsymspg_la_LIBADD = -lm
+ spglib_test_SOURCES = test.c $(spglib_c) $(spglib_h)
diff --git a/easybuild/easyconfigs/s/sratoolkit/sratoolkit-2.5.7.eb b/easybuild/easyconfigs/s/sratoolkit/sratoolkit-2.5.7.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b3d358e4a359acbc21736f5b9e72a5ee25813c56
--- /dev/null
+++ b/easybuild/easyconfigs/s/sratoolkit/sratoolkit-2.5.7.eb
@@ -0,0 +1,28 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Author: Adam Huffman
+# adam.huffman@crick.ac.uk
+# The Francis Crick Institute
+# Based on work by npklein
+
+easyblock = 'PackedBinary'
+
+name = 'sratoolkit'
+version = '2.5.7'
+
+homepage = 'http://www.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=software'
+description = """The SRA Toolkit, and the source-code SRA System Development 
+ Kit (SDK), will allow you to programmatically access data housed within SRA
+ and convert it from the SRA format"""
+
+toolchain = {'name': 'dummy', 'version': 'dummy'}
+
+source_urls = ['http://ftp-trace.ncbi.nlm.nih.gov/sra/sdk/%(version)s/']
+sources = ['sratoolkit.%(version)s-centos_linux64.tar.gz']
+
+sanity_check_paths = {
+    'files': ['bin/abi-load', 'bin/fastq-dump', 'bin/sff-load', 'bin/vdb-dump'],
+    'dirs': []
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/s/statsmodels/statsmodels-0.6.1-intel-2016a-Python-3.5.1.eb b/easybuild/easyconfigs/s/statsmodels/statsmodels-0.6.1-intel-2016a-Python-3.5.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a2ab69cdf5c3184dc4296cc796338c585ff06570
--- /dev/null
+++ b/easybuild/easyconfigs/s/statsmodels/statsmodels-0.6.1-intel-2016a-Python-3.5.1.eb
@@ -0,0 +1,40 @@
+easyblock = 'Bundle'
+
+name = 'statsmodels'
+version = '0.6.1'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'https://pypi.python.org/pypi/statsmodels'
+description = """Statsmodels is a Python package that provides a complement to scipy for statistical computations
+ including descriptive statistics and estimation and inference for statistical models."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+dependencies = [
+    ('Python', '3.5.1'),
+]
+
+exts_list = [
+    ('patsy', '0.4.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/patsy'],
+        'source_tmpl': 'patsy-%(version)s.zip',
+    }),
+    (name, version, {
+        'source_urls': ['https://pypi.python.org/packages/source/s/statsmodels'],
+    }),
+]
+
+# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
+full_sanity_check = True
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+moduleclass = 'math'
diff --git a/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.8-intel-2015b-Python-2.7.10.eb b/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.8-intel-2015b-Python-2.7.10.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c4a906b2435eb360c69be0d89b0e80dc2adda341
--- /dev/null
+++ b/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.8-intel-2015b-Python-2.7.10.eb
@@ -0,0 +1,32 @@
+easyblock = "PythonPackage"
+
+name = 'TAMkin'
+version = '1.0.8'
+versionsuffix = "-Python-%(pyver)s"
+
+homepage = 'http://molmod.github.io/tamkin/'
+description = """TAMkin is a post-processing toolkit for normal mode analysis,
+ thermochemistry and reaction kinetics. It uses a Hessian computation from a
+ standard computational chemistry program as its input."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://github.com/molmod/tamkin/releases/download/v%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.10'),
+    ('matplotlib', '1.5.0', versionsuffix),
+    ('molmod', '1.1', versionsuffix),
+]
+
+# disable tests that require X11 by specifying "backend: agg" in matplotlibrc
+runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; '
+runtest += 'export OMP_NUM_THREADS=1; nosetests -v test'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(namelower)s'],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.9-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.9-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..34a9b5e9f5673d9ad599451635a1aba3ecf7452d
--- /dev/null
+++ b/easybuild/easyconfigs/t/TAMkin/TAMkin-1.0.9-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,32 @@
+easyblock = "PythonPackage"
+
+name = 'TAMkin'
+version = '1.0.9'
+versionsuffix = "-Python-%(pyver)s"
+
+homepage = 'http://molmod.github.io/tamkin/'
+description = """TAMkin is a post-processing toolkit for normal mode analysis,
+ thermochemistry and reaction kinetics. It uses a Hessian computation from a
+ standard computational chemistry program as its input."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['https://github.com/molmod/tamkin/releases/download/v%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('matplotlib', '1.5.1', versionsuffix),
+    ('molmod', '1.1', versionsuffix),
+]
+
+# disable tests that require X11 by specifying "backend: agg" in matplotlibrc
+runtest = 'export MATPLOTLIBRC=$PWD; echo "backend: agg" > $MATPLOTLIBRC/matplotlibrc; '
+runtest += 'export OMP_NUM_THREADS=1; nosetests -v test'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(namelower)s'],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.6.3-goolf-1.5.16.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.3-goolf-1.5.16.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a8f55caa258ca7fd3630ae0625e92b5eb5adacc1
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.3-goolf-1.5.16.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tcl'
+version = '8.6.3'
+
+homepage = 'http://www.tcl.tk/'
+description = """Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language,
+suitable for a very wide range of uses, including web and desktop applications, networking, administration, testing and many more."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+]
+
+configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"'
+
+runtest = 'test'
+
+start_dir = 'unix'
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/t/Tcl/Tcl-8.6.4-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.4-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c2af97cc03dea1065723352512a4554529866e6e
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tcl/Tcl-8.6.4-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tcl'
+version = '8.6.4'
+
+homepage = 'http://www.tcl.tk/'
+description = """Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language,
+suitable for a very wide range of uses, including web and desktop applications, networking, administration, testing and many more."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+dependencies = [
+    ('zlib', '1.2.8'),
+]
+
+configopts = '--enable-threads EXTRA_INSTALL="install-private-headers"'
+
+runtest = 'test'
+
+start_dir = 'unix'
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-foss-2014b.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-foss-2014b.eb
index 9ebfd37f5f0c4e72e198ae7fb431c59dd0dbc2e6..ff05f0890cd253d07aaa0234374a8605d24bb83a 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-foss-2014b.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-foss-2014b.eb
@@ -14,6 +14,7 @@ sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
     ('libX11', '1.6.2', '-Python-2.7.8'),
 ]
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb
index 5f035ccbf2e409069970056eb36f378429a5dffc..e28fd7a2dc14d8d57c56534c836ecf267fe4d094 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goalf-1.1.0-no-OFED.eb
@@ -12,7 +12,10 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
 sources = ['%(namelower)s%(version)s-src.tar.gz']
 
-dependencies = [('Tcl', version)]
+dependencies = [
+    ('Tcl', version),
+    ('zlib', '1.2.7'),
+]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib CFLAGS="-I$EBROOTTCL/include"'
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb
index 16d5293528005970b7893f32f79bbc74c1c5c9a8..cbf7bcb4b24c09b752656cf957f1e01e1ff126b8 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-goolf-1.4.10.eb
@@ -12,7 +12,10 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
 sources = ['%(namelower)s%(version)s-src.tar.gz']
 
-dependencies = [('Tcl', version)]
+dependencies = [
+    ('Tcl', version),
+    ('zlib', '1.2.7'),
+]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib CFLAGS="-I$EBROOTTCL/include"'
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb
index 1415c70f4e95cd68517a79d4aa8865a7c477ed77..06a1978ba4b59686145f4482b19c313c065dd623 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.10.eb
@@ -12,7 +12,10 @@ toolchain = {'name': 'ictce', 'version': '4.0.10'}
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
 sources = ['%(namelower)s%(version)s-src.tar.gz']
 
-dependencies = [('Tcl', version)]
+dependencies = [
+    ('Tcl', version),
+    ('zlib', '1.2.7'),
+]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib CFLAGS="-I$EBROOTTCL/include"'
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb
index 5c0a6ccd9227eed9699cc118fe1d7ec937b3bfea..4798d6cf81ec4b2aa5b396dc8de68a76f47d474a 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-4.0.6.eb
@@ -12,7 +12,10 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
 sources = ['%(namelower)s%(version)s-src.tar.gz']
 
-dependencies = [('Tcl', version)]
+dependencies = [
+    ('Tcl', version),
+    ('zlib', '1.2.7'),
+]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib CFLAGS="-I$EBROOTTCL/include"'
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb
index f65e1a0e09e8b6511a73d7e84b2ccff3cc75f20e..71f6f47992391685ae604dfba0353d6cd99c7622 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-ictce-5.3.0.eb
@@ -12,7 +12,10 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
 sources = ['%(namelower)s%(version)s-src.tar.gz']
 
-dependencies = [('Tcl', version)]
+dependencies = [
+    ('Tcl', version),
+    ('zlib', '1.2.7'),
+]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib CFLAGS="-I$EBROOTTCL/include"'
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-intel-2014b.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-intel-2014b.eb
index 25372ffd8f646426a6f3120bb23e43be00ed3eab..11e23b0c0751899de565b416941f87519222394a 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.12-intel-2014b.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.12-intel-2014b.eb
@@ -14,6 +14,7 @@ sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
     ('libX11', '1.6.2', '-Python-2.7.8'),
 ]
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb
index 3231de70b9b919aa264192f68f87df455f5d20f8..8b45a8770e67de5e35a18b741d3949fae6cfb406 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.5.15-ictce-5.3.0.eb
@@ -12,7 +12,10 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
 sources = ['%(namelower)s%(version)s-src.tar.gz']
 
-dependencies = [('Tcl', version)]
+dependencies = [
+    ('Tcl', version),
+    ('zlib', '1.2.5'),
+]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib CFLAGS="-I$EBROOTTCL/include"'
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.1-ictce-5.3.0.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.1-ictce-5.3.0.eb
index a79397a5f8d8bc0d83be477080f2029970327ffa..60130e9216938ad89476dcb64b9d6e0843de153a 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.1-ictce-5.3.0.eb
@@ -13,7 +13,10 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
 sources = ['%(namelower)s%(version)s-src.tar.gz']
 
-dependencies = [('Tcl', version)]
+dependencies = [
+    ('Tcl', version),
+    ('zlib', '1.2.7'),
+]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib'
 
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-GCC-4.9.2-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-GCC-4.9.2-no-X11.eb
index 602101704ac40739961538d102c4e94d3d2da717..878cfecf539d646a638f0b8f90d28410385cf192 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-GCC-4.9.2-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-GCC-4.9.2-no-X11.eb
@@ -15,6 +15,7 @@ sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015.05-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015.05-no-X11.eb
index 8ff29d34a28dd637d9b8ea3b684e3144f2ae75c4..ac0d5ff0bc58a0e2f7efdbe52cfabba110d843de 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015.05-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015.05-no-X11.eb
@@ -15,6 +15,7 @@ sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015a-no-X11.eb
index c34f24fd99b7d222605dc64889c19d9310eb082e..0cf00324c8d649766fad5967e9794558f037a2d4 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015a-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015a-no-X11.eb
@@ -15,6 +15,7 @@ sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015b-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015b-no-X11.eb
index 31e024fb43196d08626194a516142c8b3da01752..aaa247a658e841075ccf657058923034df57ed0d 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015b-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-foss-2015b-no-X11.eb
@@ -15,6 +15,7 @@ sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-gompi-1.5.16-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-gompi-1.5.16-no-X11.eb
index a292e06eb8d354f8f350dd93a00f2cdba642f757..0a860475e3a929120bf43a487276972f0ab382df 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-gompi-1.5.16-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-gompi-1.5.16-no-X11.eb
@@ -15,6 +15,7 @@ sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.14-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.14-no-X11.eb
index cd4da6afb65ea2c76938a0a1ab28ece42f2ed959..890bfc8cfec32b0627a4d40f78c98c23034c6716 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.14-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.14-no-X11.eb
@@ -15,6 +15,7 @@ sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.16-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.16-no-X11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..b383831c92fded663690e6735d912d4c17da5103
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.5.16-no-X11.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tk'
+version = '8.6.3'
+versionsuffix = '-no-X11'
+
+homepage = 'http://www.tcl.tk/'
+description = """Tk is an open source, cross-platform widget toolchain that provides a library of basic elements for building
+ a graphical user interface (GUI) in many different programming languages."""
+
+toolchain = {'name': 'goolf', 'version': '1.5.16'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+dependencies = [
+    ('Tcl', version),
+    ('zlib', '1.2.8'),
+]
+
+configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
+
+start_dir = 'unix'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.7.20-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.7.20-no-X11.eb
index 025f5e64769cc609b4615df61b60138d4101d5cf..6550c8a4272aae568c43a719c928274e112fa044 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.7.20-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-goolf-1.7.20-no-X11.eb
@@ -15,6 +15,7 @@ sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-intel-2015a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-intel-2015a-no-X11.eb
index d841e7bd84c473523c5a9279634389b6e9572d7b..4762abfa095708143bfa749c830771ed12595793 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.3-intel-2015a-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.3-intel-2015a-no-X11.eb
@@ -15,6 +15,7 @@ sources = ['%(namelower)s%(version)s-src.tar.gz']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GCC-4.9.3-2.25-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GCC-4.9.3-2.25-no-X11.eb
index a8245c85800e9d02b4fb9c4b4d30b030d906a942..684f3bddb6d76797e80e073834fabe10633b28f7 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GCC-4.9.3-2.25-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GCC-4.9.3-2.25-no-X11.eb
@@ -17,6 +17,7 @@ patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GNU-4.9.3-2.25-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GNU-4.9.3-2.25-no-X11.eb
index 05eafdb2e8ccf4af326c3f3c09c1c1e8a61bd575..f077e32cc2b099813bcb2191c1e443ad992302c8 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GNU-4.9.3-2.25-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-GNU-4.9.3-2.25-no-X11.eb
@@ -17,6 +17,7 @@ patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015a-no-X11.eb
index da82b3957616df1bea3acfa320ece5ba7ff9f3bb..9e3efc89f0dc13cb698825dab87212b0fededf94 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015a-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015a-no-X11.eb
@@ -17,6 +17,7 @@ patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015b-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015b-no-X11.eb
index c10f179e0cefa28cdc27c2343eba331d59826eb6..89ecb3248a7f4e9dce91b5bc0eec5c35e1a2c1f5 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015b-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2015b-no-X11.eb
@@ -17,6 +17,7 @@ patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2016a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2016a-no-X11.eb
index 6f98f7076c68817fedaf272059c5e078c00f4b99..449ce63a291d4ec9eb0aac0d59a6661d24209b0f 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2016a-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-foss-2016a-no-X11.eb
@@ -17,6 +17,7 @@ patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8')
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-gimkl-2.11.5-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-gimkl-2.11.5-no-X11.eb
index 7aa028f61cff66d7ae6790f11f00e28bad78428d..5066a5847cdc83a938ae04c5379d39b8250933ca 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-gimkl-2.11.5-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-gimkl-2.11.5-no-X11.eb
@@ -17,6 +17,7 @@ patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.4.10-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.4.10-no-X11.eb
index b3fd0e9714efe6d283332c9da9e5625b6904399b..9419fc66d665b810ae7d63238e24e46a8b55a2f8 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.4.10-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.4.10-no-X11.eb
@@ -17,6 +17,7 @@ patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.7.20-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.7.20-no-X11.eb
index 7feeb344777988a4bbbdbaa831e6a48c1caacd60..60f899a5847ab6810b112495340ca502882db963 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.7.20-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-goolf-1.7.20-no-X11.eb
@@ -17,6 +17,7 @@ patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-ictce-7.3.5-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-ictce-7.3.5-no-X11.eb
index 4630a6a0f4933a6361cabbcba047994126f477fb..53f70e54d2f08380c80b58970e26344af25494bd 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-ictce-7.3.5-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-ictce-7.3.5-no-X11.eb
@@ -17,6 +17,7 @@ patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015a-no-X11.eb
index 6e8ab4a8ff243964193c400d0b051cdac564aeac..85504f868894a39e812f0577bb5c1392aad3fc40 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015a-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015a-no-X11.eb
@@ -17,6 +17,7 @@ patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015b-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015b-no-X11.eb
index 6b8350fb2086e79ea59fa8769c44ada47b35b250..b7e6c77202038c6e9a8ee624284d0696e6f63d44 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015b-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2015b-no-X11.eb
@@ -17,6 +17,7 @@ patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016.02-GCC-4.9-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016.02-GCC-4.9-no-X11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ed76be27b657422d65a66165fe8979706a5fc259
--- /dev/null
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016.02-GCC-4.9-no-X11.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'Tk'
+version = '8.6.4'
+versionsuffix = '-no-X11'
+
+homepage = 'http://www.tcl.tk/'
+description = """Tk is an open source, cross-platform widget toolchain that provides a library of basic elements for building
+ a graphical user interface (GUI) in many different programming languages."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+source_urls = ["http://prdownloads.sourceforge.net/tcl"]
+sources = ['%(namelower)s%(version)s-src.tar.gz']
+
+patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
+
+dependencies = [
+    ('Tcl', version),
+]
+
+configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
+
+start_dir = 'unix'
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-libX11-1.6.3.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-libX11-1.6.3.eb
index 8ada7cd4056566c2a6511a7921e7c0db27e1151e..c0f2464a6dc55bf6dd7e3bb7d1ea0855c56a2f81 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-libX11-1.6.3.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-libX11-1.6.3.eb
@@ -24,6 +24,7 @@ builddependencies = [
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
     (libx11, libxver),
     ('libXt', '1.1.5'),
     ('libXext', '1.3.3'),
diff --git a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb
index 9f46cbbff73ab04a958cea81030729c38f5b8be1..9eede4921066c4045fe7939309e3bef44725eb76 100644
--- a/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb
+++ b/easybuild/easyconfigs/t/Tk/Tk-8.6.4-intel-2016a-no-X11.eb
@@ -17,6 +17,7 @@ patches = ['Tk-%(version)s_different-prefix-with-tcl.patch']
 
 dependencies = [
     ('Tcl', version),
+    ('zlib', '1.2.8'),
 ]
 
 configopts = '--enable-threads --with-tcl=$EBROOTTCL/lib --without-x CFLAGS="-I$EBROOTTCL/include"'
diff --git a/easybuild/easyconfigs/t/TopHat/TopHat-2.1.1-foss-2015b.eb b/easybuild/easyconfigs/t/TopHat/TopHat-2.1.1-foss-2015b.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3bdcb05552a28ff6719346f1cdbed3c892d558c7
--- /dev/null
+++ b/easybuild/easyconfigs/t/TopHat/TopHat-2.1.1-foss-2015b.eb
@@ -0,0 +1,40 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+# Modified by: Adam Huffman
+# The Francis Crick Institute
+
+easyblock = 'ConfigureMake'
+
+name = 'TopHat'
+version = '2.1.1'
+
+homepage = 'http://ccb.jhu.edu/software/tophat/'
+description = """TopHat is a fast splice junction mapper for RNA-Seq reads."""
+
+toolchain = {'name': 'foss', 'version': '2015b'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://ccb.jhu.edu/software/tophat/downloads/']
+
+patches = [
+    'tophat-2.0.13-zlib.patch',
+]
+
+dependencies = [
+    ('Boost', '1.60.0'),
+    ('zlib', '1.2.8'),
+]
+
+configopts = '--with-boost=$EBROOTBOOST'
+
+parallel = 1
+
+sanity_check_paths = {
+    'files': ['bin/tophat'],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayGNU-2015.06.eb
similarity index 95%
rename from easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayGNU-2015.06.eb
index 3b456bd5d583137c6487c112d50b964b3fef54dd..bf01430fff3ad0c41391c6f5e5b1c146c475115d 100644
--- a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayGNU-2015.06.eb
@@ -20,7 +20,7 @@ description = """Tcsh is an enhanced, but completely compatible version of the B
  processor. It includes a command-line editor, programmable word completion, spelling correction, a history 
  mechanism, job control and a C-like syntax."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [
diff --git a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayGNU-2015.11.eb
similarity index 95%
rename from easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayGNU-2015.11.eb
index c5db50a961e7c4b84b4936d18e8a488a84d5055a..57a30b1d872365cebb522bb347496687a21530e5 100644
--- a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayGNU-2015.11.eb
@@ -20,7 +20,7 @@ description = """Tcsh is an enhanced, but completely compatible version of the B
  processor. It includes a command-line editor, programmable word completion, spelling correction, a history 
  mechanism, job control and a C-like syntax."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [
diff --git a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayIntel-2015.11-XC.eb b/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayIntel-2015.11.eb
similarity index 95%
rename from easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayIntel-2015.11-XC.eb
rename to easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayIntel-2015.11.eb
index df83e70f3b8b76539b9b32b7ed5caa782adaa067..558feb75791db6ea3429c75de502bb7f638afe96 100644
--- a/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayIntel-2015.11-XC.eb
+++ b/easybuild/easyconfigs/t/tcsh/tcsh-6.18.01-CrayIntel-2015.11.eb
@@ -20,7 +20,7 @@ description = """Tcsh is an enhanced, but completely compatible version of the B
  processor. It includes a command-line editor, programmable word completion, spelling correction, a history 
  mechanism, job control and a C-like syntax."""
 
-toolchain = {'name': 'CrayIntel', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayIntel', 'version': '2015.11'}
 
 sources = [SOURCELOWER_TAR_GZ]
 source_urls = [
diff --git a/easybuild/easyconfigs/t/tcsh/tcsh-6.19.00-intel-2016a.eb b/easybuild/easyconfigs/t/tcsh/tcsh-6.19.00-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..4a02bab4b4f2a9264697256553e74937c6822ff2
--- /dev/null
+++ b/easybuild/easyconfigs/t/tcsh/tcsh-6.19.00-intel-2016a.eb
@@ -0,0 +1,38 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2013 University of Luxembourg/Computer Science and Communications Research Unit
+# Authors::   Valentin Plugaru <valentin.plugaru@gmail.com>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_05-06.html
+##
+easyblock = 'ConfigureMake'
+
+name = 'tcsh'
+version = '6.19.00'
+
+homepage = 'http://www.tcsh.org'
+description = """Tcsh is an enhanced, but completely compatible version of the Berkeley UNIX C shell (csh). 
+ It is a command language interpreter usable both as an interactive login shell and a shell script command 
+ processor. It includes a command-line editor, programmable word completion, spelling correction, a history 
+ mechanism, job control and a C-like syntax."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [
+    'ftp://ftp.astron.com/pub/%(namelower)s',
+    'ftp://ftp.astron.com/pub/%(namelower)s/old',
+]
+
+dependencies = [('ncurses', '6.0')]
+
+sanity_check_paths = {
+    'files': ["bin/tcsh"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/t/tmux/tmux-2.2-GCCcore-4.9.3.eb b/easybuild/easyconfigs/t/tmux/tmux-2.2-GCCcore-4.9.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a8b6500ba32d8509115fae3a9fca9e86385b0efb
--- /dev/null
+++ b/easybuild/easyconfigs/t/tmux/tmux-2.2-GCCcore-4.9.3.eb
@@ -0,0 +1,31 @@
+easyblock = 'ConfigureMake'
+
+name = 'tmux'
+version = '2.2'
+
+homepage = 'http://tmux.sourceforge.net/'
+description = """tmux is a terminal multiplexer. It lets you switch easily 
+between several programs in one terminal, detach them (they keep running in the background) and reattach them to a different terminal."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['https://github.com/tmux/tmux/releases/download/%(version)s/']
+
+builddependencies = [
+    # use same binutils version that was used when building GCCcore toolchain
+    ('binutils', '2.25', '', True),
+]
+
+dependencies = [
+    ('ncurses', '6.0'),
+    ('libevent', '2.0.22'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/tmux'],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/t/travis/travis-1.8.2-Ruby-2.3.1.eb b/easybuild/easyconfigs/t/travis/travis-1.8.2-Ruby-2.3.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ebac3ec2d3f6a4b7c8dc5ecf7b06d87e873ef23a
--- /dev/null
+++ b/easybuild/easyconfigs/t/travis/travis-1.8.2-Ruby-2.3.1.eb
@@ -0,0 +1,24 @@
+easyblock = 'RubyGem'
+
+name = 'travis'
+version = '1.8.2'
+
+rubyver = '2.3.1'
+versionsuffix = '-Ruby-%s' % rubyver
+
+homepage = 'https://github.com/travis-ci/travis.rb'
+description = """Travis CI Client (CLI and Ruby library)"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['http://rubygems.org/downloads/']
+sources = ['%(namelower)s-%(version)s.gem']
+
+dependencies = [('Ruby', rubyver)]
+
+sanity_check_paths = {
+    'files': ['bin/travis'],
+    'dirs': ['gems/travis-%(version)s/lib/travis'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-foss-2016a.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..6e398ddd1eb1536cbd3c79989d3103044fe67ef5
--- /dev/null
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-foss-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'util-linux'
+version = '2.27.1'
+
+homepage = 'http://www.kernel.org/pub/linux/utils/util-linux'
+description = """Set of Linux utilities"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['%s/v%%(version_major_minor)s' % homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+# disable account related utilities (they need OS dependant pam-devel files)
+# disable wall and friends (requires group changing permissions for install user)
+# install systemd service files in install dir
+# install bash completion files in install dir
+configopts = "--disable-chfn-chsh --disable-login --disable-su "
+configopts += "--disable-wall --disable-use-tty-group "
+configopts += "--disable-makeinstall-chown --disable-makeinstall-setuid "
+configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
+configopts += "--with-bashcompletiondir='${prefix}/share/bash-completion/completions' "
+# disable building Python bindings (since we don't include Python as a dep)
+configopts += "--without-python "
+
+dependencies = [('ncurses', '6.0')]
+
+sanity_check_paths = {
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
+    'dirs': ['include', 'bin', 'share', 'sbin'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-intel-2016a.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fa18d8bb1d1fff589a42d656d8a4a87a5cad70ae
--- /dev/null
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.27.1-intel-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'util-linux'
+version = '2.27.1'
+
+homepage = 'http://www.kernel.org/pub/linux/utils/util-linux'
+description = """Set of Linux utilities"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['%s/v%%(version_major_minor)s' % homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+# disable account related utilities (they need OS dependant pam-devel files)
+# disable wall and friends (requires group changing permissions for install user)
+# install systemd service files in install dir
+# install bash completion files in install dir
+configopts = "--disable-chfn-chsh --disable-login --disable-su "
+configopts += "--disable-wall --disable-use-tty-group "
+configopts += "--disable-makeinstall-chown --disable-makeinstall-setuid "
+configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
+configopts += "--with-bashcompletiondir='${prefix}/share/bash-completion/completions' "
+# disable building Python bindings (since we don't include Python as a dep)
+configopts += "--without-python "
+
+dependencies = [('ncurses', '6.0')]
+
+sanity_check_paths = {
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
+    'dirs': ['include', 'bin', 'share', 'sbin'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/u/util-linux/util-linux-2.28-intel-2016a.eb b/easybuild/easyconfigs/u/util-linux/util-linux-2.28-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d86cc6a0296f172645022f1d917104ea94efe7db
--- /dev/null
+++ b/easybuild/easyconfigs/u/util-linux/util-linux-2.28-intel-2016a.eb
@@ -0,0 +1,33 @@
+easyblock = 'ConfigureMake'
+
+name = 'util-linux'
+version = '2.28'
+
+homepage = 'http://www.kernel.org/pub/linux/utils/util-linux'
+description = """Set of Linux utilities"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['%s/v%%(version_major_minor)s' % homepage]
+sources = [SOURCELOWER_TAR_GZ]
+
+# disable account related utilities (they need OS dependant pam-devel files)
+# disable wall and friends (requires group changing permissions for install user)
+# install systemd service files in install dir
+# install bash completion files in install dir
+configopts = "--disable-chfn-chsh --disable-login --disable-su "
+configopts += "--disable-wall --disable-use-tty-group "
+configopts += "--disable-makeinstall-chown --disable-makeinstall-setuid "
+configopts += "--with-systemdsystemunitdir='${prefix}/systemd' "
+configopts += "--with-bashcompletiondir='${prefix}/share/bash-completion/completions' "
+# disable building Python bindings (since we don't include Python as a dep)
+configopts += "--without-python "
+
+dependencies = [('ncurses', '6.0')]
+
+sanity_check_paths = {
+    'files': ['lib/lib%s.a' % x for x in ['blkid', 'mount', 'uuid']],
+    'dirs': ['include', 'bin', 'share', 'sbin'],
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.14-foss-2016a-Perl-5.22.1.eb b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.14-foss-2016a-Perl-5.22.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c7db740277d11437394f0a36467b49ba2dfe1a7c
--- /dev/null
+++ b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.14-foss-2016a-Perl-5.22.1.eb
@@ -0,0 +1,37 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+# Author: Adam Huffman
+# adam.huffman@crick.ac.uk
+# The Francis Crick Institute
+
+easyblock = 'ConfigureMake'
+
+name = 'VCFtools'
+version = '0.1.14'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = "https://vcftools.github.io"
+description = """The aim of VCFtools is to provide 
+ easily accessible methods for working with complex 
+ genetic variation data in the form of VCF files."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+source_urls = ['https://github.com/%(namelower)s/%(namelower)s/releases/download/v%(version)s/']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+dependencies = [
+    ('Perl', '5.22.1'),
+]
+
+modextrapaths = {'PERL5LIB': 'lib/perl5/site_perl'}
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['vcftools', 'vcf-sort', 'vcf-stats']],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.14-intel-2016a-Perl-5.22.1.eb b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.14-intel-2016a-Perl-5.22.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..9f1d001bfa6fca2d25872aef5a1a7fe4688e6cff
--- /dev/null
+++ b/easybuild/easyconfigs/v/VCFtools/VCFtools-0.1.14-intel-2016a-Perl-5.22.1.eb
@@ -0,0 +1,37 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Pablo Escobar Lopez
+# Swiss Institute of Bioinformatics
+# Biozentrum - University of Basel
+# Author: Adam Huffman
+# adam.huffman@crick.ac.uk
+# The Francis Crick Institute
+
+easyblock = 'ConfigureMake'
+
+name = 'VCFtools'
+version = '0.1.14'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = "https://vcftools.github.io"
+description = """The aim of VCFtools is to provide 
+ easily accessible methods for working with complex 
+ genetic variation data in the form of VCF files."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'optarch': True}
+
+source_urls = ['https://github.com/%(namelower)s/%(namelower)s/releases/download/v%(version)s/']
+sources = ['%(namelower)s-%(version)s.tar.gz']
+
+dependencies = [
+    ('Perl', '5.22.1'),
+]
+
+modextrapaths = {'PERL5LIB': 'lib/perl5/site_perl'}
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in ['vcftools', 'vcf-sort', 'vcf-stats']],
+    'dirs': [],
+}
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/VTK/VTK-6.3.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/v/VTK/VTK-6.3.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..55d38284a04fa00f7dce395d6e4cc628bbdb02e6
--- /dev/null
+++ b/easybuild/easyconfigs/v/VTK/VTK-6.3.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,59 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-97.html
+##
+
+easyblock = 'CMakeMake'
+
+name = 'VTK'
+version = '6.3.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.vtk.org'
+description = """The Visualization Toolkit (VTK) is an open-source, freely available software system for
+ 3D computer graphics, image processing and visualization. VTK consists of a C++ class library and several
+ interpreted interface layers including Tcl/Tk, Java, and Python. VTK supports a wide variety of visualization
+ algorithms including: scalar, vector, tensor, texture, and volumetric methods; and advanced modeling techniques
+ such as: implicit modeling, polygon reduction, mesh smoothing, cutting, contouring, and Delaunay triangulation."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://www.vtk.org/files/release/%(version_major_minor)s']
+sources = [
+    SOURCE_TAR_GZ,
+    '%(name)sData-%(version)s.tar.gz',
+]
+
+builddependencies = [('CMake', '3.5.2')]
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('libGLU', '9.0.0', '-Mesa-11.2.1'),
+]
+
+configopts = "-DOPENGL_glu_LIBRARY=$EBROOTLIBGLU/lib/libGLU.%s " % SHLIB_EXT
+configopts += "-DOPENGL_gl_LIBRARY=$EBROOTMESA/lib/libGL.%s " % SHLIB_EXT
+configopts += "-DOPENGL_INCLUDE_DIR=$EBROOTMESA/include -DVTK_WRAP_PYTHON=ON "
+configopts += "-DPYTHON_LIBRARY=$EBROOTPYTHON/lib/libpython%%(pyshortver)s.%s " % SHLIB_EXT
+configopts += " -DPYTHON_INCLUDE_DIR=$EBROOTPYTHON/include/python%(pyshortver)s "
+preinstallopts = "mkdir -p %(installdir)s/lib/python2.7/site-packages/ && "
+preinstallopts += "export PYTHONPATH=%(installdir)s/lib/python%(pyshortver)s/site-packages:$PYTHONPATH && "
+
+modextrapaths = {'PYTHONPATH': ['lib/python%(pyshortver)s/site-packages']}
+
+sanity_check_paths = {
+    'files': ['bin/vtk%s-%%(version_major_minor)s' % x for x in ['EncodeString', 'HashSource',
+                                                                 'mkg3states', 'ParseOGLExt']],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/', 'include/vtk-%(version_major_minor)s'],
+}
+
+sanity_check_commands = [('python', "-c 'import %(namelower)s'")]
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/v/VarScan/VarScan-2.3.6-Java-1.7.0_80.eb b/easybuild/easyconfigs/v/VarScan/VarScan-2.3.6-Java-1.7.0_80.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ba30d5877f8ee1fc53f08eeaf857fc51cd80eff8
--- /dev/null
+++ b/easybuild/easyconfigs/v/VarScan/VarScan-2.3.6-Java-1.7.0_80.eb
@@ -0,0 +1,30 @@
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+# Author: Adam Huffman
+# The Francis Crick Institute
+
+easyblock = 'JAR'
+
+name = 'VarScan'
+version = '2.3.6'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'http://varscan.sourceforge.net/'
+description = """Variant calling and somatic mutation/CNV detection for next-generation sequencing data"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [('%(name)s.v%(version)s.jar', 'download')]
+source_urls = ['https://sourceforge.net/projects/varscan/files/']
+
+dependencies = [('Java', '1.7.0_80')]
+
+sanity_check_paths = {
+    'files': sources,
+    'dirs': [],
+}
+
+modloadmsg = """
+to execute: java -jar \\$EBROOTVARSCAN/VarScan.v%(version)s.jar
+"""
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/VarScan/VarScan-2.4.1-Java-1.7.0_80.eb b/easybuild/easyconfigs/v/VarScan/VarScan-2.4.1-Java-1.7.0_80.eb
index 36d97df0906c903783dfe484c60e621e7b4baedc..186dfc58cc4ee8aa08a1990858849f0fb7089059 100644
--- a/easybuild/easyconfigs/v/VarScan/VarScan-2.4.1-Java-1.7.0_80.eb
+++ b/easybuild/easyconfigs/v/VarScan/VarScan-2.4.1-Java-1.7.0_80.eb
@@ -6,6 +6,7 @@ easyblock = 'JAR'
 
 name = 'VarScan'
 version = '2.4.1'
+versionsuffix = '-Java-%(javaver)s'
 
 homepage = 'https://github.com/dkoboldt/varscan'
 description = """Variant calling and somatic mutation/CNV detection for next-generation sequencing data"""
@@ -15,15 +16,15 @@ toolchain = {'name': 'dummy', 'version': ''}
 sources = ['%(name)s.v%(version)s.jar']
 source_urls = ['https://github.com/dkoboldt/varscan/releases/download/v%(version)s']
 
-java = 'Java'
-javaver = '1.7.0_80'
-versionsuffix = '-%s-%s' % (java, javaver)
-
-dependencies = [(java, javaver)]
+dependencies = [('Java', '1.7.0_80')]
 
 sanity_check_paths = {
     'files': sources,
     'dirs': [],
 }
 
+modloadmsg = """
+to execute: java -jar \\$EBROOTVARSCAN/VarScan.v%(version)s.jar
+"""
+
 moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_100.eb b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_100.eb
new file mode 100644
index 0000000000000000000000000000000000000000..52c0ab85db56a26b9bd052fae767bffc0a3319d4
--- /dev/null
+++ b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_100.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA, 2012-2013 The Cyprus Institute
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>,
+#             Thekla Loizou <t.loizou@cyi.ac.cy>, Andreas Panteli <a.panteli@cyi.ac.cy>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'Velvet'
+version = '1.2.10'
+versionsuffix = '-mt-kmer_100'
+
+homepage = 'http://www.ebi.ac.uk/~zerbino/velvet/'
+description = """Sequence assembler for very short reads"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True, 'openmp': True}
+
+sources = ['%(namelower)s_%(version)s.tgz']
+source_urls = ['http://www.ebi.ac.uk/~zerbino/%(namelower)s']
+
+buildopts = "OPENMP=1 MAXKMERLENGTH=%s" % versionsuffix.split('_')[1]
+
+postinstallcmds = ["cd contrib/MetaVelvet-1.* && make && cd ../../ && cp -a contrib %(installdir)s/"]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_31.eb b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_31.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c23584dddd5b67feae080fb5552eed50cbafa289
--- /dev/null
+++ b/easybuild/easyconfigs/v/Velvet/Velvet-1.2.10-intel-2015b-mt-kmer_31.eb
@@ -0,0 +1,32 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA, 2012-2013 The Cyprus Institute
+# Authors::   Cedric Laczny <cedric.laczny@uni.lu>, Fotis Georgatos <fotis@cern.ch>,
+#             Thekla Loizou <t.loizou@cyi.ac.cy>, Andreas Panteli <a.panteli@cyi.ac.cy>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-94.html
+##
+
+name = 'Velvet'
+version = '1.2.10'
+versionsuffix = '-mt-kmer_31'
+
+homepage = 'http://www.ebi.ac.uk/~zerbino/velvet/'
+description = """Sequence assembler for very short reads"""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+toolchainopts = {'optarch': True, 'pic': True, 'openmp': True}
+
+sources = ['%(namelower)s_%(version)s.tgz']
+source_urls = ['http://www.ebi.ac.uk/~zerbino/%(namelower)s']
+
+# by default MAXKMERLENGTH=31 but defined here to keep all the easyconfigs homogeneous
+buildopts = "OPENMP=1 MAXKMERLENGTH=%s" % versionsuffix.split('_')[1]
+
+postinstallcmds = ["cd contrib/MetaVelvet-1.* && make && cd ../../ && cp -a contrib %(installdir)s/"]
+
+moduleclass = 'bio'
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goalf-1.1.0-no-OFED.eb
index 740784c81214232502ddf3c6c8a632d5bd4be81c..795671412f1fd48108303b79b2526bfb540bca05 100644
--- a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goalf-1.1.0-no-OFED.eb
@@ -29,7 +29,7 @@ source_urls = ['http://www.tbi.univie.ac.at/~ronny/RNA']
 configopts = '--without-perl'
 # Alternatively, you may want to use the following to copy the perl-module to a "local" directory
 # Code NOT yet tested, therefor left here for future recycling
-#preconfigopts = 'PERLPREFIX="/path/where/the/perl/module/shoud/go"'
+#preconfigopts = 'env PERLPREFIX="/path/where/the/perl/module/shoud/go"'
 
 sanity_check_paths = {
     'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance',
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goolf-1.4.10.eb b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goolf-1.4.10.eb
index 327bd773ebd30f710439e4b1e88bf19d281767a7..1e20cf23ec2d0441a40525d67e6245c2310b41db 100644
--- a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-goolf-1.4.10.eb
@@ -29,7 +29,7 @@ source_urls = ['http://www.tbi.univie.ac.at/~ronny/RNA']
 configopts = '--without-perl'
 # Alternatively, you may want to use the following to copy the perl-module to a "local" directory
 # Code NOT yet tested, therefor left here for future recycling
-#preconfigopts = 'PERLPREFIX="/path/where/the/perl/module/shoud/go"'
+#preconfigopts = 'env PERLPREFIX="/path/where/the/perl/module/shoud/go"'
 
 sanity_check_paths = {
     'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance',
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-4.0.6.eb b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-4.0.6.eb
index 375b58016f98221a819281f38e618bd925f655a9..b7723d7af326ac6b6c0450344589c94b2f1fe8d1 100644
--- a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-4.0.6.eb
@@ -31,7 +31,7 @@ patches = ['ViennaRNA_ictce-pragma.patch']
 configopts = '--without-perl'
 # Alternatively, you may want to use the following to copy the perl-module to a "local" directory
 # Code NOT yet tested, therefor left here for future recycling
-#preconfigopts = 'PERLPREFIX="/path/where/the/perl/module/shoud/go"'
+#preconfigopts = 'env PERLPREFIX="/path/where/the/perl/module/shoud/go"'
 
 sanity_check_paths = {
     'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance',
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-5.3.0.eb b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-5.3.0.eb
index 316c43df98161f2ff6450634ca06bc465b1370ca..a66be3332b645b7eca8cf323a57e2552eff304b8 100644
--- a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.0.7-ictce-5.3.0.eb
@@ -32,7 +32,7 @@ patches = ['ViennaRNA_ictce-pragma.patch']
 configopts = '--without-perl'
 # Alternatively, you may want to use the following to copy the perl-module to a "local" directory
 # Code NOT yet tested, therefor left here for future recycling
-#preconfigopts = 'PERLPREFIX="/path/where/the/perl/module/shoud/go"'
+#preconfigopts = 'env PERLPREFIX="/path/where/the/perl/module/shoud/go"'
 
 sanity_check_paths = {
     'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance',
diff --git a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb
index d9a8ebec9218981b9e951731fb72c598d454fdf6..664ec56172f9d0ac0b9b23e61ddebb43dc8f9299 100644
--- a/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb
+++ b/easybuild/easyconfigs/v/ViennaRNA/ViennaRNA-2.1.6-ictce-5.5.0.eb
@@ -31,7 +31,7 @@ patches = ['ViennaRNA-2.1.6_ictce.patch']
 configopts = '--without-perl'
 # Alternatively, you may want to use the following to copy the perl-module to a "local" directory
 # Code NOT yet tested, therefor left here for future recycling
-#preconfigopts = 'PERLPREFIX="/path/where/the/perl/module/shoud/go"'
+#preconfigopts = 'env PERLPREFIX="/path/where/the/perl/module/shoud/go"'
 
 sanity_check_paths = {
     'files': ['bin/RNA%s' % x for x in ['fold', 'eval', 'heat', 'pdist', 'distance',
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayGNU-2015.06-XC-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayGNU-2015.06-dmpar.eb
similarity index 94%
rename from easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayGNU-2015.06-XC-dmpar.eb
rename to easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayGNU-2015.06-dmpar.eb
index 0b7fd5cfb3e1d7cffe8b17bf13fe81977e7a5ac2..c88ec7240865cf52f8750763b3586f755da1bf45 100644
--- a/easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayGNU-2015.06-XC-dmpar.eb
+++ b/easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayGNU-2015.06-dmpar.eb
@@ -6,7 +6,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene
  numerical weather prediction system designed to serve both operational forecasting and atmospheric
  research needs."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'opt': False}  # don't use agressive optimization, stick to -O2
 
 sources = ['%(name)sV%(version)s.TAR.gz']
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayGNU-2015.11-XC-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayGNU-2015.11-dmpar.eb
similarity index 94%
rename from easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayGNU-2015.11-XC-dmpar.eb
rename to easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayGNU-2015.11-dmpar.eb
index d353e6742c3023f738b0c6d62f2eef53bed38d00..ab4cacf6da0f4e50974aaac83a85b6af03e2caae 100644
--- a/easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayGNU-2015.11-XC-dmpar.eb
+++ b/easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayGNU-2015.11-dmpar.eb
@@ -6,7 +6,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene
  numerical weather prediction system designed to serve both operational forecasting and atmospheric
  research needs."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'opt': False}  # don't use agressive optimization, stick to -O2
 
 sources = ['%(name)sV%(version)s.TAR.gz']
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayIntel-2015.11-XC-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayIntel-2015.11-dmpar.eb
similarity index 94%
rename from easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayIntel-2015.11-XC-dmpar.eb
rename to easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayIntel-2015.11-dmpar.eb
index dc552a3235cb4b18e0c4bc3714837a90fcf58cd0..ac5084ad2d6c26a6ecd5c37e5ee04a66b6a549ec 100644
--- a/easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayIntel-2015.11-XC-dmpar.eb
+++ b/easybuild/easyconfigs/w/WRF/WRF-3.6.1-CrayIntel-2015.11-dmpar.eb
@@ -6,7 +6,7 @@ description = """The Weather Research and Forecasting (WRF) Model is a next-gene
  numerical weather prediction system designed to serve both operational forecasting and atmospheric
  research needs."""
 
-toolchain = {'name': 'CrayIntel', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayIntel', 'version': '2015.11'}
 toolchainopts = {'opt': False}  # don't use agressive optimization, stick to -O2
 
 sources = ['%(name)sV%(version)s.TAR.gz']
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.8.0-intel-2016a-dmpar.eb b/easybuild/easyconfigs/w/WRF/WRF-3.8.0-intel-2016a-dmpar.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8afc4ff82211220f78934d2a3cfc6a362833d419
--- /dev/null
+++ b/easybuild/easyconfigs/w/WRF/WRF-3.8.0-intel-2016a-dmpar.eb
@@ -0,0 +1,39 @@
+name = 'WRF'
+version = '3.8.0'
+
+homepage = 'http://www.wrf-model.org'
+description = """The Weather Research and Forecasting (WRF) Model is a next-generation mesoscale
+ numerical weather prediction system designed to serve both operational forecasting and atmospheric
+ research needs."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'opt': False}  # don't use agressive optimization, stick to -O2
+
+sources = ['%(name)sV%(version_major_minor)s.TAR.gz']
+source_urls = [
+    'http://www2.mmm.ucar.edu/wrf/src/',
+    'http://www.mmm.ucar.edu/wrf/src/',
+]
+
+# csh is used by WRF install scripts
+builddependencies = [('tcsh', '6.19.00')]
+
+dependencies = [
+    ('JasPer', '1.900.1'),
+    ('netCDF', '4.4.0'),
+    ('netCDF-Fortran', '4.4.3'),
+]
+
+patches = [
+    'WRF_parallel_build_fix.patch',
+    'WRF_tests_limit-runtimes.patch',
+    'WRF-%(version)s_netCDF-Fortran_separate_path.patch',
+]
+
+# limit parallel build to 20
+maxparallel = 20
+
+buildtype = "dmpar"
+versionsuffix = '-%s' % buildtype
+
+moduleclass = 'geo'
diff --git a/easybuild/easyconfigs/w/WRF/WRF-3.8.0_netCDF-Fortran_separate_path.patch b/easybuild/easyconfigs/w/WRF/WRF-3.8.0_netCDF-Fortran_separate_path.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f46ae78e872abdb14ebf9a038097c85d2782b2c3
--- /dev/null
+++ b/easybuild/easyconfigs/w/WRF/WRF-3.8.0_netCDF-Fortran_separate_path.patch
@@ -0,0 +1,225 @@
+add support for using netCDF and netCDF-Fortran installations in separate paths
+author: Kenneth Hoste (HPC-UGent)
+diff -ru WRFV3.orig/arch/Config_new.pl WRFV3/arch/Config_new.pl
+--- WRFV3.orig/arch/Config_new.pl	2015-12-11 19:38:11.000000000 +0100
++++ WRFV3/arch/Config_new.pl	2016-04-27 12:07:59.419553000 +0200
+@@ -8,6 +8,7 @@
+ select((select(STDOUT), $|=1)[0]);
+ $sw_perl_path = perl ;
+ $sw_netcdf_path = "" ;
++$sw_netcdff_path = "" ; # for netCDF 4.2 and greater, Fortran lib may be in a different path
+ $sw_pnetcdf_path = "" ;
+ $sw_hdf5_path=""; 
+ $sw_phdf5_path=""; 
+@@ -87,6 +88,10 @@
+           }
+       }
+   }
++  if ( substr( $ARGV[0], 1, 8 ) eq "netcdff=" )
++  {
++    $sw_netcdff_path = substr( $ARGV[0], 9 ) ;
++  }
+   if ( substr( $ARGV[0], 1, 8 ) eq "pnetcdf=" )
+   {
+     $sw_pnetcdf_path = substr( $ARGV[0], 9 ) ;
+@@ -114,6 +119,7 @@
+   if ( substr( $ARGV[0], 1, 11 ) eq "USENETCDFF=" )
+   {
+     $sw_usenetcdff = substr( $ARGV[0], 12 ) ;
++    $sw_usenetcdff =~ s/!/ /g ;
+   }
+   if ( substr( $ARGV[0], 1, 10 ) eq "USENETCDF=" )
+   {
+@@ -417,6 +423,7 @@
+   {
+     $_ =~ s/CONFIGURE_PERL_PATH/$sw_perl_path/g ;
+     $_ =~ s/CONFIGURE_NETCDF_PATH/$sw_netcdf_path/g ;
++    $_ =~ s/CONFIGURE_NETCDFF_PATH/$sw_netcdff_path/g ;
+     $_ =~ s/CONFIGURE_PNETCDF_PATH/$sw_pnetcdf_path/g ;
+     $_ =~ s/CONFIGURE_HDF5_PATH/$sw_hdf5_path/g ;
+     $_ =~ s/CONFIGURE_PHDF5_PATH/$sw_phdf5_path/g ;
+Only in WRFV3/arch: Config_new.pl.orig
+diff -ru WRFV3.orig/arch/configure_new.defaults WRFV3/arch/configure_new.defaults
+--- WRFV3.orig/arch/configure_new.defaults	2016-02-29 07:22:29.000000000 +0100
++++ WRFV3/arch/configure_new.defaults	2016-04-27 12:07:59.429182000 +0200
+@@ -1626,6 +1626,7 @@
+ 
+ LIB_EXTERNAL    = \
+                      ../external/io_netcdf/libwrfio_nf.a CONFIGURE_NETCDF_PATH/lib/libnetcdf.lib \
++                     CONFIGURE_NETCDFF_PATH/lib/libnetcdff.lib \
+                      ../external/wavelet/libWavelet.a ../external/wavelet/lib_wavelet.a
+ ESMF_IO_LIB     =    ../external/esmf_time_f90/libesmf_time.a
+ LIB_BUNDLED     = \
+Only in WRFV3/arch: configure_new.defaults.orig
+diff -ru WRFV3.orig/arch/conf_tokens WRFV3/arch/conf_tokens
+--- WRFV3.orig/arch/conf_tokens	2008-02-26 16:39:38.000000000 +0100
++++ WRFV3/arch/conf_tokens	2016-04-27 12:07:59.435906000 +0200
+@@ -5,6 +5,7 @@
+        CONFIGURE_DMPARALLEL
+ CONFIGURE_RWORDSIZE
+ CONFIGURE_NETCDF_FLAG
++CONFIGURE_NETCDF_FLAG
+ CONFIGURE_GRIB2_FLAG
+ CONFIGURE_NETCDF_LIB_PATH
+ CONFIGURE_GRIB2_LIB
+@@ -13,4 +14,5 @@
+ CONFIGURE_WRFIO_NF 
+ CONFIGURE_WRFIO_GRIB2 
+ CONFIGURE_NETCDF_PATH
++CONFIGURE_NETCDFF_PATH
+ CONFIGURE_GRIB2_INC
+diff -ru WRFV3.orig/arch/postamble_new WRFV3/arch/postamble_new
+--- WRFV3.orig/arch/postamble_new	2016-02-05 22:22:09.000000000 +0100
++++ WRFV3/arch/postamble_new	2016-04-27 12:08:58.368686000 +0200
+@@ -45,6 +45,7 @@
+                       -I$(WRF_SRC_ROOT_DIR)/phys \
+                       -I$(WRF_SRC_ROOT_DIR)/chem -I$(WRF_SRC_ROOT_DIR)/inc \
+                       -I$(NETCDFPATH)/include \
++                      -I$(NETCDFFPATH)/include \
+                       CONFIGURE_RTTOV_INC
+ REGISTRY        =    Registry
+ CC_TOOLS_CFLAGS = CONFIGURE_NMM_CORE
+@@ -67,6 +68,7 @@
+ ENVCOMPDEFS     =    CONFIGURE_COMPILEFLAGS
+ CPPFLAGS        =    $(ARCHFLAGS) $(ENVCOMPDEFS) -I$(LIBINCLUDE) $(TRADFLAG) CONFIGURE_COMMS_INCLUDE
+ NETCDFPATH      =    CONFIGURE_NETCDF_PATH
+++NETCDFFPATH     =    CONFIGURE_NETCDFF_PATH
+ HDF5PATH        =    CONFIGURE_HDF5_PATH
+ WRFPLUSPATH     =    CONFIGURE_WRFPLUS_PATH
+ PNETCDFPATH     =    CONFIGURE_PNETCDF_PATH
+@@ -97,7 +99,7 @@
+ 
+ wrfio_nf : 
+ 	( cd $(WRF_SRC_ROOT_DIR)/external/io_netcdf ; \
+-          make $(J) NETCDFPATH="$(NETCDFPATH)" RANLIB="$(RANLIB)" CPP="$(CPP)" \
++          make $(J) NETCDFPATH="$(NETCDFPATH)" NETCDFFPATH="$(NETCDFFPATH)" RANLIB="$(RANLIB)" CPP="$(CPP)" \
+           CC="$(SCC)" CFLAGS="$(CFLAGS)" \
+           FC="$(SFC) $(PROMOTION) $(OMP) $(FCFLAGS)" TRADFLAG="$(TRADFLAG)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" )
+ 
+Only in WRFV3/arch: postamble_new.orig
+Only in WRFV3/arch: postamble_new.rej
+diff -ru WRFV3.orig/configure WRFV3/configure
+--- WRFV3.orig/configure	2015-12-11 19:38:11.000000000 +0100
++++ WRFV3/configure	2016-04-27 12:58:24.475136000 +0200
+@@ -287,16 +287,28 @@
+ USENETCDFF=""  # see below
+ if [ -n "$NETCDF" ] ; then
+   echo "Will use NETCDF in dir: $NETCDF"
++  # for netCDF 4.2 and greater, the Fortran library is a separate install
++  if [ -z "$NETCDFF" ]; then
++    NETCDFF="$NETCDFF"
++  fi
+ # Oh UNIDATA, why make it so hard ...
+   if [ -f "$NETCDF/lib/libnetcdff.a" -o -f "$NETCDF/lib/libnetcdff.so" ] ; then
+     USENETCDFF="-lnetcdff"
+   else
+-    USENETCDFF=" "
++     if [ -f "$NETCDFF/lib/libnetcdff.a" -o -f "$NETCDFF/lib/libnetcdff.so" -o -f "$NETCDFF/lib64/libnetcdff.so" -o -f "$NETCDFF/lib64/libnetcdff.so" ] ; then
++       USENETCDFF="-L$NETCDFF/lib!-L$NETCDFF/lib64!-lnetcdff" # ! will be replaced with space
++     else
++       USENETCDFF=" "
++     fi
+   fi
+   if [ -f "$NETCDF/lib/libnetcdf.a" -o -f "$NETCDF/lib/libnetcdf.so" ] ; then
+     USENETCDF="-lnetcdf"
+   else
+-    USENETCDF=" "
++    if [ -f "$NETCDF/lib/libnetcdf.a" -o -f "$NETCDF/lib/libnetcdf.so" -o -f "$NETCDF/lib64/libnetcdf.a" -o -f "$NETCDF/lib64/libnetcdf.so" ] ; then
++      USENETCDF="-L$NETCDF/lib!-L$NETCDF/lib64!-lnetcdf" # ! will be replaced with space
++    else
++      USENETCDF=" "
++    fi
+   fi
+ else
+   echo "Will configure for use without NetCDF"
+@@ -595,7 +607,7 @@
+    srch=`grep -i "^#ARCH.*$os" arch/configure_new.defaults | grep -i "$mach"`
+    if [ -n "$srch" ] ; then
+      $PERL arch/Config_new.pl -dmparallel=$COMMLIB -ompparallel=$OMP -perl=$PERL \
+-          -netcdf=$NETCDF -pnetcdf=$PNETCDF -hdf5=$HDF5 -phdf5=$PHDF5 -os=$os -mach=$mach -ldflags=$ldflags \
++          -netcdf=$NETCDF -netcdff=$NETCDFF -pnetcdf=$PNETCDF -phdf5=$PHDF5 -os=$os -mach=$mach -ldflags=$ldflags \
+           -compileflags=$compileflags -opt_level=$opt_level -USENETCDFF=$USENETCDFF -USENETCDF=$USENETCDF \
+           -time=$FORTRAN_COMPILER_TIMER \
+           -wrf_core=$wrf_core -gpfs=$GPFS_PATH -curl=$CURL_PATH -dep_lib_path="$DEP_LIB_PATH"
+@@ -707,10 +719,10 @@
+ echo "If you wish to change the default options, edit the file:"
+ echo "     arch/configure_new.defaults"
+ 
+-if test -n "$NETCDF" ; then
+-  if [ ! -f $NETCDF/include/netcdf.inc ] ; then
++if test -n "$NETCDFF" ; then
++  if [ ! -f $NETCDFF/include/netcdf.inc ] ; then
+     echo
+-    echo "Error : Not found $NETCDF/include/netcdf.inc"
++    echo "Error : Not found $NETCDFF/include/netcdf.inc"
+     echo "        Please check this installation of NetCDF and re-run this configure script"
+     echo
+     if test -n "$NETCDF4" ; then
+@@ -719,7 +731,7 @@
+     fi
+     exit -1
+   fi
+-  grep nf_format_64bit $NETCDF/include/netcdf.inc > /dev/null
++  grep nf_format_64bit $NETCDFF/include/netcdf.inc > /dev/null
+   configure_aaaa=$? ; export configure_aaaa
+   if [ $configure_aaaa -a -z "$WRFIO_NCD_LARGE_FILE_SUPPORT" ] ; then
+     echo "NetCDF users note:"
+Only in WRFV3: configure.orig
+Only in WRFV3: configure.rej
+diff -ru WRFV3.orig/external/io_netcdf/makefile WRFV3/external/io_netcdf/makefile
+--- WRFV3.orig/external/io_netcdf/makefile	2014-07-13 01:39:10.000000000 +0200
++++ WRFV3/external/io_netcdf/makefile	2016-04-27 12:07:59.490731000 +0200
+@@ -3,9 +3,9 @@
+ OBJSL   = wrf_io.o field_routines.o module_wrfsi_static.o
+ OBJS    = $(OBJSL)
+ CODE    = ext_ncd_get_dom_ti.code ext_ncd_get_var_td.code ext_ncd_get_var_ti.code ext_ncd_put_dom_ti.code ext_ncd_put_var_td.code ext_ncd_put_var_ti.code transpose.code 
+-FFLAGS  =  $(FCFLAGS) -I$(NETCDFPATH)/include -I../ioapi_share
+-LIBS    = $(LIB_LOCAL) -L$(NETCDFPATH)/lib -lnetcdf
+-LIBFFS  = $(LIB_LOCAL) -L$(NETCDFPATH)/lib -lnetcdff -lnetcdf $(NETCDF4_DEP_LIB)
++FFLAGS  =  $(FCFLAGS) -I$(NETCDFFPATH)/include -I../ioapi_share
++LIBS    = $(LIB_LOCAL) -L$(NETCDFPATH)/lib -L$(NETCDFPATH)/lib64 -lnetcdf
++LIBFFS  = $(LIB_LOCAL) -L$(NETCDFPATH)/lib -L$(NETCDFPATH)/lib64 -L$(NETCDFFPATH)/lib -L$(NETCDFFPATH)/lib64 -lnetcdff -lnetcdf $(NETCDF4_DEP_LIB)
+ CPP1    = $(CPP) -P $(TRADFLAG)
+ M4      = m4 -Uinclude -Uindex -Ulen
+ AR      = ar
+@@ -24,7 +24,7 @@
+ 			$(RANLIB) $@
+ 
+ wrf_io.o:               wrf_io.F90 $(CODE)
+-			grep nf_format_64bit $(NETCDFPATH)/include/netcdf.inc ;\
++			grep nf_format_64bit $(NETCDFFPATH)/include/netcdf.inc ;\
+                         a=$$? ; export a ; \
+ 			if [ $$a -a "$$WRFIO_NCD_LARGE_FILE_SUPPORT" = "1" ] ; then \
+                           $(CPP1) -DWRFIO_NCD_LARGE_FILE_SUPPORT -I../ioapi_share wrf_io.F90 | $(M4) - > wrf_io.f ; \
+@@ -43,14 +43,14 @@
+ 	x=`echo "$(FC)" | awk '{print $$1}'` ; export x ; \
+ 	if [ $$x = "gfortran" ] ; then \
+            echo removing external declaration of iargc for gfortran ; \
+-	   $(CPP1) -I$(NETCDFPATH)/include -I../ioapi_share diffwrf.F90 | sed '/integer *, *external.*iargc/d' > diffwrf.f ;\
++	   $(CPP1) -I$(NETCDFFPATH)/include -I../ioapi_share diffwrf.F90 | sed '/integer *, *external.*iargc/d' > diffwrf.f ;\
+         else \
+-	   $(CPP1) -I$(NETCDFPATH)/include -I../ioapi_share diffwrf.F90 > diffwrf.f ; \
++	   $(CPP1) -I$(NETCDFFPATH)/include -I../ioapi_share diffwrf.F90 > diffwrf.f ; \
+         fi
+ 	$(FC) -c $(FFLAGS) diffwrf.f
+ 	@if [ \( -f ../../frame/wrf_debug.o \) -a \( -f ../../frame/module_wrf_error.o \) -a \( -f $(ESMF_MOD_DEPENDENCE) \) -a \( -f ../../frame/clog.o \) ] ; then \
+ 	  echo "diffwrf io_netcdf is being built now. " ; \
+-          if [ \( -f $(NETCDFPATH)/lib/libnetcdff.a -o -f $(NETCDFPATH)/lib/libnetcdff.so \) ] ; then \
++          if [ \( -f $(NETCDFFPATH)/lib/libnetcdff.a -o -f $(NETCDFFPATH)/lib/libnetcdff.so -o -f $(NETCDFFPATH)/lib64/libnetcdff.a -o -f $(NETCDFFPATH)/lib64/libnetcdff.so \) ] ; then \
+             $(FC) $(FFLAGS) $(LDFLAGS) -o diffwrf diffwrf.o $(OBJSL) ../../frame/wrf_debug.o ../../frame/module_wrf_error.o ../../frame/clog.o $(ESMF_IO_LIB_EXT) $(LIBFFS) ;\
+           else \
+             $(FC) $(FFLAGS) $(LDFLAGS) -o diffwrf diffwrf.o $(OBJSL) ../../frame/wrf_debug.o ../../frame/module_wrf_error.o ../../frame/clog.o $(ESMF_IO_LIB_EXT) $(LIBS) ;\
+diff -ru WRFV3.orig/Makefile WRFV3/Makefile
+--- WRFV3.orig/Makefile	2016-03-11 18:47:37.000000000 +0100
++++ WRFV3/Makefile	2016-04-27 12:09:30.391608000 +0200
+@@ -867,7 +867,7 @@
+ 	@ echo '--------------------------------------'
+ 	( cd frame ; $(MAKE) $(J) framework; \
+           cd ../external/io_netcdf ; \
+-          $(MAKE) NETCDFPATH="$(NETCDFPATH)" FC="$(FC) $(FCBASEOPTS)" RANLIB="$(RANLIB)" \
++          $(MAKE) NETCDFPATH="$(NETCDFPATH)" NETCDFFPATH="$(NETCDFFPATH)" FC="$(SFC) $(FCBASEOPTS)" RANLIB="$(RANLIB)" \
+                CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" TRADFLAG="$(TRADFLAG)" ESMF_IO_LIB_EXT="$(ESMF_IO_LIB_EXT)" \
+ 	       LIB_LOCAL="$(LIB_LOCAL)" \
+                ESMF_MOD_DEPENDENCE="$(ESMF_MOD_DEPENDENCE)" AR="INTERNAL_BUILD_ERROR_SHOULD_NOT_NEED_AR" diffwrf; \
+Only in WRFV3: Makefile.orig
+Only in WRFV3: Makefile.rej
diff --git a/easybuild/easyconfigs/w/Wannier90/Wannier90-1.2-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/w/Wannier90/Wannier90-1.2-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e92974ac888cd2ca2ffbcdaa22be978a3d2f0798
--- /dev/null
+++ b/easybuild/easyconfigs/w/Wannier90/Wannier90-1.2-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,28 @@
+easyblock = 'MakeCp'
+
+name = 'Wannier90'
+version = '1.2'
+
+homepage = 'http://www.wannier.org'
+description = """A tool for obtaining maximally-localised Wannier functions"""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.wannier.org/code']
+
+patches = ['Wannier90_1x_ignore_makesys.patch']
+
+prebuildopts = 'F90=$F90 FCOPTS="$FFLAGS" LDOPTS="$FFLAGS" LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
+
+# build program and library
+buildopts = 'all'
+
+files_to_copy = [(['wannier90.x'], 'bin'), (['libwannier.a'], 'lib')]
+
+sanity_check_paths = {
+    'files': ['bin/wannier90.x', 'lib/libwannier.a'],
+    'dirs': []
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/w/Wannier90/Wannier90-2.0.1-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/w/Wannier90/Wannier90-2.0.1-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..acef4f4eb1ed9b166a64df42eb868c53f2570b36
--- /dev/null
+++ b/easybuild/easyconfigs/w/Wannier90/Wannier90-2.0.1-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,30 @@
+easyblock = 'MakeCp'
+
+name = 'Wannier90'
+version = '2.0.1'
+
+homepage = 'http://www.wannier.org'
+description = """A tool for obtaining maximally-localised Wannier functions"""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.wannier.org/code']
+
+patches = ['Wannier90_2x_ignore_makesys.patch']
+
+prebuildopts = 'F90=$F90 COMMS=mpi MPIF90=mpiifort FCOPTS="$FFLAGS" LDOPTS="$FFLAGS" '
+prebuildopts += 'LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
+
+# build program and library
+buildopts = "all"
+
+files_to_copy = [(['wannier90.x', 'postw90.x'], 'bin'), (['libwannier.a'], 'lib')]
+
+sanity_check_paths = {
+    'files': ['bin/wannier90.x', 'bin/postw90.x', 'lib/libwannier.a'],
+    'dirs': []
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/w/Wannier90/Wannier90-2.0.1-intel-2016a.eb b/easybuild/easyconfigs/w/Wannier90/Wannier90-2.0.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5f4964f9219f60bfc015505fd47ac742a3aa88ba
--- /dev/null
+++ b/easybuild/easyconfigs/w/Wannier90/Wannier90-2.0.1-intel-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'MakeCp'
+
+name = 'Wannier90'
+version = '2.0.1'
+
+homepage = 'http://www.wannier.org'
+description = """A tool for obtaining maximally-localised Wannier functions"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'usempi': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.wannier.org/code']
+
+patches = ['Wannier90_2x_ignore_makesys.patch']
+
+prebuildopts = 'F90=$F90 COMMS=mpi MPIF90=mpiifort FCOPTS="$FFLAGS" LDOPTS="$FFLAGS" '
+prebuildopts += 'LIBDIR="$LAPACK_LIB_DIR" LIBS="$LIBLAPACK" '
+
+# build program and library
+buildopts = "all"
+
+files_to_copy = [(['wannier90.x', 'postw90.x'], 'bin'), (['libwannier.a'], 'lib')]
+
+sanity_check_paths = {
+    'files': ['bin/wannier90.x', 'bin/postw90.x', 'lib/libwannier.a'],
+    'dirs': []
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/w/Wannier90/Wannier90_1x_ignore_makesys.patch b/easybuild/easyconfigs/w/Wannier90/Wannier90_1x_ignore_makesys.patch
new file mode 100644
index 0000000000000000000000000000000000000000..07fb605587093cfd8b88b3a3495434f517b5758d
--- /dev/null
+++ b/easybuild/easyconfigs/w/Wannier90/Wannier90_1x_ignore_makesys.patch
@@ -0,0 +1,13 @@
+avoid including make.sys, which contains hardcoding settings we don't need/want
+author: Miguel Dias Costa (National University of Singapore)
+--- src/Makefile.orig	2016-04-19 15:26:27.373047000 +0800
++++ src/Makefile	2016-04-19 15:26:32.414229150 +0800
+@@ -1,7 +1,7 @@
+ #  Should be no need to change below this line
+ #
+ 
+-include ../make.sys
++#include ../make.sys
+ 
+ OBJS  =  constants.o io.o utility.o parameters.o hamiltonian.o overlap.o \
+ 	 kmesh.o disentangle.o wannierise.o plot.o transport.o
diff --git a/easybuild/easyconfigs/w/Wannier90/Wannier90_2x_ignore_makesys.patch b/easybuild/easyconfigs/w/Wannier90/Wannier90_2x_ignore_makesys.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8bf5e9aa0186585ff2e04d0b36b3eae35338af27
--- /dev/null
+++ b/easybuild/easyconfigs/w/Wannier90/Wannier90_2x_ignore_makesys.patch
@@ -0,0 +1,13 @@
+avoid including make.sys, which contains hardcoding settings we don't need/want
+author: Miguel Dias Costa (National University of Singapore)
+--- src/Makefile.2.orig	2016-04-19 15:29:17.248672000 +0800
++++ src/Makefile.2	2016-04-19 15:29:21.648448096 +0800
+@@ -1,7 +1,7 @@
+ #  Should be no need to change below this line
+ #
+ 
+-include ../../make.sys
++#include ../../make.sys
+ 
+ OBJS  =  constants.o io.o utility.o parameters.o hamiltonian.o overlap.o \
+ 	 kmesh.o disentangle.o wannierise.o plot.o transport.o
diff --git a/easybuild/easyconfigs/w/Whoosh/Whoosh-2.7.0-goolf-1.4.10-Python-2.7.3.eb b/easybuild/easyconfigs/w/Whoosh/Whoosh-2.7.0-goolf-1.4.10-Python-2.7.3.eb
new file mode 100644
index 0000000000000000000000000000000000000000..db2dcb5741aaf597f38771ff617087bd0502702e
--- /dev/null
+++ b/easybuild/easyconfigs/w/Whoosh/Whoosh-2.7.0-goolf-1.4.10-Python-2.7.3.eb
@@ -0,0 +1,32 @@
+easyblock = "PythonPackage"
+
+name = 'Whoosh'
+version = '2.7.0'
+
+homepage = 'https://pypi.python.org/pypi/Whoosh/'
+description = """Fast, pure-Python full text indexing, 
+search, and spell checking library."""
+
+toolchain = {'name': 'goolf', 'version': '1.4.10'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+python = "Python"
+pyver = '2.7.3'
+pyshortver = ".".join(pyver.split(".")[:-1])
+
+versionsuffix = "-%s-%s" % (python, pyver)
+
+dependencies = [
+     (python, pyver),
+     ('numpy','1.6.2', versionsuffix),
+     ('scipy', '0.11.0', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%s/site-packages' % pyshortver],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/w/wget/wget-1.17.1-foss-2016a.eb b/easybuild/easyconfigs/w/wget/wget-1.17.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bbebd9aa833c3ac3dc702be5aaa288cb0db19de1
--- /dev/null
+++ b/easybuild/easyconfigs/w/wget/wget-1.17.1-foss-2016a.eb
@@ -0,0 +1,38 @@
+easyblock = 'ConfigureMake'
+
+name = 'wget'
+version = '1.17.1'
+
+homepage = 'https://www.gnu.org/software/wget/'
+description = """GNU Wget is a free software package for retrieving files using HTTP, HTTPS and FTP,
+ the most widely-used Internet protocols. It is a non-interactive commandline tool,
+ so it may easily be called from scripts, cron jobs, terminals without X-Windows support, etc."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [GNU_SOURCE]
+sources = [SOURCE_TAR_XZ]
+
+dependencies = [
+    #('gnutls', '3.4.11'),   # OS dependency should be preferred if the os version is more recent then this version, it's
+    # nice to have an up to date gnutls for security reasons
+    ('PCRE', '8.38'),
+    ('libidn', '1.32'),
+    ('zlib', '1.2.8'),
+    #('OpenSSL', '1.0.1s'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    # nice to have an up to date openssl for security reasons
+]
+
+configopts = '--with-ssl=openssl '
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+# Optionally, you can use gnutls (default) instead of OpenSSL.
+# Do not forget to comment out configopts in that case.
+#osdependencies = [('gnutls-devel', 'gnutls-dev', 'libgnutls-devel')]
+
+sanity_check_paths = {
+    'files': ['bin/wget'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/w/worker/worker-1.5.1-intel-2015a.eb b/easybuild/easyconfigs/w/worker/worker-1.5.1-intel-2015a.eb
index e3023d8f2c8dd44f8f3e12de0f7c16322029603c..1bd28311715a9464d6b45f55f1a2fa19264ec9cf 100644
--- a/easybuild/easyconfigs/w/worker/worker-1.5.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/w/worker/worker-1.5.1-intel-2015a.eb
@@ -15,17 +15,18 @@ source_urls = ['https://github.com/gjbex/worker/archive/']
 sources = ['%(version)s.tar.gz']
 
 dependencies = [
-    ('Perl', '5.20.1', '-bare')
+    ('Perl', '5.20.3')
 ]
 
 # adjust worker configuration file
 # note: tweak this to your local setup
 postinstallcmds = [
-    'sed -i "s/ cores_per_node = .*/ cores_per_node = 16/g" %(installdir)s/conf/worker.conf',  # tweak this
+    'sed -i "s/ cores_per_node = .*/ cores_per_node = 16/g" %(installdir)s/conf/worker.conf',
     'sed -i "s@ qsub = .*@ qsub = `which qsub`@g" %(installdir)s/conf/worker.conf',
-    'sed -i "s/ email = .*/ email = hpc-support@example.com/g" %(installdir)s/conf/worker.conf',  # tweak this
-    'sed -i "s/ unload_modules = .*/ unload_modules = intel/g" %(installdir)s/conf/worker.conf',  # tweak this (maybe)
-    'sed -i "s@ mpi_module = .*@ mpi_module = intel/2015a@g" %(installdir)s/conf/worker.conf',  # tweak this (maybe)
+    'sed -i "s/ email = .*/ email = hpc-support@example.com/g" %(installdir)s/conf/worker.conf',
+    'sed -i "s/ unload_modules = .*/ unload_modules = intel/g" %(installdir)s/conf/worker.conf',
+    'sed -i "s@ mpi_module = .*@ mpi_module = intel/2016a@g" %(installdir)s/conf/worker.conf',
+    'sed -i "s@ module_path = .*@ module_path = %(installdir)s/../../../modules/all@g" %(installdir)s/conf/worker.conf',
 ]
 
 moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/w/worker/worker-1.6.4-intel-2016a.eb b/easybuild/easyconfigs/w/worker/worker-1.6.4-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1882b094dc9f3783eaf648a0e7758e285660ddd3
--- /dev/null
+++ b/easybuild/easyconfigs/w/worker/worker-1.6.4-intel-2016a.eb
@@ -0,0 +1,32 @@
+easyblock = 'ConfigureMake'
+
+name = 'worker'
+version = '1.6.4'
+
+homepage = 'https://github.com/gjbex/worker'
+description = """The Worker framework has been developed to help deal with parameter exploration experiments
+ that would otherwise result in many jobs, forcing the user resort to scripting to retain her sanity;
+ see also https://vscentrum.be/neutral/documentation/cluster-doc/running-jobs/worker-framework."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+toolchainopts = {'usempi': True}
+
+source_urls = ['https://github.com/gjbex/worker/archive/']
+sources = ['%(version)s.tar.gz']
+
+dependencies = [
+    ('Perl', '5.22.1')
+]
+
+# adjust worker configuration file
+# note: tweak this to your local setup
+postinstallcmds = [
+    'sed -i "s/ cores_per_node = .*/ cores_per_node = 16/g" %(installdir)s/conf/worker.conf',
+    'sed -i "s@ qsub = .*@ qsub = `which qsub`@g" %(installdir)s/conf/worker.conf',
+    'sed -i "s/ email = .*/ email = hpc-support@example.com/g" %(installdir)s/conf/worker.conf',
+    'sed -i "s/ unload_modules = .*/ unload_modules = intel/g" %(installdir)s/conf/worker.conf',
+    'sed -i "s@ mpi_module = .*@ mpi_module = intel/2016a@g" %(installdir)s/conf/worker.conf',
+    'sed -i "s@ module_path = .*@ module_path = %(installdir)s/../../../modules/all@g" %(installdir)s/conf/worker.conf',
+]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/w/wxPython/wxPython-3.0.2.0-intel-2016a-Python-2.7.11.eb b/easybuild/easyconfigs/w/wxPython/wxPython-3.0.2.0-intel-2016a-Python-2.7.11.eb
new file mode 100644
index 0000000000000000000000000000000000000000..803388b88a7ba8f2620721c14fccdb34863b7765
--- /dev/null
+++ b/easybuild/easyconfigs/w/wxPython/wxPython-3.0.2.0-intel-2016a-Python-2.7.11.eb
@@ -0,0 +1,36 @@
+name = 'wxPython'
+version = '3.0.2.0'
+versionsuffix = "-Python-%(pyver)s" 
+
+homepage = 'http://www.wxpython.org'
+description = """wxPython is a GUI toolkit for the Python programming language.
+ It allows Python programmers to create programs with a robust,
+ highly functional graphical user interface, simply and easily.
+ It is implemented as a Python extension module (native code)
+ that wraps the popular wxWidgets cross platform GUI library,
+ which is written in C++."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%(name)s-src-%(version)s.tar.bz2']
+
+patches = ['%(name)s_%(version)s_intel.patch']
+
+dependencies = [
+    ('Python', '2.7.11'),
+    ('libpng', '1.6.21'),
+    ('zlib', '1.2.8'),
+    ('libjpeg-turbo', '1.4.2'),
+    ('LibTIFF', '4.0.6'),
+    ('expat', '2.1.0'),
+    ('GTK+', '2.24.28'),
+    ('GConf', '3.2.6'),
+    ('GST-plugins-base', '0.10.36'),
+    ('Mesa', '11.1.2'),
+    ('libGLU', '9.0.0'),
+    ('libSM', '1.2.2'),
+    ('libXxf86vm', '1.1.4'),
+]
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/w/wxPython/wxPython_3.0.2.0_intel.patch b/easybuild/easyconfigs/w/wxPython/wxPython_3.0.2.0_intel.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ac58f0c1acdc273e508a4fd377d2788d4d57f0cf
--- /dev/null
+++ b/easybuild/easyconfigs/w/wxPython/wxPython_3.0.2.0_intel.patch
@@ -0,0 +1,12 @@
+# Intel compiler have problems with precompiled headers (cannot mix C and C++ precompiled headers, like in GNU compilers)
+# B. Hajgato (VUB) April 8th 2016
+--- wxPython-src-3.0.2.0/build/tools/build-wxwidgets.py.org	2014-11-27 21:49:59.000000000 +0100
++++ wxPython-src-3.0.2.0/build/tools/build-wxwidgets.py	2016-04-08 13:03:01.362591062 +0200
+@@ -268,6 +268,7 @@
+             configure_opts.append("--with-gtk=3")
+ 
+         wxpy_configure_opts = [
++                            "--disable-precomp-headers",
+                             "--with-opengl",
+                             "--enable-sound",
+                             "--enable-graphics_ctx",
diff --git a/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.17-foss-2016a.eb b/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.17-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..10d7fbd3ea43ed149f1d8d61350be558ecb96e3e
--- /dev/null
+++ b/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.17-foss-2016a.eb
@@ -0,0 +1,36 @@
+easyblock = 'ConfigureMake'
+
+name = 'XKeyboardConfig'
+version = '2.17'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/XKeyboardConfig/'
+description = """The non-arch keyboard configuration database for X Window.
+ The goal is to provide the consistent, well-structured,
+ frequently released open source of X keyboard configuration data
+ for X Window System implementations (free, open source and commercial).
+ The project is targeted to XKB-based systems."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://ftp.x.org/pub/individual/data/xkeyboard-config/']
+sources = ['xkeyboard-config-%(version)s.tar.bz2']
+
+builddependencies = [
+    ('libxslt', '1.1.28'),
+    ('gettext', '0.19.7'),
+    ('intltool', '0.51.0', '-Perl-5.22.1'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+]
+
+# see http://www.linuxfromscratch.org/blfs/view/svn/x/xkeyboard-config.html
+configopts = '--with-xkb-rules-symlink=xorg '
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['share/X11/xkb']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.17-intel-2016a.eb b/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.17-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..e72178d939c41cebfff1949873493db93b0dc90b
--- /dev/null
+++ b/easybuild/easyconfigs/x/XKeyboardConfig/XKeyboardConfig-2.17-intel-2016a.eb
@@ -0,0 +1,36 @@
+easyblock = 'ConfigureMake'
+
+name = 'XKeyboardConfig'
+version = '2.17'
+
+homepage = 'http://www.freedesktop.org/wiki/Software/XKeyboardConfig/'
+description = """The non-arch keyboard configuration database for X Window.
+ The goal is to provide the consistent, well-structured,
+ frequently released open source of X keyboard configuration data
+ for X Window System implementations (free, open source and commercial).
+ The project is targeted to XKB-based systems."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://ftp.x.org/pub/individual/data/xkeyboard-config/']
+sources = ['xkeyboard-config-%(version)s.tar.bz2']
+
+builddependencies = [
+    ('libxslt', '1.1.28'),
+    ('gettext', '0.19.7'),
+    ('intltool', '0.51.0', '-Perl-5.22.1'),
+]
+
+dependencies = [
+    ('libX11', '1.6.3'),
+]
+
+# see http://www.linuxfromscratch.org/blfs/view/svn/x/xkeyboard-config.html
+configopts = '--with-xkb-rules-symlink=xorg '
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['share/X11/xkb']
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/XML-Parser/XML-Parser-2.44-foss-2016a-Perl-5.22.1.eb b/easybuild/easyconfigs/x/XML-Parser/XML-Parser-2.44-foss-2016a-Perl-5.22.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..71416dbf178801db02b7600d190fe31a0a2a726f
--- /dev/null
+++ b/easybuild/easyconfigs/x/XML-Parser/XML-Parser-2.44-foss-2016a-Perl-5.22.1.eb
@@ -0,0 +1,27 @@
+easyblock = 'PerlModule'
+
+name = 'XML-Parser'
+version = '2.44'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://search.cpan.org/~toddr/XML-Parser-2.41/'
+description = """This is a Perl extension interface to James Clark's XML parser, expat."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://cpan.metacpan.org/authors/id/T/TO/TODDR/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Perl', '5.22.1'),
+    ('expat', '2.1.1')
+]
+
+options = {'modulename': 'XML::Parser'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/XML'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/x/XML-Parser/XML-Parser-2.44-intel-2016a-Perl-5.22.1.eb b/easybuild/easyconfigs/x/XML-Parser/XML-Parser-2.44-intel-2016a-Perl-5.22.1.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5cb19baa1c6d41722f9fa608d1a10e05712ad554
--- /dev/null
+++ b/easybuild/easyconfigs/x/XML-Parser/XML-Parser-2.44-intel-2016a-Perl-5.22.1.eb
@@ -0,0 +1,27 @@
+easyblock = 'PerlModule'
+
+name = 'XML-Parser'
+version = '2.44'
+versionsuffix = '-Perl-%(perlver)s'
+
+homepage = 'http://search.cpan.org/~toddr/XML-Parser-2.41/'
+description = """This is a Perl extension interface to James Clark's XML parser, expat."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://cpan.metacpan.org/authors/id/T/TO/TODDR/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Perl', '5.22.1'),
+    ('expat', '2.1.0')
+]
+
+options = {'modulename': 'XML::Parser'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/perl5/site_perl/%(perlver)s/x86_64-linux-thread-multi/XML'],
+}
+
+moduleclass = 'data'
diff --git a/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016a.eb b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2a89ca6af63efcce64d992e231e493b084028ad7
--- /dev/null
+++ b/easybuild/easyconfigs/x/XZ/XZ-5.2.2-foss-2016a.eb
@@ -0,0 +1,30 @@
+easyblock = 'ConfigureMake'
+
+name = 'XZ'
+version = '5.2.2'
+
+homepage = 'http://tukaani.org/xz/'
+description = "xz: XZ utilities"
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_BZ2]
+source_urls = ['http://tukaani.org/xz/']
+
+builddependencies = [
+    ('Autotools', '20150215'),
+]
+
+dependencies = [
+    ('gettext', '0.19.6'),
+]
+
+# may become useful in non-x86 archs
+#configopts = ' --disable-assembler '
+
+sanity_check_paths = {
+    'files': ["bin/xz", "bin/lzmainfo"],
+    'dirs': []
+}
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/x/x264/x264-20160430-foss-2016a.eb b/easybuild/easyconfigs/x/x264/x264-20160430-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..7a55229c7109e3fcb990ccbb3e7d6ca30cd56e3d
--- /dev/null
+++ b/easybuild/easyconfigs/x/x264/x264-20160430-foss-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'x264'
+version = '20160430'
+
+homepage = 'http://www.videolan.org/developers/x264.html'
+description = """x264 is a free software library and application for encoding video streams into the H.264/MPEG-4
+ AVC compression format, and is released under the terms of the GNU GPL."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = [
+    'https://download.videolan.org/pub/videolan/x264/snapshots/',
+    'ftp://ftp.videolan.org/pub/videolan/x264/snapshots/',
+]
+sources = ['x264-snapshot-%(version)s-2245-stable.tar.bz2']
+
+dependencies = [('Yasm', '1.3.0')]
+
+configopts = "  --enable-shared --enable-static "
+
+sanity_check_paths = {
+    'files': ['bin/x264', 'include/x264_config.h', 'include/x264.h', 'lib/libx264.a', 'lib/libx264.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/x264/x264-20160430-intel-2016a.eb b/easybuild/easyconfigs/x/x264/x264-20160430-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5f7b69a6bc089109ee12fe8a1dfd5398e4549cf6
--- /dev/null
+++ b/easybuild/easyconfigs/x/x264/x264-20160430-intel-2016a.eb
@@ -0,0 +1,27 @@
+easyblock = 'ConfigureMake'
+
+name = 'x264'
+version = '20160430'
+
+homepage = 'http://www.videolan.org/developers/x264.html'
+description = """x264 is a free software library and application for encoding video streams into the H.264/MPEG-4
+ AVC compression format, and is released under the terms of the GNU GPL."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = [
+    'https://download.videolan.org/pub/videolan/x264/snapshots/',
+    'ftp://ftp.videolan.org/pub/videolan/x264/snapshots/',
+]
+sources = ['x264-snapshot-%(version)s-2245-stable.tar.bz2']
+
+dependencies = [('Yasm', '1.3.0')]
+
+configopts = "  --enable-shared --enable-static "
+
+sanity_check_paths = {
+    'files': ['bin/x264', 'include/x264_config.h', 'include/x264.h', 'lib/libx264.a', 'lib/libx264.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb
index 93be023dae5acb990f1116586c4b3e644e8ef91f..9e6fad7729ff74da79b564edd28d2dbde4323f05 100644
--- a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ description = """provides bitmaps for x"""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/data/']
+source_urls = [XORG_DATA_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/bitmaps/gray'],
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb
index 7edd725bb85748d08f67bef901f55353d1bbb4d0..6dfd84dd09de12f13fcd6cebed51a3abc4aaf544 100644
--- a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-4.1.13.eb
@@ -8,7 +8,7 @@ description = """provides bitmaps for x"""
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/data/']
+source_urls = [XORG_DATA_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/bitmaps/gray'],
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb
index 38732656c2e7860489961b858ce3088ee9708a01..23a639e88030aee3dd35730bedcca9286ce8b57a 100644
--- a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-ictce-5.3.0.eb
@@ -9,7 +9,7 @@ description = """provides bitmaps for x"""
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/data/']
+source_urls = [XORG_DATA_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/bitmaps/gray'],
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2014b.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2014b.eb
index f7d2e42a4b41edbb23fc3664382a815cb5abd3e0..c294b4f2113e52deb946a5c18dc27f4c8449518b 100644
--- a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2014b.eb
@@ -9,7 +9,7 @@ description = """provides bitmaps for x"""
 toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/data/']
+source_urls = [XORG_DATA_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/bitmaps/gray'],
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2015a.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2015a.eb
index 7c6cc82582a5bef0b2209fe49d78f789905b7d6a..4cb4a7415532bbca2f8e0f86a6801933984d9265 100644
--- a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2015a.eb
+++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2015a.eb
@@ -9,7 +9,7 @@ description = """provides bitmaps for x"""
 toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/data/']
+source_urls = [XORG_DATA_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/bitmaps/gray'],
diff --git a/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2016a.eb b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a463f1ce79bd4d02d1ab2901255e9328768072bf
--- /dev/null
+++ b/easybuild/easyconfigs/x/xbitmaps/xbitmaps-1.1.1-intel-2016a.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'xbitmaps'
+version = '1.1.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """provides bitmaps for x"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_DATA_SOURCE]
+
+sanity_check_paths = {
+    'files': ['include/X11/bitmaps/gray'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-foss-2016a.eb b/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bb023fe4176faf55776022880c5ff0d6523294bd
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-foss-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util-image'
+version = '0.4.0'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util-image package provides additional extensions to the XCB library."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('xcb-util', '0.4.0'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-image.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2016a.eb b/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a0cf9f13dda2aec1bfb91177760d078a2ea58ce8
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util-image/xcb-util-image-0.4.0-intel-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util-image'
+version = '0.4.0'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util-image package provides additional extensions to the XCB library."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('xcb-util', '0.4.0'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-image.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-foss-2016a.eb b/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..000b28f3095131a0fa9bf394e22debbf1d46ddea
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-foss-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util-keysyms'
+version = '0.4.0'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util-keysyms package contains a library for
+ handling standard X key constants and conversion to/from keycodes."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('libxcb', '1.11.1'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-keysyms.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2016a.eb b/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..ab965a9d36541a3f1a70764754bbc95307353742
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util-keysyms/xcb-util-keysyms-0.4.0-intel-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util-keysyms'
+version = '0.4.0'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util-keysyms package contains a library for
+ handling standard X key constants and conversion to/from keycodes."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('libxcb', '1.11.1'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-keysyms.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-foss-2016a.eb b/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fd3484fb387b5f48281be8f7b89ee818d2760728
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-foss-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util-renderutil'
+version = '0.3.9'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util-renderutil package provides additional extensions to the XCB library."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('libxcb', '1.11.1'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-render-util.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2016a.eb b/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c926c17dd18263be4bbb6221c7085a18795db220
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util-renderutil/xcb-util-renderutil-0.3.9-intel-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util-renderutil'
+version = '0.3.9'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util-renderutil package provides additional extensions to the XCB library."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('libxcb', '1.11.1'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-render-util.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-foss-2016a.eb b/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d412a4babfe83127c5102c3ac850609247e0b777
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-foss-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util-wm'
+version = '0.4.1'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util-wm package contains libraries which provide client and window-manager helpers for EWMH and ICCCM."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('libxcb', '1.11.1'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-%s.so' % x for x in ['ewmh', 'icccm']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2016a.eb b/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5d58f2a9b27528d832d3a3eddca6b479027ebce1
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util-wm/xcb-util-wm-0.4.1-intel-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util-wm'
+version = '0.4.1'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util-wm package contains libraries which provide client and window-manager helpers for EWMH and ICCCM."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('libxcb', '1.11.1'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-%s.so' % x for x in ['ewmh', 'icccm']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-foss-2016a.eb b/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..78a0c3a9b799ca5542f24f4c44e5562196a3a7a2
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-foss-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util'
+version = '0.4.0'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util package provides additional extensions to the XCB library,
+ many that were previously found in Xlib, but are not part of core X protocol"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('libxcb', '1.11.1'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-util.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2016a.eb b/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..18a587a56e970c79626c525c0525ed09f23772d1
--- /dev/null
+++ b/easybuild/easyconfigs/x/xcb-util/xcb-util-0.4.0-intel-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'xcb-util'
+version = '0.4.0'
+
+homepage = 'http://xcb.freedesktop.org/'
+description = """The xcb-util package provides additional extensions to the XCB library,
+ many that were previously found in Xlib, but are not part of core X protocol"""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://xcb.freedesktop.org/dist/']
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('libxcb', '1.11.1'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libxcb-util.%s' % SHLIB_EXT],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.4.10.eb
index 222c1cb8a93cd82532de38afaf6f6c4feca1a472..c125fc298992930a727b96b2570627b661140f0f 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.4.10.eb
@@ -9,7 +9,7 @@ description = """XExtProto protocol headers."""
 toolchain = {'name': 'goolf', 'version': '1.4.10'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.5.14.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.5.14.eb
index f8d28a65179992046eea16a507573a6bac9f7a8b..658fd358381f4841234a128fc988061c170fc25b 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-goolf-1.5.14.eb
@@ -9,7 +9,7 @@ description = """XExtProto protocol headers."""
 toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 
 sanity_check_paths = {
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb
index 7e5dd653468151a5f9f75df07ec5a8d03ff57915..a2085627e92ca811074c3c1ab7404949f97461b9 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-4.1.13.eb
@@ -9,7 +9,7 @@ description = """XExtProto protocol headers."""
 toolchain = {'name': 'ictce', 'version': '4.1.13'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb
index e73a8f9515b6973d0e230ee4dfe13a974e9a0892..6edad56122d25f284b0f9cdac2c1c8800eec55e0 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-ictce-5.3.0.eb
@@ -9,7 +9,7 @@ description = """XExtProto protocol headers."""
 toolchain = {'name': 'ictce', 'version': '5.3.0'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-intel-2014b.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-intel-2014b.eb
index 0f74426405a6c54e78479be6416085e7ea7f5b3b..bd7528575529ff01439664ff88721f2415dba7bd 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.2.1-intel-2014b.eb
@@ -9,7 +9,7 @@ description = """XExtProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-foss-2014b.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-foss-2014b.eb
index bceed613218d94671824f9ca2f80728317413fa0..3876294b7f052b4b24932110bf6340c19aa645d2 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-foss-2014b.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-foss-2014b.eb
@@ -9,7 +9,7 @@ description = """XExtProto protocol headers."""
 toolchain = {'name': 'foss', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-foss-2016a.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..53735a84e4e81edd0a77cae71c05f55ab08724ab
--- /dev/null
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-foss-2016a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'xextproto'
+version = '7.3.0'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """XExtProto protocol headers."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_PROTO_SOURCE]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/%s' % x for x in [
+        'agproto.h', 'cupproto.h', 'dbeproto.h', 'dpmsproto.h', 'EVIproto.h', 'geproto.h', 'lbxproto.h',
+        'mitmiscproto.h', 'multibufproto.h', 'securproto.h', 'shapeproto.h', 'shm.h', 'shmstr.h', 'syncproto.h',
+        'xtestconst.h', 'xtestext1proto.h'
+    ]
+    ],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-gimkl-2.11.5.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-gimkl-2.11.5.eb
index 1800fbf0942c79787bab5da1f048308eaad97b84..beda89b5c667d4f1d6f240f7b373b69ca4c486e7 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-gimkl-2.11.5.eb
@@ -9,7 +9,7 @@ description = """XExtProto protocol headers."""
 toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-goolf-1.5.14.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-goolf-1.5.14.eb
index eb7322e162c37df3378693e0284bf97959c91959..82aff3127f6d902c3ed551257eb73d49d85e14a5 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-goolf-1.5.14.eb
@@ -9,7 +9,7 @@ description = """XExtProto protocol headers."""
 toolchain = {'name': 'goolf', 'version': '1.5.14'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2014b.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2014b.eb
index 6156597f8b47d36a6f3adb871602d3f084131ab9..4a876994959227fa1f50aa97b6aac757278e689d 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2014b.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2014b.eb
@@ -9,7 +9,7 @@ description = """XExtProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015a.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015a.eb
index 96189817b03209c130ff7aeb7841140a5180893c..91c591e727d6c373755aa66252ea41f0687c4d00 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015a.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015a.eb
@@ -9,7 +9,7 @@ description = """XExtProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2015a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015b.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015b.eb
index d2b93b5852984f17f43ccc4bbb67701582564d9a..c2246d9293246dd536ae62775ac6d2d7706c6d32 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2015b.eb
@@ -9,7 +9,7 @@ description = """XExtProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
diff --git a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2016a.eb b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2016a.eb
index af65fa2a9dd3942f28232cd48f898e309dbb07eb..08ca1e412b26911602694c56cab2b9c41abf7288 100644
--- a/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2016a.eb
+++ b/easybuild/easyconfigs/x/xextproto/xextproto-7.3.0-intel-2016a.eb
@@ -9,7 +9,7 @@ description = """XExtProto protocol headers."""
 toolchain = {'name': 'intel', 'version': '2016a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/%s' % x for x in [
diff --git a/easybuild/easyconfigs/x/xf86vidmodeproto/xf86vidmodeproto-2.3.1-intel-2016a.eb b/easybuild/easyconfigs/x/xf86vidmodeproto/xf86vidmodeproto-2.3.1-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3665e42444c55e7c1b9f4b69f453123be83f240d
--- /dev/null
+++ b/easybuild/easyconfigs/x/xf86vidmodeproto/xf86vidmodeproto-2.3.1-intel-2016a.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'xf86vidmodeproto'
+version = '2.3.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """X11 XFree86 video mode extension protocol headers."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/xf86vm%s.h' % x for x in ['', 'proto', 'str']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-foss-2014b.eb b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-foss-2014b.eb
index b0ee431324a89b1fa3fadff020277b8bf19ef059..883ec594b7f95610f7a12aad61a2d40dbb4e7db4 100644
--- a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-foss-2014b.eb
+++ b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-foss-2014b.eb
@@ -9,7 +9,7 @@ description = "X protocol and ancillary headers for xinerama"
 toolchain = {'name': 'foss', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/panoramiXproto.h'],
diff --git a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-foss-2016a.eb b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fdbb9a1f7d26287c7d0ceb7c4c86ee88531103d7
--- /dev/null
+++ b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-foss-2016a.eb
@@ -0,0 +1,19 @@
+easyblock = 'ConfigureMake'
+
+name = 'xineramaproto'
+version = '1.2.1'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = "X protocol and ancillary headers for xinerama"
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_PROTO_SOURCE]
+
+sanity_check_paths = {
+    'files': ['include/X11/extensions/panoramiXproto.h'],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2014b.eb b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2014b.eb
index 797b75e5e7bbef845864e69455f8815e058f126b..e582ff06dd5a26f5be473c1aa586675a4a5221ca 100644
--- a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2014b.eb
+++ b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2014b.eb
@@ -9,7 +9,7 @@ description = "X protocol and ancillary headers for xinerama"
 toolchain = {'name': 'intel', 'version': '2014b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/panoramiXproto.h'],
diff --git a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2015b.eb b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2015b.eb
index e96e89759a86700ca7123ceac83cc42d8cdf545b..7e6eb92e9754d33391ff40582bd2e3b8ad66045c 100644
--- a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2015b.eb
@@ -9,7 +9,7 @@ description = "X protocol and ancillary headers for xinerama"
 toolchain = {'name': 'intel', 'version': '2015b'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/panoramiXproto.h'],
diff --git a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2016a.eb b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2016a.eb
index d198aa80e4faae627d1c503367764262484f06c6..892ed9f5bd720e5daeb669184af0556285023c39 100644
--- a/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2016a.eb
+++ b/easybuild/easyconfigs/x/xineramaproto/xineramaproto-1.2.1-intel-2016a.eb
@@ -9,7 +9,7 @@ description = "X protocol and ancillary headers for xinerama"
 toolchain = {'name': 'intel', 'version': '2016a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/extensions/panoramiXproto.h'],
diff --git a/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-foss-2016a.eb b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3965c12078539ed02db949d69945c3d501ca7ee0
--- /dev/null
+++ b/easybuild/easyconfigs/x/xorg-macros/xorg-macros-1.19.0-foss-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'xorg-macros'
+version = '1.19.0'
+
+homepage = 'http://cgit.freedesktop.org/xorg/util/macros'
+description = """X.org macros utilities."""
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://cgit.freedesktop.org/xorg/util/macros/snapshot']  # no slash ('/') at the end!
+sources = ['util-macros-%(version)s.tar.gz']
+
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = './autogen.sh && '
+
+sanity_check_paths = {
+    'files': ['share/pkgconfig/xorg-macros.pc'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xprop/xprop-1.2.2-foss-2016a.eb b/easybuild/easyconfigs/x/xprop/xprop-1.2.2-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..bd60b7c873ede99a246a9a7560fee079bbc397ab
--- /dev/null
+++ b/easybuild/easyconfigs/x/xprop/xprop-1.2.2-foss-2016a.eb
@@ -0,0 +1,26 @@
+easyblock = 'ConfigureMake'
+
+name = 'xprop'
+version = '1.2.2'
+
+homepage = "http://www.x.org/wiki/"
+description = """The xprop utility is for displaying window and font properties in an X server.
+ One window or font is selected using the command line arguments or possibly
+ in the case of a window, by clicking on the desired window. A list of
+ properties is then given, possibly with formatting information."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://ftp.x.org/archive/individual/app/']
+
+builddependencies = [
+    ('xorg-macros', '1.19.0'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/xprop'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb
index f6c2e0c627b075726d7115f1f7daf97452286747..572e38002b6a6ac6cf89a3ba435d8c86c18f0de3 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goalf-1.1.0-no-OFED.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'goalf', 'version': '1.1.0-no-OFED'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.4.10.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.4.10.eb
index 241268e4a6c250cc3afa9d885fb710d70dd88936..6eb06bc7d4044f60d154ca4cd62fd7e776376c86 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.4.10.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.4.10.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'goolf', 'version': '1.4.10'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.5.14.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.5.14.eb
index ab202e507532e16f135c812ab42446b513357916..5054d70df3ef0db5072919e92f4caa664fc6c774 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-goolf-1.5.14.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb
index e0f4abf1448d084414f892cfa66803384cc8c244..ddf767b605520b5132ac8345e698e2e92d52446c 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.0.6.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '4.0.6'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb
index 884e64e8dd8f66d19644f74cb1f79a8f24eb849c..06bdb8bc21a89e704d0f51710ca7b0811b85fbfc 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-4.1.13.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'ictce', 'version': '4.1.13'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-5.3.0.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-5.3.0.eb
index 8f17ba5d4548d5ababdb1fda5135bf1348bdf3c9..7d12c7f86a82fcda66fe7ef818c0effee05fc7bf 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-5.3.0.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.23-ictce-5.3.0.eb
@@ -11,7 +11,7 @@ toolchain = {'name': 'ictce', 'version': '5.3.0'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.26-foss-2014b.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.26-foss-2014b.eb
index bdb6d9e8c701ee8d763836894a3f811ffd2bdf7c..76cc9f4a7a2dfe3570d118a9db3d994f4c869406 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.26-foss-2014b.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.26-foss-2014b.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'foss', 'version': '2014b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.26-intel-2014b.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.26-intel-2014b.eb
index 74b305ce8c828651f3040eb014a71653751ec448..1caa382ace1bf12e41e4c39ef099211abf3bd5f9 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.26-intel-2014b.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.26-intel-2014b.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2014b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.27-goolf-1.5.14.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.27-goolf-1.5.14.eb
index 4ec0e6221a7c612c24699e3a2e5b86a66df6442e..4d66b00ecbd20e265786c8a3c42d6b92c9f459a5 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.27-goolf-1.5.14.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.27-goolf-1.5.14.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'goolf', 'version': '1.5.14'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.27-intel-2015a.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.27-intel-2015a.eb
index f9bd7118c837200cfcb7eee52a81220e59b587b1..a0292fbf8eff131391bdf3f5fe34dbbc43facfc6 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.27-intel-2015a.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.27-intel-2015a.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2015a'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.28-foss-2016a.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..2a47f2490bb2ad7b194de2c0f1786d67c5046dfe
--- /dev/null
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-foss-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'xproto'
+version = '7.0.28'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = "X protocol and ancillary headers"
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_PROTO_SOURCE]
+
+sanity_check_paths = {
+    'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
+                                             'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h',
+                                             'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h',
+                                             'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h',
+                                             'XWDFile.h', 'Xwinsock.h']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.28-gimkl-2.11.5.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-gimkl-2.11.5.eb
index 2591e436f9d57bc27027e5720333dc536b9a8ec2..8dab7213fbd304548df8d00f21192b260a137180 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.28-gimkl-2.11.5.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-gimkl-2.11.5.eb
@@ -9,7 +9,7 @@ description = "X protocol and ancillary headers"
 toolchain = {'name': 'gimkl', 'version': '2.11.5'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2015a.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2015a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..532a92d31513aab4adba9f9074dcfb8ee88b3cfa
--- /dev/null
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2015a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'xproto'
+version = '7.0.28'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = "X protocol and ancillary headers"
+
+toolchain = {'name': 'intel', 'version': '2015a'}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_PROTO_SOURCE]
+
+sanity_check_paths = {
+    'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
+                                             'Xatom.h', 'XF86keysym.h', 'Xfuncs.h', 'Xmd.h', 'Xos.h', 'Xpoll.h', 'Xprotostr.h',
+                                             'Xw32defs.h', 'Xwindows.h', 'DECkeysym.h', 'keysymdef.h', 'Sunkeysym.h', 'Xarch.h',
+                                             'Xdefs.h', 'Xfuncproto.h', 'X.h', 'Xosdefs.h', 'Xos_r.h', 'Xproto.h', 'Xthreads.h',
+                                             'XWDFile.h', 'Xwinsock.h']],
+    'dirs': []
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2015b.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2015b.eb
index d3de936da46b57f5ef1573b304b49a0a1db6e1e3..6722798efb176a1e5ac704dc195beaabbcf199e5 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2015b.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2015b.eb
@@ -10,7 +10,7 @@ toolchain = {'name': 'intel', 'version': '2015b'}
 toolchainopts = {'optarch': True}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2016a.eb b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2016a.eb
index 1d3df458a719d23d17bd9c2000d79406d410ba74..9de353786c0931661b85db26c015bf08f01c870e 100644
--- a/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2016a.eb
+++ b/easybuild/easyconfigs/x/xproto/xproto-7.0.28-intel-2016a.eb
@@ -9,7 +9,7 @@ description = "X protocol and ancillary headers"
 toolchain = {'name': 'intel', 'version': '2016a'}
 
 sources = [SOURCE_TAR_GZ]
-source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+source_urls = [XORG_PROTO_SOURCE]
 
 sanity_check_paths = {
     'files': ['include/X11/%s' % x for x in ['ap_keysym.h', 'HPkeysym.h', 'keysym.h', 'Xalloca.h',
diff --git a/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-foss-2016a.eb b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..1d32cb1ae6538682288102a3353c4cbf23399c19
--- /dev/null
+++ b/easybuild/easyconfigs/x/xtrans/xtrans-1.3.5-foss-2016a.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'xtrans'
+version = '1.3.5'
+
+homepage = "http://www.freedesktop.org/wiki/Software/xlibs"
+description = """xtrans includes a number of routines to make X implementations transport-independent;
+ at time of writing, it includes support for UNIX sockets, IPv4, IPv6, and DECnet.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+sanity_check_paths = {
+    'files': ['include/X11/Xtrans/%s' % x for x in ['transport.c', 'Xtrans.c', 'Xtrans.h', 'Xtransint.h', 
+                                                    'Xtranslcl.c', 'Xtranssock.c', 'Xtransutil.c']],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/y/Yambo/Yambo-3.4.2-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/y/Yambo/Yambo-3.4.2-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..d3ce57aec017ec02954e064649dfe322c4672880
--- /dev/null
+++ b/easybuild/easyconfigs/y/Yambo/Yambo-3.4.2-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,38 @@
+easyblock = 'MakeCp'
+
+name = 'Yambo'
+version = '3.4.2'
+
+homepage = 'http://www.yambo-code.org'
+description = """Yambo is a FORTRAN/C code for Many-Body calculations in solid state and molecular physics.
+ Yambo relies on the Kohn-Sham wavefunctions generated by two DFT public codes: abinit, and PWscf."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'usempi': True}
+
+sources = [SOURCELOWER_TGZ]
+source_urls = ['http://qe-forge.org/gf/download/frsrelease/208/932/']
+checksums = ['f0820a0f42dfc81ce3811af647bed777']
+
+dependencies = [('netCDF-Fortran', '4.4.2')]
+
+with_configure = 'True'
+
+configopts = 'CPPFLAGS="" FCFLAGS="-nofor_main" --with-blas-libs="$LIBBLAS" '
+configopts += '--with-lapack-libs="$LIBLAPACK" --with-blacs-libs="$LIBBLACS" '
+configopts += '--with-scalapack-libs="$LIBSCALAPACK" --with-fft-libs="$LIBFFT" '
+configopts += '--with-netcdf-libs="-lnetcdff -lnetcdf"'
+
+buildopts = 'all'
+
+parallel = 1
+
+files_to_copy = [(['bin/*'], 'bin')]
+
+sanity_check_paths = {
+    'files': ['bin/'+prog for prog in ['a2y', 'iotk', 'iotk.x', 'p2y', 'yambo',
+              'yambo_kerr', 'yambo_ph', 'yambo_surf', 'ypp', 'ypp_ph', 'ypp_surf']],
+    'dirs': []
+}
+
+moduleclass = 'phys'
diff --git a/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-foss-2016a.eb b/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..fd9ab5e2100db6893d9a9904b390259d6050fb9f
--- /dev/null
+++ b/easybuild/easyconfigs/y/Yasm/Yasm-1.3.0-foss-2016a.eb
@@ -0,0 +1,31 @@
+##
+# This file is an EasyBuild reciPY as per https://github.com/hpcugent/easybuild
+#
+# Copyright:: Copyright 2012-2014 Uni.Lu/LCSB, NTUA
+# Authors::   Fotis Georgatos <fotis@cern.ch>
+# License::   MIT/GPL
+# $Id$
+#
+# This work implements a part of the HPCBIOS project and is a component of the policy:
+# http://hpcbios.readthedocs.org/en/latest/HPCBIOS_2012-90.html
+##
+
+easyblock = 'ConfigureMake'
+
+name = 'Yasm'
+version = '1.3.0'
+
+homepage = 'http://www.tortall.net/projects/yasm/'
+description = """Yasm: Complete rewrite of the NASM assembler with BSD license"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.tortall.net/projects/yasm/releases/']
+
+sanity_check_paths = {
+    'files': ['bin/yasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/y/yaff/yaff-1.0.develop.2.14-intel-2015b-Python-2.7.10-HDF5-1.8.15-patch1-serial.eb b/easybuild/easyconfigs/y/yaff/yaff-1.0.develop.2.14-intel-2015b-Python-2.7.10-HDF5-1.8.15-patch1-serial.eb
new file mode 100644
index 0000000000000000000000000000000000000000..8d4f8961ee79f1a64fd7e42c64dd5c9e446ec0dd
--- /dev/null
+++ b/easybuild/easyconfigs/y/yaff/yaff-1.0.develop.2.14-intel-2015b-Python-2.7.10-HDF5-1.8.15-patch1-serial.eb
@@ -0,0 +1,31 @@
+easyblock = 'PythonPackage'
+
+name = 'yaff'
+version = '1.0.develop.2.14'
+hdf5ver = '1.8.15-patch1'
+versionsuffix = '-Python-%%(pyver)s-HDF5-%s-serial' % hdf5ver
+
+homepage = 'http://molmod.github.io/yaff/'
+description = """Yaff stands for 'Yet another force field'. It is a pythonic force-field code."""
+
+toolchain = {'name': 'intel', 'version': '2015b'}
+
+source_urls = ['https://github.com/molmod/yaff/releases/download/%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.10'),
+    ('h5py', '2.5.0', versionsuffix),
+    ('molmod', '1.1', '-Python-%(pyver)s'),
+]
+
+options = {'modulename': name}
+runtest = "export MATPLOTLIBRC=$PWD; echo 'backend: agg' > $MATPLOTLIBRC/matplotlibrc; "
+runtest += "python setup.py build_ext -i; nosetests -v"
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s'],
+}
+
+moduleclass = 'chem'
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.4-foss-2016a.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.4-foss-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..c67d70fb3af518e9a83e53029add2cb1dc289fa9
--- /dev/null
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.4-foss-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'ZeroMQ'
+version = '4.1.4'
+
+homepage = 'http://www.zeromq.org/'
+description = """ZeroMQ looks like an embeddable networking library but acts like a concurrency framework.
+ It gives you sockets that carry atomic messages across various transports like in-process,
+ inter-process, TCP, and multicast. You can connect sockets N-to-N with patterns like fanout,
+ pub-sub, task distribution, and request-reply. It's fast enough to be the fabric for clustered
+ products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous
+ message-processing tasks. It has a score of language APIs and runs on most operating systems."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['http://download.zeromq.org/']
+sources = [SOURCELOWER_TAR_GZ]
+
+# --with-pgm will use shipped OpenPGM (in foreign subdir)
+configopts = '--with-pic --with-system-pgm '
+configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.*}" '
+configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" '
+
+dependencies = [
+    ('OpenPGM', '5.2.122'),
+    ('util-linux', '2.27.1'),
+    ('libsodium', '1.0.8'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'dirs': ['include', 'lib'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.4-intel-2016a.eb b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.4-intel-2016a.eb
new file mode 100644
index 0000000000000000000000000000000000000000..5eeb6027375e9a43c54393b5a6b37e94c6e332af
--- /dev/null
+++ b/easybuild/easyconfigs/z/ZeroMQ/ZeroMQ-4.1.4-intel-2016a.eb
@@ -0,0 +1,35 @@
+easyblock = 'ConfigureMake'
+
+name = 'ZeroMQ'
+version = '4.1.4'
+
+homepage = 'http://www.zeromq.org/'
+description = """ZeroMQ looks like an embeddable networking library but acts like a concurrency framework.
+ It gives you sockets that carry atomic messages across various transports like in-process,
+ inter-process, TCP, and multicast. You can connect sockets N-to-N with patterns like fanout,
+ pub-sub, task distribution, and request-reply. It's fast enough to be the fabric for clustered
+ products. Its asynchronous I/O model gives you scalable multicore applications, built as asynchronous
+ message-processing tasks. It has a score of language APIs and runs on most operating systems."""
+
+toolchain = {'name': 'intel', 'version': '2016a'}
+
+source_urls = ['http://download.zeromq.org/']
+sources = [SOURCELOWER_TAR_GZ]
+
+# --with-pgm will use shipped OpenPGM (in foreign subdir)
+configopts = '--with-pic --with-system-pgm '
+configopts += 'OpenPGM_CFLAGS="-I$EBROOTOPENPGM/include/pgm-${EBVERSIONOPENPGM%.*}" '
+configopts += 'OpenPGM_LIBS="-L$EBROOTOPENPGM/lib -lpgm -lrt -lpthread -lm" '
+
+dependencies = [
+    ('OpenPGM', '5.2.122'),
+    ('util-linux', '2.27.1'),
+    ('libsodium', '1.0.6'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/libzmq.so', 'lib/libzmq.a'],
+    'dirs': ['include', 'lib'],
+}
+
+moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-2015.06-XC.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-2015.06.eb
similarity index 91%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-2015.06-XC.eb
rename to easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-2015.06.eb
index fbc74998eb0dd7e2f193bf5c87a19d1497c114e8..9daa7bba8182133977431cf5fd1853b3a90eac0d 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-2015.06-XC.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-2015.06.eb
@@ -8,7 +8,7 @@ description = """zlib is designed to be a free, general-purpose, legally unencum
  not covered by any patents -- lossless data-compression library for use on virtually any
  computer hardware and operating system."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.06-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.06'}
 toolchainopts = {'pic': True, }
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-2015.11-XC.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-2015.11.eb
similarity index 91%
rename from easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-2015.11-XC.eb
rename to easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-2015.11.eb
index 0c6915d7cd08edb440c35302ff859f243128c27b..ec75812a654e6ec398b01dbd423827200f643310 100644
--- a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-2015.11-XC.eb
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-CrayGNU-2015.11.eb
@@ -8,7 +8,7 @@ description = """zlib is designed to be a free, general-purpose, legally unencum
  not covered by any patents -- lossless data-compression library for use on virtually any
  computer hardware and operating system."""
 
-toolchain = {'name': 'CrayGNU', 'version': '2015.11-XC'}
+toolchain = {'name': 'CrayGNU', 'version': '2015.11'}
 toolchainopts = {'pic': True, }
 
 sources = [SOURCELOWER_TAR_GZ]
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-4.9.2.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-4.9.2.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a7b3977bb9ad052e8e432a8a6fd95740fcc002ea
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-4.9.2.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'zlib'
+version = '1.2.8'
+
+homepage = 'http://www.zlib.net/'
+description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is,
+ not covered by any patents -- lossless data-compression library for use on virtually any
+ computer hardware and operating system."""
+
+toolchain = {'name': 'GCCcore', 'version': '4.9.2'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.25', '', True)]
+
+sanity_check_paths = {
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-5.3.0.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-5.3.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..f4a9aac776358f1257a2d04316f06b9778714157
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-GCCcore-5.3.0.eb
@@ -0,0 +1,25 @@
+easyblock = 'ConfigureMake'
+
+name = 'zlib'
+version = '1.2.8'
+
+homepage = 'http://www.zlib.net/'
+description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is,
+ not covered by any patents -- lossless data-compression library for use on virtually any
+ computer hardware and operating system."""
+
+toolchain = {'name': 'GCCcore', 'version': '5.3.0'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
+
+# use same binutils version that was used when building GCC toolchain
+builddependencies = [('binutils', '2.26', '', True)]
+
+sanity_check_paths = {
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2016.02-GCC-4.9.eb b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2016.02-GCC-4.9.eb
new file mode 100644
index 0000000000000000000000000000000000000000..a389aa72f517ac6be7d64365cefd5b7d7be2cf7b
--- /dev/null
+++ b/easybuild/easyconfigs/z/zlib/zlib-1.2.8-intel-2016.02-GCC-4.9.eb
@@ -0,0 +1,22 @@
+easyblock = 'ConfigureMake'
+
+name = 'zlib'
+version = '1.2.8'
+
+homepage = 'http://www.zlib.net/'
+description = """zlib is designed to be a free, general-purpose, legally unencumbered -- that is,
+ not covered by any patents -- lossless data-compression library for use on virtually any
+ computer hardware and operating system."""
+
+toolchain = {'name': 'intel', 'version': '2016.02-GCC-4.9'}
+toolchainopts = {'pic': True}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
+
+sanity_check_paths = {
+    'files': ['include/zconf.h', 'include/zlib.h', 'lib/libz.a', 'lib/libz.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/setup.py b/setup.py
index e1abe096bf78a096b6a3558edba05ece25d669ef..cf1d254d2921dfaeba5a9a9699a87c1827a28295 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ from distutils import log
 # recent setuptools versions will *TRANSFORM* something like 'X.Y.Zdev' into 'X.Y.Z.dev0', with a warning like
 #   UserWarning: Normalizing '2.4.0dev' to '2.4.0.dev0'
 # This causes problems further up the dependency chain...
-VERSION = '2.7.0.dev0'
+VERSION = '2.8.0.dev0'
 
 API_VERSION = VERSION.split('.')[0]
 EB_VERSION = '.'.join(VERSION.split('.')[0:2])
diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py
index f3b329c87239c9d63d070d9f13ed67a08f1bfdc6..2d23e93e648d4de752fe805cbfa733ec657c7d71 100644
--- a/test/easyconfigs/easyconfigs.py
+++ b/test/easyconfigs/easyconfigs.py
@@ -49,6 +49,7 @@ from easybuild.framework.easyconfig.easyconfig import get_easyblock_class
 from easybuild.framework.easyconfig.parser import fetch_parameters_from_easyconfig
 from easybuild.framework.easyconfig.tools import dep_graph, get_paths_for, process_easyconfig
 from easybuild.tools import config
+from easybuild.tools.config import build_option
 from easybuild.tools.filetools import write_file
 from easybuild.tools.module_naming_scheme import GENERAL_CLASS
 from easybuild.tools.module_naming_scheme.easybuild_mns import EasyBuildMNS
@@ -113,7 +114,7 @@ class EasyConfigTest(TestCase):
                 if dep.get('external_module', False):
                     ec['dependencies'].remove(dep)
 
-        self.ordered_specs = resolve_dependencies(self.parsed_easyconfigs, retain_all_deps=True)
+        self.ordered_specs = resolve_dependencies(self.parsed_easyconfigs, modules_tool(), retain_all_deps=True)
 
     def test_dep_graph(self):
         """Unit test that builds a full dependency graph."""
@@ -263,8 +264,9 @@ def template_easyconfig_test(self, spec):
     fail_msg = "Easyconfig file %s not in expected subdirectory %s" % (spec, expected_subdir)
     self.assertEqual(expected_subdir, subdir, fail_msg)
 
-    # sanity check for software name
-    self.assertTrue(ec['name'], name)
+    # sanity check for software name, moduleclass
+    self.assertEqual(ec['name'], name)
+    self.assertTrue(ec['moduleclass'] in build_option('valid_module_classes'))
 
     # instantiate easyblock with easyconfig file
     app_class = get_easyblock_class(easyblock, name=name)