diff --git a/c/ClusterShell/ClusterShell-1.7.3.eb b/c/ClusterShell/ClusterShell-1.7.3.eb
new file mode 100644
index 00000000..7a6d8ed9
--- /dev/null
+++ b/c/ClusterShell/ClusterShell-1.7.3.eb
@@ -0,0 +1,25 @@
+easyblock = 'PythonPackage'
+
+name = 'ClusterShell'
+version = '1.7.3'
+
+homepage = 'http://cea-hpc.github.io/clustershell/'
+description = """ClusterShell is an event-driven open source Python library, designed to run local or distant commands
+ in parallel on server farms or on large Linux clusters."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+allow_system_deps = [('Python', SYS_PYTHON_VERSION)]
+
+options = {'modulename': 'ClusterShell'}
+
+pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[:2])
+sanity_check_paths = {
+    'files': ['bin/clubak', 'bin/clush', 'bin/nodeset'],
+    'dirs': ['lib/python%s/site-packages' % pyshortver]
+}
+
+moduleclass = 'tools'
diff --git a/m/MATLAB/MATLAB-2013a.eb b/m/MATLAB/MATLAB-2013a.eb
new file mode 100644
index 00000000..d52caeaa
--- /dev/null
+++ b/m/MATLAB/MATLAB-2013a.eb
@@ -0,0 +1,25 @@
+# eb MATLAB-2013a.eb -r --include-easyblocks /apps/easybuild/python/easybuild/easyblocks/m/matlab.py
+name = 'MATLAB'
+version = '2013a'
+versionsuffix = '-EDU'
+
+homepage = 'http://www.mathworks.com/products/matlab'
+description = """MATLAB is a high-level language and interactive environment
+ that enables you to perform computationally intensive tasks faster than with
+ traditional programming languages such as C, C++, and Fortran."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [
+    ('Java', '1.8.0_121')
+]
+
+import os
+license_server = os.getenv('EB_MATLAB_LICENSE_SERVER', 'licedu.it4i.cz')
+license_server_port = os.getenv('EB_MATLAB_LICENSE_SERVER_PORT', '27010')
+key = os.getenv('EB_MATLAB_KEY', '31436-08209-25612-60500-02539-46860-32436-47249-45889-28649-10493-63042-37692-64719-31236-62574-35032-59551')
+exts_defaultclass = os.getenv('EB_MATLAB_KEY', '45771-53699-35271-44920-00140-27727-41599-08721-28943-58889-44878-45933')
+
+moduleclass = 'math'
diff --git a/p/PGI/PGI-17.3-GCC-6.3.0-2.28.eb b/p/PGI/PGI-17.3-GCC-6.3.0-2.28.eb
new file mode 100644
index 00000000..2e49faf2
--- /dev/null
+++ b/p/PGI/PGI-17.3-GCC-6.3.0-2.28.eb
@@ -0,0 +1,25 @@
+name = 'PGI'
+version = '17.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 = ['6eefc42f85e756cbaba76467ed640902']
+
+gccver = '6.3.0'
+binutilsver = '2.27'
+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'