diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 4a06581790..c9c59a202d 100644
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -31,6 +31,8 @@ else
 IPUTILS_CONF_OPTS += -DUSE_IDN=false
 endif
 
+IPUTILS_NINFOD = y
+
 ifeq ($(BR2_PACKAGE_NETTLE),y)
 IPUTILS_CONF_OPTS += -DUSE_CRYPTO=nettle
 IPUTILS_DEPENDENCIES += nettle
@@ -46,11 +48,22 @@ IPUTILS_DEPENDENCIES += linux-headers
 else
 IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none
 # BUILD_NINFOD=true and USE_CRYPTO=none cannot be combined
-IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false
+IPUTILS_NINFOD = n
 endif
 
 # ninfod requires <pthread.h>
 ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+IPUTILS_NINFOD = n
+endif
+
+ifeq ($(IPUTILS_NINFOD),y)
+IPUTILS_CONF_OPTS += -DBUILD_NINFOD=true
+define IPUTILS_INSTALL_SERVICE_NINFOD
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../lib/systemd/system/ninfod.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ninfod.service
+endef
+else
 IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false
 endif
 
@@ -103,4 +116,15 @@ define IPUTILS_PERMISSIONS
 endef
 endif
 
+define IPUTILS_INSTALL_SERVICE_RDISC
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../lib/systemd/system/rdisc.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rdisc.service
+endef
+
+define IPUTILS_INSTALL_INIT_SYSTEMD
+	$(IPUTILS_INSTALL_SERVICE_NINFOD)
+	$(IPUTILS_INSTALL_SERVICE_RDISC)
+endef
+
 $(eval $(meson-package))