diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 905d7f810b..9a2cfe20d2 100644
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
-PKG_VERSION:=8
+PKG_VERSION:=9
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug
index 9499296d92..49667a815e 100644
--- a/package/6in4/files/6in4.hotplug
+++ b/package/6in4/files/6in4.hotplug
@@ -29,11 +29,12 @@ if [ "$ACTION" = ifup ]; then
 			local password
 			config_get password "$cfg" password
 
+			uci_set_state network "$cfg" ipaddr "$wanip"
+
 			[ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && {
 				[ "${#password}" == 32 -a -z "${password//[a-f0-9]/}" ] || {
 					password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
 				}
-				uci_set_state network "$cfg" ipaddr "$wanip"
 
 				(
 					local url="http://ipv4.tunnelbroker.net/ipv4_end.php?ipv4b=AUTO&user_id=$username&pass=$password&tunnel_id=$tunnelid"
@@ -51,6 +52,9 @@ if [ "$ACTION" = ifup ]; then
 						}
 					done
 				)&
+			} || {
+				logger -t 6in4-update "Re-establishing tunnel due to change on $INTERFACE ($DEVICE)"
+				ifup "$cfg" &
 			}
 		}
 	}