diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf/10-adbd-configfs.conf b/meta-oe/recipes-devtools/android-tools/android-tools-conf/10-adbd-configfs.conf
index 7971f319c3..b91b16ee11 100644
--- a/meta-oe/recipes-devtools/android-tools/android-tools-conf/10-adbd-configfs.conf
+++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf/10-adbd-configfs.conf
@@ -5,3 +5,12 @@ Environment=ANDROID_GADGET_UDC_DELAY=0
 ExecStartPre=/usr/bin/android-gadget-setup
 ExecStartPost=/usr/bin/android-gadget-start
 ExecStopPost=/usr/bin/android-gadget-cleanup
+
+[Install]
+# android-gadget-start binds the gadget only once, to the first UDC that
+# exists at that point. The UDC driver (or its PHY driver) can be a module
+# that udev loads only after basic.target has been reached, so start adbd
+# when a UDC appears: systemd's udev rules start usb-gadget.target when a
+# UDC is registered.
+WantedBy=
+WantedBy=usb-gadget.target
