diff --git a/fido-device-onboard.spec b/fido-device-onboard.spec
index 7fbf204..d1d936b 100644
--- a/fido-device-onboard.spec
+++ b/fido-device-onboard.spec
@@ -8,7 +8,7 @@ Version:        0.4.7
 %forgemeta
 
 Name:           fido-device-onboard
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A rust implementation of the FIDO Device Onboard Specification
 
 # Apache-2.0
@@ -40,6 +40,7 @@ Source2:        %{name}-rs-%{commit}-vendor-patched.tar.xz
 %else
 Source2:        %{name}-rs-%{version}-vendor-patched.tar.xz
 %endif
+Patch0:         rhbz2168089.patch
 
 ExclusiveArch:  %{rust_arches}
 # Needs, at least, tss bindings regen
@@ -62,6 +63,7 @@ BuildRequires:  tpm2-tss-devel
 
 %prep
 %forgesetup
+%patch0 -p1
 %cargo_prep
 
 # Vendored crates
@@ -240,6 +242,9 @@ Requires: fdo-owner-cli
 %systemd_postun_with_restart fdo-aio.service
 
 %changelog
+* Wed Feb 15 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.7-2
+- Upstream fix for rhbz#2168089
+
 * Wed Nov 30 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 0.4.7-1
 - Update to 0.4.7
 - Package updates and cleanup
diff --git a/rhbz2168089.patch b/rhbz2168089.patch
new file mode 100644
index 0000000..4cb5e27
--- /dev/null
+++ b/rhbz2168089.patch
@@ -0,0 +1,27 @@
+From a58510d8ea798701745bf7513364dbfc485f08fb Mon Sep 17 00:00:00 2001
+From: Irene Diez <idiez@redhat.com>
+Date: Wed, 15 Feb 2023 16:12:59 +0100
+Subject: [PATCH] fix: owner-onboarding service should also start
+ serviceinfoapi service
+
+When using systemd units the fdo-owner-onboarding-server.service should
+also start fdo-serviceinfo-api-server.
+
+Signed-off-by: Irene Diez <idiez@redhat.com>
+---
+ examples/systemd/fdo-owner-onboarding-server.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/examples/systemd/fdo-owner-onboarding-server.service b/examples/systemd/fdo-owner-onboarding-server.service
+index 97d3ee49..dc875ce2 100644
+--- a/examples/systemd/fdo-owner-onboarding-server.service
++++ b/examples/systemd/fdo-owner-onboarding-server.service
+@@ -5,6 +5,7 @@ After=network-online.target
+ [Service]
+ Environment=LOG_LEVEL=info
+ ExecStart=/usr/libexec/fdo/fdo-owner-onboarding-server
++ExecStartPost=/usr/libexec/fdo/fdo-serviceinfo-api-server
+ # restart and failure condition
+ 
+ [Install]
+