diff --git a/meta-oe/recipes-core/dropbear/dropbear-systemd_v1.bb b/meta-oe/recipes-core/dropbear/dropbear-systemd_v1.bb
deleted file mode 100644
index b46c0e2a4a..0000000000
--- a/meta-oe/recipes-core/dropbear/dropbear-systemd_v1.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "Socket based activation for dropbear ssh server"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-
-inherit allarch
-
-SRC_URI = "file://dropbearkey.service \
-           file://dropbear@.service \
-           file://dropbear.socket \
-          "
-
-do_configure() {
-	:
-}
-
-do_compile() {
-	:
-}
-
-do_install() {
-	install -d ${D}${base_libdir}/systemd/system
-	install -m 0644 ${WORKDIR}/dropbear*.* ${D}${base_libdir}/systemd/system/
-}
-
-pkg_postinst_${PN} () {
-if test "x$D" != "x"; then
-	exit 1
-fi
-systemctl enable dropbear.socket
-ln -sf /dev/null ${base_libdir}/systemd/system/dropbear.service
-}
-
-pkg_postrm_${PN} () {
-systemctl disable dropbear.socket
-rm -f ${base_libdir}/systemd/system/dropbear.service
-}
-
-RDEPENDS_${PN} = "systemd dropbear"
-FILES_${PN} = "${base_libdir}/systemd/system"
-
diff --git a/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear.socket b/meta-oe/recipes-core/dropbear/dropbear/dropbear.socket
similarity index 100%
rename from meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear.socket
rename to meta-oe/recipes-core/dropbear/dropbear/dropbear.socket
diff --git a/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear@.service b/meta-oe/recipes-core/dropbear/dropbear/dropbear@.service
similarity index 100%
rename from meta-oe/recipes-core/dropbear/dropbear-systemd/dropbear@.service
rename to meta-oe/recipes-core/dropbear/dropbear/dropbear@.service
diff --git a/meta-oe/recipes-core/dropbear/dropbear-systemd/dropbearkey.service b/meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service
similarity index 100%
rename from meta-oe/recipes-core/dropbear/dropbear-systemd/dropbearkey.service
rename to meta-oe/recipes-core/dropbear/dropbear/dropbearkey.service
diff --git a/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend
new file mode 100644
index 0000000000..664b6ded36
--- /dev/null
+++ b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend
@@ -0,0 +1,33 @@
+inherit systemd
+
+PR .= ".meta-oe.1"
+
+# look for files in the layer first
+FILESEXTRAPATHS := "${THISDIR}/${PN}"
+
+SRC_URI += "file://dropbearkey.service \
+            file://dropbear@.service \
+            file://dropbear.socket"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE_${PN}-systemd = "dropbear.socket"
+
+do_install_append() {
+	install -d ${D}${base_libdir}/systemd/system
+	install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${base_libdir}/systemd/system/
+	install -m 0644 ${WORKDIR}/dropbear@.service ${D}${base_libdir}/systemd/system/
+	install -m 0644 ${WORKDIR}/dropbear.socket ${D}${base_libdir}/systemd/system/
+}
+
+PACKAGES += "${PN}-systemd"
+
+RDEPENDS_${PN}-systemd += "dropbear"
+FILES_${PN}-systemd = "${base_libdir}/systemd"
+
+pkg_postinst_${PN}-systemd_append() {
+ln -sf /dev/null $D${base_libdir}/systemd/system/dropbear.service
+}
+
+pkg_postrm_${PN}-systemd_append() {
+rm -f ${base_libdir}/systemd/system/dropbear.service
+}