diff --git a/meta-qt5/conf/layer.conf b/meta-qt5/conf/layer.conf
index aacfd7843d..1549fd62f1 100644
--- a/meta-qt5/conf/layer.conf
+++ b/meta-qt5/conf/layer.conf
@@ -14,6 +14,11 @@ BBPATH .= ":${LAYERDIR}"
 # We have a recipes directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 
+# Add hacks for dora or master..
+BBFILES_META_QT5 = "${LAYERDIR}/yocto-${@dict([('1.5', 'dora')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'master')}/*.bbappend"
+BBFILES +=  "{BBFILES_META_QT5}"
+
+
 BBFILE_COLLECTIONS += "qt5-layer"
 BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/"
 
diff --git a/meta-qt5/recipes-devtools/cmake/cmake-native_2.8.11.2.bbappend b/meta-qt5/yocto-dora/cmake-native_2.8.11.2.bbappend
similarity index 100%
rename from meta-qt5/recipes-devtools/cmake/cmake-native_2.8.11.2.bbappend
rename to meta-qt5/yocto-dora/cmake-native_2.8.11.2.bbappend
diff --git a/meta-qt5/recipes-devtools/cmake/cmake_2.8.11.2.bbappend b/meta-qt5/yocto-dora/cmake_2.8.11.2.bbappend
similarity index 100%
rename from meta-qt5/recipes-devtools/cmake/cmake_2.8.11.2.bbappend
rename to meta-qt5/yocto-dora/cmake_2.8.11.2.bbappend