diff --git a/make/target-rootfs.mk b/make/target-rootfs.mk
index a54d3060..148ea734 100644
--- a/make/target-rootfs.mk
+++ b/make/target-rootfs.mk
@@ -47,12 +47,10 @@ symbolic-links: | $(TARGET_DIR)
 		ln -sf /proc/mounts mtab
 ifeq ($(PERSISTENT_VAR_PARTITION),yes)
 	$(CD) $(TARGET_sysconfdir); \
-		ln -sf /var/etc/exports exports; \
 		ln -sf /var/etc/hostname hostname; \
 		ln -sf /var/etc/localtime localtime; \
 		ln -sf /var/etc/passwd passwd; \
-		ln -sf /var/etc/resolv.conf resolv.conf; \
-		ln -sf /var/etc/wpa_supplicant.conf wpa_supplicant.conf
+		ln -sf /var/etc/resolv.conf resolv.conf
 	$(CD) $(TARGET_sysconfdir)/network; \
 		ln -sf /var/etc/network/interfaces interfaces
 endif
diff --git a/make/target-tools.mk b/make/target-tools.mk
index 60b22773..f2afda47 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -1640,6 +1640,9 @@ wpa_supplicant: $(WPA_SUPPLICANT_DEPS) $(DL_DIR)/$(WPA_SUPPLICANT_SOURCE) | $(TA
 		$(MAKE) install DESTDIR=$(TARGET_DIR) BINDIR=$(sbindir)
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/pre-wlan0.sh $(TARGET_sysconfdir)/network/pre-wlan0.sh
 	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/post-wlan0.sh $(TARGET_sysconfdir)/network/post-wlan0.sh
+  ifeq ($(PERSISTENT_VAR_PARTITION),yes)
+	ln -sf /var/etc/wpa_supplicant.conf $(TARGET_sysconfdir)/wpa_supplicant.conf
+  endif
 	$(REMOVE)/$(PKG_DIR)
 	$(TOUCH)
 
@@ -1723,6 +1726,7 @@ nfs-utils: $(NFS_UTILS_DEPS) $(DL_DIR)/$(NFS_UTILS_SOURCE) | $(TARGET_DIR)
 	rm -f $(addprefix $(TARGET_sbindir)/,mountstats nfsiostat)
   ifeq ($(PERSISTENT_VAR_PARTITION),yes)
 	$(INSTALL_DATA) -D $(PKG_FILES_DIR)/exports-var $(TARGET_localstatedir)/etc/exports
+	ln -sf /var/etc/exports $(TARGET_sysconfdir)/exports
   else
 	$(INSTALL_DATA) -D $(PKG_FILES_DIR)/exports $(TARGET_sysconfdir)/exports
   endif