diff --git a/x/X11/.X11-20170314-test.eb.swp b/x/X11/.X11-20170314-test.eb.swp
index 6e0e4e95..7012ac10 100644
Binary files a/x/X11/.X11-20170314-test.eb.swp and b/x/X11/.X11-20170314-test.eb.swp differ
diff --git a/x/X11/X11-20170314-test.eb b/x/X11/X11-20170314-test.eb
index bf564078..1bec07f9 100644
--- a/x/X11/X11-20170314-test.eb
+++ b/x/X11/X11-20170314-test.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('zlib', '1.2.11'),
     ('Mesa', '17.0.2', '', ('intel', '2017a')),
     ('nettle', '3.3', '', ('intel', '2017a')),
-    ('XKeyboardConfig', '2.21'),
+#    ('XKeyboardConfig', '2.21'),
 ]
 builddependencies = [
     ('Autotools', '20150215'),
@@ -49,7 +49,7 @@ common_specs = {
 server_specs = {
     'sources': [SOURCE_TAR_GZ],
     'start_dir': '%(name)s-%(version)s',
-    'configopts': '--disable-glamor --enable-suid-wrapper --disable-systemd-logind',
+    'configopts': '--disable-glamor --enable-suid-wrapper --disable-systemd-logind -enable-install-setuid --with-xkb-path=/apps/all/X11/20170314-test/share/X11/xkb', #--with-xkb-path=%(installdir)s/share/X11/xkb
 }
 
 
@@ -158,9 +158,9 @@ preconfigopts = "if [ ! -f configure ]; then ./autogen.sh; fi && "
 modluafooter = 'add_property("state","testing")'
 
 #xkbcommon configuration dir
-postinstallcmds = [
-	'ln -s %(installdir)s/share/xcb %(installdir)s/share/X11/xkb'
-]
+#postinstallcmds = [
+#	'ln -s %(installdir)s/share/xcb %(installdir)s/share/X11/xkb'
+#]
 
 # specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
 full_sanity_check = True
diff --git a/x/xorg-server/.xorg-server-1.19.3-intel-2017a.eb.swp b/x/xorg-server/.xorg-server-1.19.3-intel-2017a.eb.swp
deleted file mode 100644
index f1524cd5..00000000
Binary files a/x/xorg-server/.xorg-server-1.19.3-intel-2017a.eb.swp and /dev/null differ