diff --git a/configs/qemux86-64_config b/configs/qemux86-64_config
index 7113688..6b0599d 100644
--- a/configs/qemux86-64_config
+++ b/configs/qemux86-64_config
@@ -2,7 +2,7 @@
 #
 # This has been tested on images generated with the following command:
 #
-#    mkosi -d ubuntu -r bionic -t gpt_ext4 -b --checksum --password password -o image.raw
+#    mkosi -d ubuntu -r bionic -t gpt_ext4 -b --checksum --password password --package=openssh-server,dhcpcd5 -o image.raw
 #
 # Converted with the following command:
 #
diff --git a/mender-convert-modify b/mender-convert-modify
index 9287441..bebec9b 100755
--- a/mender-convert-modify
+++ b/mender-convert-modify
@@ -143,7 +143,9 @@ initrd_imagetype=initrd
 EOF
 
   run_and_log_cmd "ln -s ${kernel_imagetype} work/rootfs/boot/kernel"
-  run_and_log_cmd "ln -s ${initrd_imagetype} work/rootfs/boot/initrd"
+  if [ "${initrd_imagetype}" != "" ]; then
+    run_and_log_cmd "ln -s ${initrd_imagetype} work/rootfs/boot/initrd"
+  fi
 
   # For partuuid support grub.cfg expects dedicated variables to be added
   if [ "${MENDER_ENABLE_PARTUUID}" == "y" ]; then