diff --git a/net/tunneldigger/Makefile b/net/tunneldigger/Makefile
index 04d94b9..92bcb3a 100644
--- a/net/tunneldigger/Makefile
+++ b/net/tunneldigger/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tunneldigger
-PKG_VERSION:=0.4.4
-PKG_RELEASE:=2
-PKG_REV:=909656ed7908c51b7f42844ba26e3a41ac7ab8bb
+PKG_VERSION:=0.4.5
+PKG_RELEASE:=1
+PKG_REV:=f820d65e57098094231083c2e83ed4983d2be049
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=git://github.com/wlanslovenija/tunneldigger.git
+PKG_SOURCE_URL:=git://github.com/ffrl/tunneldigger.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
diff --git a/net/tunneldigger/files/config.default b/net/tunneldigger/files/config.default
index 307c1b9..f269704 100644
--- a/net/tunneldigger/files/config.default
+++ b/net/tunneldigger/files/config.default
@@ -6,4 +6,5 @@ config broker
 	option group 'root'
 	option interface 'l2tp0'
 	option limit_bw_down '1024'
+	option broker_selection 'usage'
 	option enabled '0'
diff --git a/net/tunneldigger/files/tunneldigger.init b/net/tunneldigger/files/tunneldigger.init
index 2cfcb74..09d08cf 100755
--- a/net/tunneldigger/files/tunneldigger.init
+++ b/net/tunneldigger/files/tunneldigger.init
@@ -24,6 +24,7 @@ config_cb() {
 			config_get limit_bw_down "$cfg" limit_bw_down
 			config_get hook_script "$cfg" hook_script
 			config_get bind_interface "$cfg" bind_interface
+			config_get broker_selection "$cfg" broker_selection
 			
 			[ $enabled -eq 0 ] && return
 
@@ -40,6 +41,20 @@ config_cb() {
 				network_get_device _bind_interface "${bind_interface}" || _bind_interface="${bind_interface}"
 				append broker_opts "-I ${_bind_interface}"
 			}
+			[ ! -z "${broker_selection}" ] && {
+				# Set broker selection.
+				case "${broker_selection}" in
+					usage)
+						append broker_opts "-a"
+					;;
+					first)
+						append broker_opts "-g"
+					;;
+					random)
+						append broker_opts "-r"
+					;;
+				esac
+			}
 
 			if [ -z "$uuid" ]; then
 				missing uuid