diff --git a/a/ATK/ATK-2.20.0.eb b/a/ATK/ATK-2.20.0.eb
new file mode 100644
index 00000000..62ae3e24
--- /dev/null
+++ b/a/ATK/ATK-2.20.0.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': 'dummy', 'version': ''}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.52.0'),
+    ('GObject-Introspection', '1.52.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/a/ant/ant-1.9.7-Java-1.8.0_121.eb b/a/ant/ant-1.9.7-Java-1.8.0_121.eb
new file mode 100644
index 00000000..c501c7c6
--- /dev/null
+++ b/a/ant/ant-1.9.7-Java-1.8.0_121.eb
@@ -0,0 +1,25 @@
+name = 'ant'
+version = '1.9.7'
+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.8.0_121')]
+
+builddependencies = [('JUnit', '4.12', versionsuffix)]
+
+sanity_check_paths = {
+    'files': ['bin/ant', 'lib/ant.jar', 'lib/ant.jar'],
+    'dirs': [],
+}
+
+modextravars = {'ANT_HOME': '%(installdir)s'}
+
+moduleclass = 'devel'
diff --git a/b/Boost/Boost-1.63.0-foss-2016a-Python-2.7.13.eb b/b/Boost/Boost-1.63.0-foss-2016a-Python-2.7.13.eb
new file mode 100644
index 00000000..13ea4be4
--- /dev/null
+++ b/b/Boost/Boost-1.63.0-foss-2016a-Python-2.7.13.eb
@@ -0,0 +1,28 @@
+name = 'Boost'
+version = '1.63.0'
+
+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('.'))]
+
+pythonversion = '2.7.13'
+versionsuffix = '-Python-%s' % pythonversion
+
+dependencies = [
+    ('bzip2', '1.0.6', '', True),
+    ('zlib', '1.2.11', '', True),
+    ('Python', pythonversion, '', True)
+]
+
+configopts = '--with-python=$EBROOTPYTHON/bin/python'
+buildopts = '-fPIC &&'
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/c/Caffe/.Caffe-1.0-foss-2016a-CUDA-8.0.44-Python-2.7.13.eb.swp b/c/Caffe/.Caffe-1.0-foss-2016a-CUDA-8.0.44-Python-2.7.13.eb.swp
new file mode 100644
index 00000000..9f09220a
Binary files /dev/null and b/c/Caffe/.Caffe-1.0-foss-2016a-CUDA-8.0.44-Python-2.7.13.eb.swp differ
diff --git a/c/Caffe/Caffe-1.0-foss-2016a-CUDA-8.0.44-Python-2.7.13.eb b/c/Caffe/Caffe-1.0-foss-2016a-CUDA-8.0.44-Python-2.7.13.eb
new file mode 100644
index 00000000..acb9eeea
--- /dev/null
+++ b/c/Caffe/Caffe-1.0-foss-2016a-CUDA-8.0.44-Python-2.7.13.eb
@@ -0,0 +1,57 @@
+easyblock = 'CMakeMake'
+
+name = 'Caffe'
+version = '1.0'
+
+cudaversion = '8.0.44'
+versionsuffix = '-CUDA-%s-Python-%%(pyver)s' % cudaversion
+
+homepage = 'https://github.com/BVLC/caffe'
+description = """
+Caffe is a deep learning framework made with expression, speed, 
+and modularity in mind. It is developed by the Berkeley Vision 
+and Learning Center (BVLC) and community contributors.
+"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+toolchainopts = {'optarch': True, 'pic': True}
+
+sources = ['%(version)s.tar.gz']
+source_urls = ['https://github.com/BVLC/caffe/archive/']
+
+builddependencies = [
+    ('CMake', '3.8.1', '', True),
+]
+
+protobuf_ver = '3.2.0'
+
+dependencies = [
+    ('glog', '0.3.4', '', True),
+    ('gflags', '2.1.2', '', True),
+    ('OpenCV', '3.1.0', '', True),
+    ('CUDA', cudaversion, '', True),
+    ('cuDNN', '5.1', '-CUDA-%s' % cudaversion, True),
+    ('LMDB', '0.9.18', '', True),
+    ('LevelDB', '1.18', '', True),
+    ('snappy', '1.1.3', '', True),
+    ('protobuf', protobuf_ver),
+#   ('protobuf-python', protobuf_ver, '-Python-%(pyver)s'),
+    ('HDF5', '1.8.16', '-serial'),
+    ('Boost', '1.63.0', '-Python-%(pyver)s'),
+    ('Python', '2.7.13', '', True),
+    ('scikit-image', '0.12.3', '-Python-%(pyver)s', True)
+]
+
+configopts = '-DBLAS=open'
+
+modextrapaths = {'PYTHONPATH': ['python']}
+
+sanity_check_paths = {
+    'files': ['bin/caffe'] +
+             ['include/caffe/proto/caffe.pb.h'],
+    'dirs': [],
+}
+
+sanity_check_commands = [('python', "-c 'import caffe'")]
+
+moduleclass = 'devel'
diff --git a/f/FFmpeg/FFmpeg-3.0.2-intel-2016a.eb b/f/FFmpeg/FFmpeg-3.0.2.eb
similarity index 89%
rename from f/FFmpeg/FFmpeg-3.0.2-intel-2016a.eb
rename to f/FFmpeg/FFmpeg-3.0.2.eb
index fb0c75a2..dd8002aa 100644
--- a/f/FFmpeg/FFmpeg-3.0.2-intel-2016a.eb
+++ b/f/FFmpeg/FFmpeg-3.0.2.eb
@@ -6,14 +6,14 @@ 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'}
+toolchain = {'name': 'dummy', 'version': ''}
 
 sources = [SOURCELOWER_TAR_BZ2]
 source_urls = ['http://ffmpeg.org/releases/']
 
 dependencies = [
-    ('NASM', '2.12.01'),
-    ('zlib', '1.2.8'),
+    ('NASM', '2.12.02'),
+    ('zlib', '1.2.11'),
     ('x264', '20160430'),
 ]
 
diff --git a/f/freetype/freetype-2.6.3.eb b/f/freetype/freetype-2.6.3.eb
new file mode 100644
index 00000000..377d1682
--- /dev/null
+++ b/f/freetype/freetype-2.6.3.eb
@@ -0,0 +1,21 @@
+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': 'dummy', 'version': ''}
+
+source_urls = [GNU_SAVANNAH_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [('libpng', '1.6.29')]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
diff --git a/g/GST-plugins-base/GST-plugins-base-1.6.4.eb b/g/GST-plugins-base/GST-plugins-base-1.6.4.eb
new file mode 100644
index 00000000..33a45b55
--- /dev/null
+++ b/g/GST-plugins-base/GST-plugins-base-1.6.4.eb
@@ -0,0 +1,34 @@
+easyblock = 'ConfigureMake'
+
+name = 'GST-plugins-base'
+version = '1.6.4'
+
+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': 'dummy', 'version': ''}
+
+source_urls = ['http://gstreamer.freedesktop.org/src/gst-plugins-base']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [('GStreamer', '1.6.4')]
+
+builddependencies = [
+    ('Bison', '3.0.4', '', True),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gst-%s-1.0' % x for x in ['discoverer', 'play']] +
+             ['lib/libgst%s-1.0.%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/g/GStreamer/GStreamer-1.6.4.eb b/g/GStreamer/GStreamer-1.6.4.eb
new file mode 100644
index 00000000..308ecbe6
--- /dev/null
+++ b/g/GStreamer/GStreamer-1.6.4.eb
@@ -0,0 +1,39 @@
+easyblock = 'ConfigureMake'
+
+name = 'GStreamer'
+version = '1.6.4'
+
+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': 'dummy', 'version': ''}
+
+source_urls = ['http://gstreamer.freedesktop.org/src/gstreamer']
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.52.0'),
+    ('GObject-Introspection', '1.52.0'),
+    ('zlib', '1.2.11'),
+]
+
+builddependencies = [
+    ('Bison', '3.0.4'),
+]
+
+sanity_check_paths = {
+    'files': ['bin/gst-%s-1.0' % x for x in ['inspect', 'typefind', 'launch']] +
+             ['lib/libgst%s-1.0.%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/g/GTK+/GTK+-2.24.30.eb b/g/GTK+/GTK+-2.24.30.eb
new file mode 100644
index 00000000..a366611a
--- /dev/null
+++ b/g/GTK+/GTK+-2.24.30.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': 'dummy', 'version': ''}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('ATK', '2.20.0'),
+    ('Gdk-Pixbuf', '2.35.1'),
+    ('Pango', '1.40.5'),
+    ('GObject-Introspection', '1.52.0'),
+]
+
+configopts = "--disable-silent-rules --disable-glibtest --enable-introspection=yes --disable-visibility "
+
+moduleclass = 'vis'
diff --git a/g/Gdk-Pixbuf/Gdk-Pixbuf-2.35.1.eb b/g/Gdk-Pixbuf/Gdk-Pixbuf-2.35.1.eb
new file mode 100644
index 00000000..e9dbc75f
--- /dev/null
+++ b/g/Gdk-Pixbuf/Gdk-Pixbuf-2.35.1.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': 'dummy', 'version': ''}
+
+source_urls = [FTPGNOME_SOURCE]
+sources = [SOURCELOWER_TAR_XZ]
+
+dependencies = [
+    ('GLib', '2.52.0'),
+    ('libjpeg-turbo', '1.5.1'),
+    ('libpng', '1.6.29'),
+    ('LibTIFF', '4.0.7'),
+    ('GObject-Introspection', '1.52.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/g/gflags/gflags-2.1.2.eb b/g/gflags/gflags-2.1.2.eb
new file mode 100644
index 00000000..2f7631c0
--- /dev/null
+++ b/g/gflags/gflags-2.1.2.eb
@@ -0,0 +1,33 @@
+easyblock = 'CMakeMake'
+
+name = 'gflags'
+version = '2.1.2'
+
+homepage = 'https://github.com/gflags/gflags'
+description = """
+The gflags package contains a C++ library that implements commandline flags 
+processing.  It includes built-in support for standard types such as string 
+and the ability to define flags in the source file in which they are used. 
+"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+toolchainopts = {'pic': True}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/gflags/gflags/archive/']
+
+builddependencies = [
+    ('CMake', '3.8.1'),
+]
+
+configopts = '-DBUILD_SHARED_LIBS=on -DBUILD_STATIC_LIBS=on'
+
+sanity_check_paths = {
+    'files': ['bin/gflags_completions.sh'] +
+             ['lib/%s' % x for x in ['libgflags.%s' % SHLIB_EXT,
+              'libgflags_nothreads.%s' % SHLIB_EXT, 'libgflags.a', 'libgflags_nothreads.a']] +
+             ['include/gflags/gflags_completions.h'],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/g/glog/glog-0.3.4.eb b/g/glog/glog-0.3.4.eb
new file mode 100644
index 00000000..81643ad9
--- /dev/null
+++ b/g/glog/glog-0.3.4.eb
@@ -0,0 +1,21 @@
+easyblock = 'ConfigureMake'
+
+name = 'glog'
+version = '0.3.4'
+
+homepage = 'https://github.com/google/glog'
+description = """
+A C++ implementation of the Google logging module.
+"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['v%(version)s.tar.gz']
+source_urls = ['https://github.com/google/glog/archive/']
+
+sanity_check_paths = {
+    'files': ['include/glog/logging.h', 'include/glog/raw_logging.h', 'lib/libglog.a', 'lib/libglog.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/j/JasPer/JasPer-1.900.1.eb b/j/JasPer/JasPer-1.900.1.eb
new file mode 100644
index 00000000..dab1ea77
--- /dev/null
+++ b/j/JasPer/JasPer-1.900.1.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': 'dummy', 'version': ''}
+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/l/LMDB/LMDB-0.9.18.eb b/l/LMDB/LMDB-0.9.18.eb
new file mode 100644
index 00000000..433011aa
--- /dev/null
+++ b/l/LMDB/LMDB-0.9.18.eb
@@ -0,0 +1,26 @@
+easyblock = 'MakeCp'
+
+name = 'LMDB'
+version = '0.9.18'
+
+homepage = 'https://github.com/LMDB/lmdb'
+description = """
+OpenLDAP's Lightning Memory-Mapped Database (LMDB) library.
+"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['%(name)s_%(version)s.tar.gz']
+source_urls = ['https://github.com/LMDB/lmdb/archive/']
+
+files_to_copy = [
+    (['liblmdb.a', 'liblmdb.%s' % SHLIB_EXT], 'lib'),
+    (['lmdb.h'], 'include')
+]
+
+sanity_check_paths = {
+    'files': ['include/lmdb.h', 'lib/liblmdb.a', 'lib/liblmdb.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/l/LevelDB/LevelDB-1.18-foss-2016a.eb b/l/LevelDB/LevelDB-1.18.eb
similarity index 69%
rename from l/LevelDB/LevelDB-1.18-foss-2016a.eb
rename to l/LevelDB/LevelDB-1.18.eb
index f3fb0f01..4838d424 100644
--- a/l/LevelDB/LevelDB-1.18-foss-2016a.eb
+++ b/l/LevelDB/LevelDB-1.18.eb
@@ -4,12 +4,10 @@ name = 'LevelDB'
 version = '1.18'
 
 homepage = 'https://github.com/google/leveldb'
-description = """
-LevelDB is a fast key-value storage library written at Google that provides an 
-ordered mapping from string keys to string values.
-"""
+description = """LevelDB is a fast key-value storage library written at Google that provides an
+ ordered mapping from string keys to string values."""
 
-toolchain = {'name': 'foss', 'version': '2016a'}
+toolchain = {'name': 'dummy', 'version': ''}
 
 sources = ['v%(version)s.tar.gz']
 source_urls = ['https://github.com/google/leveldb/archive/']
@@ -19,14 +17,14 @@ files_to_copy = [
     (['include/leveldb/*.h'], 'include/leveldb')
 ]
 
-postinstallcmds=[
+postinstallcmds = [
     'cd %(installdir)s/lib; ln -s libleveldb.so.%(version)s libleveldb.so.%(version_major)s',
     'cd %%(installdir)s/lib; ln -s libleveldb.so.%%(version)s libleveldb.%s' % SHLIB_EXT,
 ]
 
 
 sanity_check_paths = {
-    'files': ['include/leveldb/cache.h','include/leveldb/table.h',
+    'files': ['include/leveldb/cache.h', 'include/leveldb/table.h',
               'lib/libleveldb.a', 'lib/libleveldb.%s' % SHLIB_EXT],
     'dirs': [],
 }
diff --git a/m/matplotlib/matplotlib-1.5.1-Python-2.7.13-freetype-2.6.3.eb b/m/matplotlib/matplotlib-1.5.1-Python-2.7.13-freetype-2.6.3.eb
new file mode 100644
index 00000000..3e4dc819
--- /dev/null
+++ b/m/matplotlib/matplotlib-1.5.1-Python-2.7.13-freetype-2.6.3.eb
@@ -0,0 +1,47 @@
+easyblock = 'Bundle'
+
+name = 'matplotlib'
+version = '1.5.1'
+
+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': ''}
+
+# this is a bundle of Python packages
+exts_defaultclass = 'PythonPackage'
+
+freetype_ver = '2.6.3'
+versionsuffix = '-Python-%%(pyver)s-freetype-%s' % freetype_ver
+
+dependencies = [
+    ('Python', '2.7.13'),
+    ('freetype', freetype_ver),
+    ('libpng', '1.6.29'),
+]
+
+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/n/networkx/networkx-1.11-foss-2016a-Python-2.7.11.eb b/n/networkx/networkx-1.11-Python-2.7.13.eb
similarity index 87%
rename from n/networkx/networkx-1.11-foss-2016a-Python-2.7.11.eb
rename to n/networkx/networkx-1.11-Python-2.7.13.eb
index 8dde76eb..46264c73 100644
--- a/n/networkx/networkx-1.11-foss-2016a-Python-2.7.11.eb
+++ b/n/networkx/networkx-1.11-Python-2.7.13.eb
@@ -8,13 +8,13 @@ homepage = 'https://pypi.python.org/pypi/networkx'
 description = """NetworkX is a Python package for the creation, manipulation, and study of the structure, dynamics,
  and functions of complex networks."""
 
-toolchain = {'name': 'foss', 'version': '2016a'}
+toolchain = {'name': 'dummy', 'version': ''}
 
 source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
 
 dependencies = [
-    ('Python', '2.7.11'),
+    ('Python', '2.7.13'),
 ]
 
 sanity_check_paths = {
diff --git a/o/OpenCV/OpenCV-3.1.0-foss-2016a.eb b/o/OpenCV/OpenCV-3.1.0.eb
similarity index 78%
rename from o/OpenCV/OpenCV-3.1.0-foss-2016a.eb
rename to o/OpenCV/OpenCV-3.1.0.eb
index f835d278..e47439d9 100644
--- a/o/OpenCV/OpenCV-3.1.0-foss-2016a.eb
+++ b/o/OpenCV/OpenCV-3.1.0.eb
@@ -9,26 +9,26 @@ description = """OpenCV (Open Source Computer Vision Library) is an open source
  a common infrastructure for computer vision applications and to accelerate
  the use of machine perception in the commercial products."""
 
-toolchain = {'name': 'foss', 'version': '2016a'}
+toolchain = {'name': 'dummy', 'version': ''}
 
 source_urls = ['https://github.com/Itseez/opencv/archive/']
 sources = ['%(version)s.zip']
 
 builddependencies = [
-    ('CMake', '3.5.2'),
+    ('CMake', '3.8.1'),
 ]
 
 dependencies = [
-    ('Python', '2.7.11'),
-    ('zlib', '1.2.8'),
+    ('Python', '2.7.13'),
+    ('zlib', '1.2.11'),
     ('FFmpeg', '3.0.2'),
-    ('libjpeg-turbo', '1.4.2', '-NASM-2.12.01'),
-    ('libpng', '1.6.21'),
-    ('LibTIFF', '4.0.6'),
+    ('libjpeg-turbo', '1.5.1'),
+    ('libpng', '1.6.29'),
+    ('LibTIFF', '4.0.7'),
     ('JasPer', '1.900.1'),
-    ('Java', '1.8.0_92', '', True),
-    ('ant', '1.9.7', '-Java-%(javaver)s', True),
-    ('GLib', '2.48.0'),
+    ('Java', '1.8.0_121'),
+    ('ant', '1.9.7', '-Java-%(javaver)s'),
+    ('GLib', '2.52.0'),
     ('GTK+', '2.24.30'),
     ('GStreamer', '1.6.4'),
     ('GST-plugins-base', '1.6.4'),
@@ -46,15 +46,14 @@ configopts += '-DPNG_LIBRARY=$EBROOTLIBPNG/lib/libpng.%s ' % SHLIB_EXT
 configopts += '-DPNG_INCLUDE_DIR=$EBROOTLIBPNG/include '
 configopts += '-DJPEG_LIBRARY=$EBROOTLIBJPEGMINTURBO/lib/libjpeg.%s ' % SHLIB_EXT
 configopts += '-DJPEG_INCLUDE_DIR=$EBROOTLIBJPEGMINTURBO/include '
-configopts += '-DJASPER_LIBRARY=$EBROOTJASPER/lib/libjasper.a '
-configopts += '-DJASPER_INCLUDE_DIR=$EBROOTJASPER/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 ] +
-             ['lib/python%%(pyshortver)s/site-packages/cv2.%s' % SHLIB_EXT ] +
              ['bin/opencv_%s' % x for x in ['annotation', 'createsamples', 'traincascade']],
     'dirs': ['include']
 }
diff --git a/p/Pillow/Pillow-3.2.0-foss-2016a-Python-2.7.11-freetype-2.6.3.eb b/p/Pillow/Pillow-3.2.0-Python-2.7.13-freetype-2.6.3.eb
similarity index 72%
rename from p/Pillow/Pillow-3.2.0-foss-2016a-Python-2.7.11-freetype-2.6.3.eb
rename to p/Pillow/Pillow-3.2.0-Python-2.7.13-freetype-2.6.3.eb
index 16cea8d3..0093a1ec 100644
--- a/p/Pillow/Pillow-3.2.0-foss-2016a-Python-2.7.11-freetype-2.6.3.eb
+++ b/p/Pillow/Pillow-3.2.0-Python-2.7.13-freetype-2.6.3.eb
@@ -8,7 +8,7 @@ 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': 'foss', 'version': '2016a'}
+toolchain = {'name': 'dummy', 'version': ''}
 
 source_urls = [PYPI_SOURCE]
 sources = [SOURCE_TAR_GZ]
@@ -17,11 +17,11 @@ freetype_ver = '2.6.3'
 versionsuffix += '-freetype-%s' % freetype_ver
 
 dependencies = [
-    ('Python', '2.7.11'),
-    ('libjpeg-turbo', '1.4.2','-NASM-2.12.01'),
-    ('libpng', '1.6.21'),
-    ('zlib', '1.2.8'),
-    ('LibTIFF', '4.0.6'),
+    ('Python', '2.7.13'),
+    ('libjpeg-turbo', '1.5.1'),
+    ('libpng', '1.6.29'),
+    ('zlib', '1.2.11'),
+    ('LibTIFF', '4.0.7'),
     ('freetype', freetype_ver),
 ]
 
diff --git a/p/protobuf-python/protobuf-python-3.2.0-foss-2016a-Python-2.7.13.eb b/p/protobuf-python/protobuf-python-3.2.0-foss-2016a-Python-2.7.13.eb
new file mode 100644
index 00000000..c0c088c9
--- /dev/null
+++ b/p/protobuf-python/protobuf-python-3.2.0-foss-2016a-Python-2.7.13.eb
@@ -0,0 +1,29 @@
+easyblock = 'PythonPackage'
+
+name = 'protobuf-python'
+version = '3.2.0'
+versionsuffix= '-Python-%(pyver)s'
+
+homepage = 'https://github.com/google/protobuf/'
+description = """Python Protocol Buffers runtime library."""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/google/protobuf/archive/v%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+dependencies = [
+    ('Python', '2.7.13', '', True),
+    ('protobuf', version)
+]
+
+start_dir = 'python'
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+options = {'modulename': 'google.protobuf' }
+
+moduleclass = 'devel'
diff --git a/p/protobuf/protobuf-3.2.0-foss-2016a.eb b/p/protobuf/protobuf-3.2.0-foss-2016a.eb
new file mode 100644
index 00000000..bf27e633
--- /dev/null
+++ b/p/protobuf/protobuf-3.2.0-foss-2016a.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'protobuf'
+version = '3.2.0'
+
+homepage = 'https://github.com/google/protobuf/'
+description = """Google Protocol Buffers"""
+
+toolchain = {'name': 'foss', 'version': '2016a'}
+
+source_urls = ['https://github.com/google/protobuf/archive/v%(version)s/']
+sources = [SOURCE_TAR_GZ]
+
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = "./autogen.sh && "
+
+sanity_check_paths = {
+    'files': ['bin/protoc', 'lib/libprotobuf.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/p/protobuf/protobuf-3.2.0.eb b/p/protobuf/protobuf-3.2.0.eb
new file mode 100644
index 00000000..6ee68d0e
--- /dev/null
+++ b/p/protobuf/protobuf-3.2.0.eb
@@ -0,0 +1,23 @@
+easyblock = 'ConfigureMake'
+
+name = 'protobuf'
+version = '3.2.0'
+
+homepage = 'https://github.com/google/protobuf/'
+description = """Google Protocol Buffers"""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://github.com/google/protobuf/archive/v%(version)s/']
+sources = [SOURCE_TAR_GZ]
+
+builddependencies = [('Autotools', '20150215')]
+
+preconfigopts = "./autogen.sh && "
+
+sanity_check_paths = {
+    'files': ['bin/protoc', 'lib/libprotobuf.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/s/scikit-image/scikit-image-0.12.3-Python-2.7.13.eb b/s/scikit-image/scikit-image-0.12.3-Python-2.7.13.eb
new file mode 100644
index 00000000..74bee6a4
--- /dev/null
+++ b/s/scikit-image/scikit-image-0.12.3-Python-2.7.13.eb
@@ -0,0 +1,35 @@
+easyblock = 'PythonPackage'
+
+name = 'scikit-image'
+version = '0.12.3'
+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': 'dummy', 'version': ''}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+freetype_ver = '2.6.3'
+
+dependencies = [
+    ('Python', '2.7.13'),
+    ('Qhull', '2015.2'),
+    ('matplotlib', '1.5.1', versionsuffix + '-freetype-%s' % freetype_ver),
+    ('networkx', '1.11', versionsuffix),
+    ('Pillow', '3.2.0', versionsuffix + '-freetype-%s' % freetype_ver),
+]
+
+options = {'modulename': 'skimage'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
+}
+
+moduleclass = 'vis'
diff --git a/s/snappy/snappy-1.1.3.eb b/s/snappy/snappy-1.1.3.eb
new file mode 100644
index 00000000..530e564b
--- /dev/null
+++ b/s/snappy/snappy-1.1.3.eb
@@ -0,0 +1,21 @@
+easyblock = 'ConfigureMake'
+
+name = 'snappy'
+version = '1.1.3'
+
+homepage = 'https://github.com/google/snappy'
+description = """Snappy is a compression/decompression library. It does not aim
+for maximum compression, or compatibility with any other compression library;
+instead, it aims for very high speeds and reasonable compression."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+source_urls = ['https://github.com/google/snappy/releases/download/%(version)s']
+sources = [SOURCE_TAR_GZ]
+
+sanity_check_paths = {
+    'files': ['lib/libsnappy.%s' % SHLIB_EXT],
+    'dirs': ['include', 'share']
+}
+
+moduleclass = 'lib'
diff --git a/x/x264/x264-20160430.eb b/x/x264/x264-20160430.eb
new file mode 100644
index 00000000..51fa8ff4
--- /dev/null
+++ b/x/x264/x264-20160430.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': 'dummy', 'version': ''}
+
+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/y/Yasm/Yasm-1.3.0.eb b/y/Yasm/Yasm-1.3.0.eb
new file mode 100644
index 00000000..697657d6
--- /dev/null
+++ b/y/Yasm/Yasm-1.3.0.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': 'dummy', 'version': ''}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = ['http://www.tortall.net/projects/yasm/releases/']
+
+sanity_check_paths = {
+    'files': ['bin/yasm'],
+    'dirs': [],
+}
+
+moduleclass = 'lang'