diff --git a/buildconf/conf-notes.txt b/buildconf/conf-notes.txt
index 2f54f5c..36009da 100644
--- a/buildconf/conf-notes.txt
+++ b/buildconf/conf-notes.txt
@@ -1,9 +1,8 @@
 Common targets are:
+    console-image
     core-image-minimal
     core-image-sato
     meta-toolchain
     adt-installer
     meta-ide-support
 
-You can also run generated qemu images with a command like 'runqemu qemux86'
-
diff --git a/conf/layer.conf b/conf/layer.conf
index 21d33a7..71a865b 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -2,11 +2,13 @@
 BBPATH .= ":${LAYERDIR}"
 
 # We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend"
+BBFILES += " \
+	${LAYERDIR}/recipes-*/*/*.bb \
+	${LAYERDIR}/images/*.bb \
+	${LAYERDIR}/recipes-*/*/*.bbappend \
+"
 
 BBFILE_COLLECTIONS += "meta-bbb"
 BBFILE_PATTERN_meta-bbb = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-bbb = "7"
 
-IMAGE_INSTALL_append = " wireless-tools wpa-supplicant linux-firmware-rtl8192cu"
diff --git a/images/console-image.bb b/images/console-image.bb
new file mode 100644
index 0000000..d40cdca
--- /dev/null
+++ b/images/console-image.bb
@@ -0,0 +1,78 @@
+SUMMARY = "A console image with some additional tools"
+HOMEPAGE = "https://blackfinn.de"
+LICENSE = "MIT"
+
+IMAGE_FEATURES += "package-management"
+
+inherit core-image
+
+CORE_OS = " \
+    openssh \
+    openssh-keygen \
+    openssh-sftp-server \
+    psplash \
+    tzdata \
+"
+
+KERNEL_EXTRA_INSTALL = " \
+    kernel-modules \
+ "
+
+WIFI_SUPPORT = " \
+    iw \
+    linux-firmware-rtl8192cu \
+    wireless-tools \
+    wpa-supplicant \
+ "
+
+DEV_SDK_INSTALL = " \
+    file \
+    git \
+    make \
+    perl-modules \
+    pkgconfig \
+    python-modules \
+ "
+
+EXTRA_TOOLS_INSTALL = " \
+    acpid \
+    bc \
+    bzip2 \
+    ethtool \
+    findutils \
+    i2c-tools \
+    less \
+    procps \
+    rsync \
+    sysfsutils \
+    unzip \
+    util-linux \
+    util-linux-blkid \
+    wget \
+    curl \
+    zip \
+ "
+
+IMAGE_INSTALL += " \
+    ${CORE_OS} \
+    ${DEV_SDK_INSTALL} \
+    ${EXTRA_TOOLS_INSTALL} \
+    ${KERNEL_EXTRA_INSTALL} \
+    ${WIFI_SUPPORT} \
+ "
+
+set_local_timezone() {
+    ln -sf /usr/share/zoneinfo/Etc/UTC ${IMAGE_ROOTFS}/etc/localtime
+}
+
+disable_bootlogd() {
+    echo BOOTLOGD_ENABLE=no > ${IMAGE_ROOTFS}/etc/default/bootlogd
+}
+
+ROOTFS_POSTPROCESS_COMMAND += " \
+    set_local_timezone ; \
+    disable_bootlogd ; \
+ "
+
+export IMAGE_BASENAME = "console-image"
+