diff --git a/f/fontsproto/fontsproto-2.1.3.eb b/f/fontsproto/fontsproto-2.1.3.eb
new file mode 100644
index 00000000..d4886661
--- /dev/null
+++ b/f/fontsproto/fontsproto-2.1.3.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': 'dummy', 'version': ''}
+toolchainopts = {'optarch': True}
+
+sources = [SOURCE_TAR_GZ]
+source_urls = ['http://xorg.freedesktop.org/archive/individual/proto/']
+
+sanity_check_paths = {
+    'files' : [],
+    'dirs' : ['include/X11/fonts'],
+}
+
+moduleclass = 'devel'
diff --git a/f/freetype/freetype-2.5.3.eb b/f/freetype/freetype-2.5.3.eb
new file mode 100644
index 00000000..87aca433
--- /dev/null
+++ b/f/freetype/freetype-2.5.3.eb
@@ -0,0 +1,23 @@
+# Built with EasyBuild version 2.5.0 on 2016-02-15_15-30-41
+# Built with EasyBuild version 2.1.1 on 2015-07-23_10-52-15
+name = 'freetype'
+version = '2.5.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.12')]
+
+sanity_check_paths = {
+    'files': ['bin/freetype-config', 'lib/libfreetype.a', 'lib/libfreetype.so', 'lib/pkgconfig/freetype2.pc'],
+    'dirs': ['include/freetype2'],
+}
+
+moduleclass = 'vis'
\ No newline at end of file
diff --git a/k/kbproto/kbproto-1.0.7.eb b/k/kbproto/kbproto-1.0.7.eb
new file mode 100644
index 00000000..305f57dc
--- /dev/null
+++ b/k/kbproto/kbproto-1.0.7.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': 'dummy', 'version': ''}
+
+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/l/libfontenc/libfontenc-1.1.3.eb b/l/libfontenc/libfontenc-1.1.3.eb
new file mode 100644
index 00000000..9e403146
--- /dev/null
+++ b/l/libfontenc/libfontenc-1.1.3.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': 'dummy', 'version': ''}
+
+sources = [SOURCELOWER_TAR_GZ]
+source_urls = [XORG_LIB_SOURCE]
+
+builddependencies = [
+    ('xproto', '7.0.26'),
+]
+
+sanity_check_paths = {
+    'files': ['include/X11/fonts/fontenc.h', 'lib/libfontenc.%s' % SHLIB_EXT, 'lib/libfontenc.a'],
+    'dirs': [],
+}
+
+moduleclass = 'lib'
diff --git a/t/Tk/Tk-8.6.3.eb b/t/Tk/Tk-8.6.4.eb
old mode 100755
new mode 100644
similarity index 93%
rename from t/Tk/Tk-8.6.3.eb
rename to t/Tk/Tk-8.6.4.eb
index 5edc501a..3293c488
--- a/t/Tk/Tk-8.6.3.eb
+++ b/t/Tk/Tk-8.6.4.eb
@@ -8,7 +8,7 @@ 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': '2017.00'}
+toolchain = {'name': 'dummy', 'version': ''}
 
 source_urls = ["http://prdownloads.sourceforge.net/tcl"]
 sources = ['%(namelower)s%(version)s-src.tar.gz']
diff --git a/x/xcb-util b/x/xcb-util
deleted file mode 100644
index 8afbdc7d..00000000
--- a/x/xcb-util
+++ /dev/null
@@ -1,24 +0,0 @@
-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': 'dummy', 'version': ''}
-
-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'