diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 28b4810b0..cfb1949c3 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gnunet
 PKG_SOURCE_VERSION:=36713
 PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 # ToDo:
 #  - break-out {peer,name,data}store for each backend
diff --git a/net/gnunet/files/gnunet.init b/net/gnunet/files/gnunet.init
index aa8742295..379d0d69e 100644
--- a/net/gnunet/files/gnunet.init
+++ b/net/gnunet/files/gnunet.init
@@ -73,7 +73,7 @@ prepare_config() {
 		# $1    "Type"
 		# $2    "Name"
 		local __TYPE="$1"
-		local __NAME="$2"
+		local __NAME="${2/_/-}"
 		[ "${__TYPE}" = "gnunet-config" ] && _gnunet_section="${__NAME}"
 		[ "${__TYPE}" = "gnunet-exit-service" ] && _gnunet_section="${__NAME}.gnunet."
 	}