diff --git a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/xorg.conf b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf
similarity index 100%
rename from meta-emenlow/packages/xorg-xserver/xserver-xf86-config/xorg.conf
rename to meta-emenlow/packages/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf
diff --git a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 1e9c3789e5..4b8d0e656b 100644
--- a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -1 +1,3 @@
-FILESPATH := "${FILESPATH}:${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
+FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
+