diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json
index 120d0f83fe..9b793b35ed 100644
--- a/manifest-lock.x86_64.json
+++ b/manifest-lock.x86_64.json
@@ -57,6 +57,9 @@
     "bind-utils": {
       "evra": "32:9.11.22-1.fc32.x86_64"
     },
+    "bootupd": {
+      "evra": "0.1.1-1.fc32.x86_64"
+    },
     "bsdtar": {
       "evra": "3.4.3-1.fc32.x86_64"
     },
diff --git a/manifests/bootupd.yaml b/manifests/bootupd.yaml
new file mode 100644
index 0000000000..6d338d8cb1
--- /dev/null
+++ b/manifests/bootupd.yaml
@@ -0,0 +1,11 @@
+# Integration with https://github.com/coreos/bootupd
+# xref https://github.com/coreos/fedora-coreos-tracker/issues/510
+packages:
+  - bootupd
+
+postprocess:
+  - |
+    #!/bin/bash
+    set -xeuo pipefail
+    # Transforms /usr/lib/ostree-boot into a bootupd-compatible update payload
+    /usr/bin/bootupctl backend generate-update-metadata /
diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
index f61ff0bc42..9c612a17ca 100644
--- a/manifests/fedora-coreos-base.yaml
+++ b/manifests/fedora-coreos-base.yaml
@@ -172,3 +172,8 @@ packages-ppc64le:
   - irqbalance
 packages-aarch64:
   - irqbalance
+
+# See https://github.com/coreos/bootupd
+arch-include:
+  x86_64: bootupd.yaml
+  aarch64: bootupd.yaml
diff --git a/overlay.d/05core/usr/lib/systemd/system-preset/40-coreos.preset b/overlay.d/05core/usr/lib/systemd/system-preset/40-coreos.preset
index e3fc25b24d..d4c6fbd071 100644
--- a/overlay.d/05core/usr/lib/systemd/system-preset/40-coreos.preset
+++ b/overlay.d/05core/usr/lib/systemd/system-preset/40-coreos.preset
@@ -18,3 +18,5 @@ enable afterburn-sshkeys@.service
 enable zincati.service
 # Testing aid
 enable coreos-liveiso-success.service
+# See bootupd.yaml - not enabled by default right now
+# enable bootupd.socket
diff --git a/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset b/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
index 54c813d3fa..09165d105d 100644
--- a/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
+++ b/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
@@ -3,3 +3,4 @@ enable fedora-coreos-pinger.service
 # Provide information if no ignition is provided
 enable coreos-check-ignition-config.service
 enable coreos-check-ssh-keys.service
+
diff --git a/tests/kola/misc-ro b/tests/kola/misc-ro
index 7efb939b30..0a251d1036 100755
--- a/tests/kola/misc-ro
+++ b/tests/kola/misc-ro
@@ -55,6 +55,18 @@ ok conditional initrd networking
 if ! test -f /usr/share/licenses/fedora-coreos-config/LICENSE; then
     fatal missing LICENSE
 fi
+ok LICENSE
+
+case "$(arch)" in
+    x86_64|aarch64)
+        if systemctl is-enabled bootupd.socket; then
+            fatal "Not expecting bootupd.socket to be enabled"
+        fi
+        systemctl start bootupd.socket
+        bootupctl status
+        echo ok bootupctl
+        ;;
+esac
 
 # check that no files are unlabeled
 unlabeled=$(find /var /etc -context '*:unlabeled_t:*')