diff --git a/yocto-dora/busybox_1.21.1.bbappend b/yocto-dora/busybox_1.21.1.bbappend
new file mode 100644
index 0000000..641aeb3
--- /dev/null
+++ b/yocto-dora/busybox_1.21.1.bbappend
@@ -0,0 +1,4 @@
+# PN/PV are wrong inside the .inc file with 1.19.1
+SYSMOCOM_ORIG_PV := "${PV}"
+require recipes-core/busybox/${PN}_sysmocom.inc
+require recipes-core/busybox/${PN}_sysmocom_systemd.inc
diff --git a/yocto-dora/dbus_1.6.10.bbappend b/yocto-dora/dbus_1.6.10.bbappend
new file mode 100644
index 0000000..0ada2aa
--- /dev/null
+++ b/yocto-dora/dbus_1.6.10.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom_systemd.inc
diff --git a/yocto-master/dropbear_2012.55.bbappend b/yocto-dora/dropbear_2013.58.bbappend
similarity index 100%
rename from yocto-master/dropbear_2012.55.bbappend
rename to yocto-dora/dropbear_2013.58.bbappend
diff --git a/yocto-master/netbase_5.0.bbappend b/yocto-dora/init-ifupdown_1.0.bbappend
similarity index 100%
rename from yocto-master/netbase_5.0.bbappend
rename to yocto-dora/init-ifupdown_1.0.bbappend
diff --git a/yocto-dora/netbase_5.1.bbappend b/yocto-dora/netbase_5.1.bbappend
new file mode 100644
index 0000000..5e3605f
--- /dev/null
+++ b/yocto-dora/netbase_5.1.bbappend
@@ -0,0 +1 @@
+require recipes-bsp/netbase/${PN}_sysmocom.inc
diff --git a/yocto-master/systemd_199.bbappend b/yocto-dora/pkgconfig_0.28.bbappend
similarity index 100%
rename from yocto-master/systemd_199.bbappend
rename to yocto-dora/pkgconfig_0.28.bbappend
diff --git a/yocto-shared/pkgconfig_0.25.bbappend b/yocto-dora/systemd_206.bbappend
similarity index 100%
rename from yocto-shared/pkgconfig_0.25.bbappend
rename to yocto-dora/systemd_206.bbappend
diff --git a/yocto-dora/u-boot_2013.07.bbappend b/yocto-dora/u-boot_2013.07.bbappend
new file mode 100644
index 0000000..34003ac
--- /dev/null
+++ b/yocto-dora/u-boot_2013.07.bbappend
@@ -0,0 +1 @@
+require recipes-sysmobts/uboot/${PN}_sysmocom.inc
diff --git a/yocto-dora/udev_182.bbappend b/yocto-dora/udev_182.bbappend
new file mode 100644
index 0000000..9e03591
--- /dev/null
+++ b/yocto-dora/udev_182.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom.inc
diff --git a/yocto-dora/update-rc.d_0.7.bbappend b/yocto-dora/update-rc.d_0.7.bbappend
new file mode 100644
index 0000000..ec787dc
--- /dev/null
+++ b/yocto-dora/update-rc.d_0.7.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_angstrom.inc
diff --git a/yocto-dora/watchdog_5.13.bbappend b/yocto-dora/watchdog_5.13.bbappend
new file mode 100644
index 0000000..57590db
--- /dev/null
+++ b/yocto-dora/watchdog_5.13.bbappend
@@ -0,0 +1 @@
+require recipes-bsp/watchdog/${PN}_sysmocom.inc
diff --git a/yocto-edison/pkgconfig_0.25.bbappend b/yocto-edison/pkgconfig_0.25.bbappend
new file mode 100644
index 0000000..9e03591
--- /dev/null
+++ b/yocto-edison/pkgconfig_0.25.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom.inc
diff --git a/yocto-master/busybox_1.20.2.bbappend b/yocto-master/busybox_1.21.1.bbappend
similarity index 100%
rename from yocto-master/busybox_1.20.2.bbappend
rename to yocto-master/busybox_1.21.1.bbappend
diff --git a/yocto-master/dropbear_2013.58.bbappend b/yocto-master/dropbear_2013.58.bbappend
new file mode 100644
index 0000000..a3a97a3
--- /dev/null
+++ b/yocto-master/dropbear_2013.58.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/dropbear/${PN}_sysmocom.inc
diff --git a/yocto-master/netbase_5.1.bbappend b/yocto-master/netbase_5.1.bbappend
new file mode 100644
index 0000000..5e3605f
--- /dev/null
+++ b/yocto-master/netbase_5.1.bbappend
@@ -0,0 +1 @@
+require recipes-bsp/netbase/${PN}_sysmocom.inc
diff --git a/yocto-master/pkgconfig_0.28.bbappend b/yocto-master/pkgconfig_0.28.bbappend
new file mode 100644
index 0000000..9e03591
--- /dev/null
+++ b/yocto-master/pkgconfig_0.28.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom.inc
diff --git a/yocto-master/systemd_204.bbappend b/yocto-master/systemd_204.bbappend
new file mode 100644
index 0000000..9e03591
--- /dev/null
+++ b/yocto-master/systemd_204.bbappend
@@ -0,0 +1 @@
+require recipes-fixes/${PN}/${PN}_sysmocom.inc