diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig
index 378a13ade..f68a4e46b 100644
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@@ -39,6 +39,7 @@ BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_NETWORK_MANAGER=y
 BR2_PACKAGE_NETWORK_MANAGER_TUI=y
 BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER=y
+BR2_PACKAGE_NETWORK_MANAGER_WAIT_BOOT=y
 BR2_PACKAGE_DOCKER_ENGINE=y
 BR2_PACKAGE_OPENVMTOOLS=y
 BR2_PACKAGE_RAUC=y
diff --git a/buildroot/package/network-manager/Config.in b/buildroot/package/network-manager/Config.in
index 72658c127..1bdb225d6 100644
--- a/buildroot/package/network-manager/Config.in
+++ b/buildroot/package/network-manager/Config.in
@@ -62,6 +62,12 @@ config BR2_PACKAGE_NETWORK_MANAGER_OVS
 	help
 	  This option enables support for OpenVSwitch
 
+config BR2_PACKAGE_NETWORK_MANAGER_WAIT_BOOT
+	bool "Wait on boot support"
+	depends on BR2_INIT_SYSTEMD
+	help
+	  This option allow NetworkManager to wait on boot
+
 endif
 
 comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.7, dynamic library"
diff --git a/buildroot/package/network-manager/network-manager.mk b/buildroot/package/network-manager/network-manager.mk
index a520aad9c..d48ffe922 100644
--- a/buildroot/package/network-manager/network-manager.mk
+++ b/buildroot/package/network-manager/network-manager.mk
@@ -102,6 +102,12 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
 
 	ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \
 		$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
+
+	if [ $(BR2_PACKAGE_NETWORK_MANAGER_WAIT_BOOT) == y ]; \
+	then \
+		ln -sf /usr/lib/systemd/system/NetworkManager-wait-online.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager-wait-online.service; \
+	fi
 endef
 
 $(eval $(autotools-package))