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/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/o/OpenFOAM/OpenFOAM-4.1-intel-2015b.eb b/o/OpenFOAM/OpenFOAM-4.1-intel-2015b.eb
deleted file mode 100644
index 50887b15..00000000
--- a/o/OpenFOAM/OpenFOAM-4.1-intel-2015b.eb
+++ /dev/null
@@ -1,33 +0,0 @@
-name = 'OpenFOAM'
-version = '2.3.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'}
-
-source_urls = ['http://downloads.sourceforge.net/foam/%(version)s']
-sources = [
-    SOURCE_TGZ,
-    'ThirdParty-%(version)s.tgz',
-]
-
-patches = [
-    'cleanup-OpenFOAM-%(version)s.patch',
-    'OpenFOAM-%(version)s_libreadline.patch',
-    ('cleanup-ThirdParty-%(version)s.patch', ".."),  # patch should not be applied in OpenFOAM subdir
-]
-
-dependencies = [
-    ('libreadline', '6.2'),
-    ('SCOTCH', '6.0.0_esmumps'),
-    ('ncurses', '5.9'),
-]
-
-builddependencies = [('flex', '2.5.37')]
-
-moduleclass = 'cae'
-