diff --git a/meta-sysmocom-bsp/recipes-apps/images/image-manifest.inc b/meta-sysmocom-bsp/recipes-apps/images/image-manifest.inc
new file mode 100644
index 0000000000..a9089a182d
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-apps/images/image-manifest.inc
@@ -0,0 +1,10 @@
+create_manifest() {
+    printf "Build_Date: %s\n" "`date -R`" > ${IMAGE_ROOTFS}/etc/sysmocom.manifest
+    printf "UUID: %s\n" "`uuidgen -r`" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest
+    printf "Machine: %s\n" "${MACHINE}" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest
+    printf "Image: %s\n" "${IMAGE_BASENAME}" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest
+    printf "Distro: %s\n" "${DISTRO}" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest
+    printf "Distro_Version: %s\n" "${DISTRO_VERSION}" >> ${IMAGE_ROOTFS}/etc/sysmocom.manifest
+}
+
+IMAGE_PREPROCESS_COMMAND += "create_manifest; "
diff --git a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-core-image-minimal.bb b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-core-image-minimal.bb
index a53b9a2fd1..fa50665b16 100644
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-core-image-minimal.bb
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-core-image-minimal.bb
@@ -3,6 +3,7 @@ IMAGE_LINGUAS = " "
 LICENSE = "MIT"
 
 inherit core-image
+require recipes-apps/images/image-manifest.inc
 
 IMAGE_ROOTFS_SIZE = "8192"
 
diff --git a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-image.inc b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-image.inc
index d7a685d799..3948e7ba87 100644
--- a/meta-sysmocom-bsp/recipes-apps/images/sysmocom-image.inc
+++ b/meta-sysmocom-bsp/recipes-apps/images/sysmocom-image.inc
@@ -1,10 +1,11 @@
-DEPENDS = "${MACHINE_EXTRA_RDEPENDS}"
+DEPENDS = "${MACHINE_EXTRA_RDEPENDS} util-linux-native"
 IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${ROOTFS_PKGMANAGE} packagegroup-osmocom task-sysmocom task-sysmocom-debug task-sysmocom-tools ${MACHINE_EXTRA_RDEPENDS} "
 IMAGE_LINGUAS = " "
 IMAGE_FEATURES += " package-management "
 LICENSE = "MIT"
 
 inherit core-image
+require recipes-apps/images/image-manifest.inc
 
 IMAGE_ROOTFS_SIZE = "32768"
 
diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
index a65793d46d..209719f555 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r17"
+PR = "r19"
 
 RDEPENDS_${PN} = "\
 	task-sysmocom-tools \
@@ -12,4 +12,5 @@ RDEPENDS_${PN} = "\
 	ppp rsync sed usbutils openvpn iperf \
 	lcr cronie iproute2 i2c-tools cu \
 	python-pyserial python-pexpect bridge-utils \
-	pciutils nfacct logrotate"
+	pciutils nfacct logrotate dnsmasq ifupdown \
+	logrotate python-jsonrpclib"
diff --git a/meta-sysmocom-bsp/recipes-extra/python/python-jsonrpclib_git.bb b/meta-sysmocom-bsp/recipes-extra/python/python-jsonrpclib_git.bb
new file mode 100644
index 0000000000..867b7b4803
--- /dev/null
+++ b/meta-sysmocom-bsp/recipes-extra/python/python-jsonrpclib_git.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Implementation of the JSON-RPC specification for python"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cdbf8d74b765504fbdf8e154bb4458a1"
+PV = "0.1.3+git${SRCPV}"
+PR = "r0"
+
+SRCREV = "b59217c971603a30648b041c84f85159afb2ec31"
+
+SRC_URI = "git://github.com/joshmarshall/jsonrpclib.git"
+S = "${WORKDIR}/git"
+
+inherit distutils
+
+# python-threading is needed for SimpleJSONRPCServer
+RDEPENDS_${PN} = "\
+    python-json \
+    python-xmlrpc \
+    python-threading \
+"