diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files
index 1d5d4df90..3d8cf8d7f 100644
--- a/config/rootfiles/core/106/filelists/files
+++ b/config/rootfiles/core/106/filelists/files
@@ -2,6 +2,7 @@ etc/system-release
 etc/issue
 etc/login.defs
 etc/rc.d/init.d/dhcp
+etc/rc.d/init.d/localnet
 etc/rc.d/init.d/network
 etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders
 etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
diff --git a/src/initscripts/init.d/localnet b/src/initscripts/init.d/localnet
index c1e5b2933..ff374bb2b 100644
--- a/src/initscripts/init.d/localnet
+++ b/src/initscripts/init.d/localnet
@@ -15,6 +15,13 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+write_resolv_conf() {
+	(
+		[ -n "${DOMAINNAME}" ] && echo "search ${DOMAINNAME}"
+		echo "nameserver 127.0.0.1"
+	) > /etc/resolv.conf
+}
+
 case "${1}" in
 	start)
 		eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
@@ -32,6 +39,9 @@ case "${1}" in
 			domainname ${DOMAINNAME}
 			evaluate_retval
 		fi
+
+		# Update resolv.conf
+		write_resolv_conf
 		;;
 
 	stop)