diff --git a/recipes-apps/images/image-manifest.inc b/recipes-apps/images/image-manifest.inc
new file mode 100644
index 0000000..a9089a1
--- /dev/null
+++ b/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/recipes-apps/images/sysmocom-core-image-minimal.bb b/recipes-apps/images/sysmocom-core-image-minimal.bb
index a53b9a2..fa50665 100644
--- a/recipes-apps/images/sysmocom-core-image-minimal.bb
+++ b/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/recipes-apps/images/sysmocom-image.inc b/recipes-apps/images/sysmocom-image.inc
index d7a685d..3948e7b 100644
--- a/recipes-apps/images/sysmocom-image.inc
+++ b/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"