diff --git a/config/dhcpc/dhcpcd.conf b/config/dhcpc/dhcpcd.conf
index eb625a70c..7b18896ec 100644
--- a/config/dhcpc/dhcpcd.conf
+++ b/config/dhcpc/dhcpcd.conf
@@ -21,3 +21,6 @@ require dhcp_server_identifier
 # A hook script is provided to lookup the hostname if not set by the DHCP
 # server, but it should not be run by default.
 nohook lookup-hostname
+
+# disable ipv4ll (IPv4 local link/apipa) ip's
+noipv4ll
diff --git a/config/rootfiles/core/135/update.sh b/config/rootfiles/core/135/update.sh
index c59f2dc2c..13959a647 100644
--- a/config/rootfiles/core/135/update.sh
+++ b/config/rootfiles/core/135/update.sh
@@ -91,6 +91,11 @@ rm -vf \
 # Extract files
 extract_files
 
+# update dhcpcd.conf
+sed -i -e "s|.*ipv4ll.*||g" /var/ipfire/dhcpc/dhcpcd.conf
+echo "# disable ipv4ll (IPv4 local link/apipa) ip's" >> /var/ipfire/dhcpc/dhcpcd.conf
+echo "noipv4ll"                                      >> /var/ipfire/dhcpc/dhcpcd.conf
+
 # update linker config
 ldconfig