diff --git a/srcpkgs/kea/files/kea-dhcp-ddns/run b/srcpkgs/kea/files/kea-dhcp-ddns/run
index 08bda651dda..b6011bd9a38 100755
--- a/srcpkgs/kea/files/kea-dhcp-ddns/run
+++ b/srcpkgs/kea/files/kea-dhcp-ddns/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
-mkdir -p /var/{,run/}kea
+mkdir -p /var/kea /var/run/kea
 exec kea-dhcp-ddns ${OPTS:=-c /etc/kea/kea.conf}
diff --git a/srcpkgs/kea/files/kea-dhcp4/run b/srcpkgs/kea/files/kea-dhcp4/run
index c71a947a1d3..28feea4474d 100755
--- a/srcpkgs/kea/files/kea-dhcp4/run
+++ b/srcpkgs/kea/files/kea-dhcp4/run
@@ -1,4 +1,5 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
-mkdir -p /var/{,run/}kea
+[ -n "$WAIT_IFACE" ] && [ -z "$(ip -f inet address show "$WAIT_IFACE")" ] && exit 1
+mkdir -p /var/kea /var/run/kea
 exec kea-dhcp4 ${OPTS:=-c /etc/kea/kea.conf}
diff --git a/srcpkgs/kea/files/kea-dhcp6/run b/srcpkgs/kea/files/kea-dhcp6/run
index 57187bfb7a3..1e0f8aef289 100755
--- a/srcpkgs/kea/files/kea-dhcp6/run
+++ b/srcpkgs/kea/files/kea-dhcp6/run
@@ -1,4 +1,5 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
-mkdir -p /var/{,run/}kea
+[ -n "$WAIT_IFACE" ] && [ -z "$(ip -f inet6 address show "$WAIT_IFACE")" ] && exit 1
+mkdir -p /var/kea /var/run/kea
 exec kea-dhcp6 ${OPTS:=-c /etc/kea/kea.conf}
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0251aeb2b0f..1578bd1761e 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
 # Template file for 'kea'
 pkgname=kea
 version=1.3.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
  $(vopt_if mysql --with-dhcp-mysql)