diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 75c8e5d86..808039de9 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -8,11 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnunet
-PKG_SOURCE_VERSION:=36094
+PKG_SOURCE_VERSION:=36127
 PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 # ToDo:
+#  - UCI integration
 #  - break-out {peer,name,data}store for each backend
 #  - package testing stuff
 
@@ -188,8 +189,8 @@ PLUGIN_transport-http_client:=transport_http_client transport_https_client
 DEPENDS_transport-http_server:=+libmicrohttpd
 PLUGIN_transport-http_server:=transport_http_server transport_https_server
 
-PLUGIN_transport-wifi:=transport_wlan
-LIBEXEC_transport-wifi:=helper-transport-wlan
+PLUGIN_transport-wlan:=transport_wlan
+LIBEXEC_transport-wlan:=helper-transport-wlan
 
 DEPENDS_experiments:=+libglpk
 PLUGIN_experiments:=ats_mlp ats_ril
diff --git a/net/gnunet/files/gnunet.init b/net/gnunet/files/gnunet.init
index c21bbd55c..aa0774a6d 100644
--- a/net/gnunet/files/gnunet.init
+++ b/net/gnunet/files/gnunet.init
@@ -62,6 +62,7 @@ prepare_config() {
 
 	# enable dns2gns
 	gnunet-config -c $CONFIGFILE -s dns2gns -o AUTOSTART -V YES
+	gnunet-config -c $CONFIGFILE -s dns2gns -o FORCESTART -V YES
 
 	# enable all installed transport plugins
 	transport_plugins=$(gnunet-config -c $CONFIGFILE -s transport -o PLUGINS)