diff --git a/make/target-rootfs.mk b/make/target-rootfs.mk
index a6f512b4..af085197 100644
--- a/make/target-rootfs.mk
+++ b/make/target-rootfs.mk
@@ -47,8 +47,7 @@ symbolic-links: | $(TARGET_DIR)
 		ln -sf /proc/mounts mtab
 ifeq ($(PERSISTENT_VAR_PARTITION),yes)
 	$(CD) $(TARGET_sysconfdir); \
-		ln -sf /var/etc/hostname hostname; \
-		ln -sf /var/etc/resolv.conf resolv.conf
+		ln -sf /var/etc/hostname hostname
 endif
 	mkdir -p $(TARGET_localstatedir)/tuxbox/config
 	$(CD) $(TARGET_localstatedir)/tuxbox/config; \
diff --git a/make/target-tools.mk b/make/target-tools.mk
index 3e6ecbd7..518b021f 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -123,10 +123,17 @@ define BUSYBOX_ADD_TO_SHELLS
 	fi
 endef
 
+ifeq ($(PERSISTENT_VAR_PARTITION),yes)
+  define BUSYBOX_INSTALL_LINK_RESOLV_CONF
+	ln -sf /var/etc/resolv.conf $(TARGET_sysconfdir)/resolv.conf
+  endef
+endif
+
 define BUSYBOX_INSTALL_FILES
 	$(BUSYBOX_INSTALL_SWAP)
 	$(BUSYBOX_INSTALL_FBSET)
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/udhcpc-default.script $(TARGET_datadir)/udhcpc/default.script
+	$(BUSYBOX_INSTALL_LINK_RESOLV_CONF)
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/crond.init $(TARGET_sysconfdir)/init.d/crond
 	$(UPDATE-RC.D) crond defaults 50
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/inetd.init $(TARGET_sysconfdir)/init.d/inetd