diff --git a/a/ASE/.ASE-3.15.0-Python-3.6.2-base.eb.swp b/a/ASE/.ASE-3.15.0-Python-3.6.2-base.eb.swp
deleted file mode 100644
index d51c9536..00000000
Binary files a/a/ASE/.ASE-3.15.0-Python-3.6.2-base.eb.swp and /dev/null differ
diff --git a/a/ASE/ASE-3.15.0-Python-3.6.2-base.eb b/a/ASE/ASE-3.15.0-Python-3.6.2-base.eb
index bf4f3b10..e5a57c9d 100644
--- a/a/ASE/ASE-3.15.0-Python-3.6.2-base.eb
+++ b/a/ASE/ASE-3.15.0-Python-3.6.2-base.eb
@@ -20,7 +20,7 @@ dependencies = [
     ('Python', '2.6.2', '-base'),
     ('numpy', '1.13.3', versionsuffix),
     ('scipy', '1.0.0', versionsuffix),
-    ('matplotlib', '2.0.2', versionsuffix),
+    ('matplotlib', '2.1.1', versionsuffix),
 ]
 
 sanity_check_paths = {
diff --git a/m/matplotlib/matplotlib-2.1.1-Python-3.6.2-base.eb b/m/matplotlib/matplotlib-2.1.1-Python-3.6.2-base.eb
new file mode 100644
index 00000000..d417059c
--- /dev/null
+++ b/m/matplotlib/matplotlib-2.1.1-Python-3.6.2-base.eb
@@ -0,0 +1,33 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+name = 'matplotlib'
+version = '2.1.1'
+versionsuffix = "-Python-%(pyver)s-base"
+
+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': 'dummy', 'version': ''}
+
+source_urls = ['https://github.com/matplotlib/matplotlib/archive/']
+sources = ['v%(version)s.tar.gz']
+
+dependencies = [
+    ('Python', '3.6.2', '-base'),
+    ('freetype', '2.8'),
+    ('libpng', '1.6.29'),
+    ('python-dateutil', '2.6.1', versionsuffix),
+    ('numpy', '1.13.3', versionsuffix),
+    ('pyparsing', '2.2.0', versionsuffix),
+    ('six', '1.11.0', versionsuffix),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python3.6/site-packages/%(name)s-%(version)s-py3.6-linux-x86_64.egg/%(name)s'],
+}
+
+moduleclass = 'vis'
diff --git a/p/pyparsing/pyparsing-2.2.0-Python-3.6.2-base.eb b/p/pyparsing/pyparsing-2.2.0-Python-3.6.2-base.eb
new file mode 100644
index 00000000..6bef6c09
--- /dev/null
+++ b/p/pyparsing/pyparsing-2.2.0-Python-3.6.2-base.eb
@@ -0,0 +1,26 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+name = 'pyparsing'
+version = '2.2.0'
+versionsuffix = "-Python-%(pyver)s-base"
+
+homepage = 'http://pyparsing.wikispaces.com'
+description = """The pyparsing module provides a library of classes 
+  that client code uses to construct the grammar directly in Python code."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://pypi.python.org/packages/3c/ec/a94f8cf7274ea60b5413df054f82a8980523efd712ec55a59e7c3357cf7c/']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.6.2', '-base'),
+]
+
+sanity_check_paths = {
+    'files': ['lib/python3.6/site-packages/%(name)s-%(version)s-py3.6.egg'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/p/python-dateutil/python-dateutil-2.6.1-Python-3.6.2-base.eb b/p/python-dateutil/python-dateutil-2.6.1-Python-3.6.2-base.eb
new file mode 100644
index 00000000..5e7ab485
--- /dev/null
+++ b/p/python-dateutil/python-dateutil-2.6.1-Python-3.6.2-base.eb
@@ -0,0 +1,28 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+name = 'python-dateutil'
+version = '2.6.1'
+versionsuffix = "-Python-%(pyver)s-base"
+
+homepage = 'https://github.com/dateutil/dateutil'
+description = 'Useful extensions to the standard Python datetime features'
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://github.com/dateutil/dateutil/releases/download/%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '3.6.2', '-base'),
+    ('six', '1.11.0', versionsuffix),
+]
+
+options = {'modulename': 'dateutil'}
+
+sanity_check_paths = {
+    'files': ['lib/python3.6/site-packages/python_dateutil-%(version)s-py3.6.egg'],
+    'dirs': [],
+}
+
+moduleclass = 'vis'
diff --git a/s/scipy/scipy-1.0.0-Python-3.6.2-base.eb b/s/scipy/scipy-1.0.0-Python-3.6.2-base.eb
index 62672a17..1f9db699 100644
--- a/s/scipy/scipy-1.0.0-Python-3.6.2-base.eb
+++ b/s/scipy/scipy-1.0.0-Python-3.6.2-base.eb
@@ -24,9 +24,6 @@ builddependencies = [
     ('imkl', '2017.1.132', '-iimpi-2017a'),
 ]
 
-#use_pip = True
-#unpack_sources = False
-
 sanity_check_paths = {
     'files': [],
     'dirs': ['lib/python%(pyshortver)s/site-packages/scipy-1.0.0-py3.6-linux-x86_64.egg/scipy'],
diff --git a/s/six/six-1.11.0-Python-3.6.2-base.eb b/s/six/six-1.11.0-Python-3.6.2-base.eb
new file mode 100644
index 00000000..75bf7ddc
--- /dev/null
+++ b/s/six/six-1.11.0-Python-3.6.2-base.eb
@@ -0,0 +1,25 @@
+# IT4Innovations 2018
+
+easyblock = "PythonPackage"
+name = 'six'
+version = '1.11.0'
+versionsuffix = "-Python-%(pyver)s-base"
+
+homepage = 'https://github.com/benjaminp/six'
+description = 'Python 2 and 3 compatibility library.'
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://github.com/benjaminp/six/archive/']
+sources = ['%(version)s.tar.gz']
+
+dependencies = [
+    ('Python', '3.6.2', '-base'),
+]
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python3.6/site-packages/%(name)s-%(version)s-py3.6.egg'],
+}
+
+moduleclass = 'vis'