diff --git a/src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile b/src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile
index a52646fa..b2ab9fda 100644
--- a/src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile
+++ b/src/packages/fff/fff-hoods/files/etc/uci-defaults/93-fff-hoodfile
@@ -2,4 +2,7 @@
 
 ln -s "$hoodfilewww" /www/hood/keyxchangev2data
 
+uci set fff.keyserver='hood'
+uci commit fff
+
 exit 0
diff --git a/src/packages/fff/fff-hoods/files/usr/lib/functions/fff/hoodfile b/src/packages/fff/fff-hoods/files/usr/lib/functions/fff/hoodfile
index 8755a73f..2e4aecb6 100644
--- a/src/packages/fff/fff-hoods/files/usr/lib/functions/fff/hoodfile
+++ b/src/packages/fff/fff-hoods/files/usr/lib/functions/fff/hoodfile
@@ -99,7 +99,7 @@ getKeyserverHoodfile() {
 
 	echo "Getting hoodfile from Keyserver"
 
-	if /bin/busybox wget -T15 -O "$file" "http://keyserver.freifunk-franken.de/v2/?lat=$lat&long=$long"; then
+	if /bin/busybox wget -T15 -O "$file" "$(uci -q get fff.keyserver.url || echo "http://keyserver.freifunk-franken.de/v2")/?lat=$lat&long=$long"; then
 		return 0
 	else
 		return 1