diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index c56b9c57c..b9fa220df 100644
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
 PKG_VERSION:=5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug
index 96b046d14..534682e99 100644
--- a/package/6in4/files/6in4.hotplug
+++ b/package/6in4/files/6in4.hotplug
@@ -32,7 +32,9 @@ if [ "$ACTION" = ifup ]; then
 			config_get password "$cfg" password
 
 			[ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && {
-				password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
+				[ "${#password}" == 32 -a -z "${password//[a-f0-9]/}" ] || {
+					password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
+				}
 				uci_set_state network "$cfg" ipaddr "$wanip"
 
 				( wget -qO/dev/null "http://ipv4.tunnelbroker.net/ipv4_end.php?ipv4b=AUTO&user_id=$username&pass=$password&tunnel_id=$tunnelid" && ifup "$cfg" )&