diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index b59107538..2be414f4d 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnunet
 
-PKG_VERSION:=0.11.5
-PKG_RELEASE:=2
+PKG_VERSION:=0.11.6
+PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gnunet
-PKG_HASH:=98e0355ff0627bf88112b3b92a7522e98c0ae6071fc45efda5a33daed28199b3
+PKG_HASH:=f8a07063b1e0890a1386fed2313a967f58f5495c075a25725aba200469c857bf
 
 PKG_LICENSE:=AGPL-3.0
 PKG_LICENSE_FILES:=COPYING
@@ -281,7 +281,7 @@ PLUGIN_dhtcache-heap:=datacache_heap
 CONFLICTS_dhtcache-heap:=gnunet-dhtcache-pgsql gnunet-dhtcache-sqlite
 
 DEPENDS_gns-flat:=+gnunet-gns
-PLUGIN_gns-flat:=namecache_flat namestore_heap
+PLUGIN_gns-flat:=namecache_flat namestore_flat
 
 PLUGIN_peerstore-flat:=peerstore_flat
 
diff --git a/net/gnunet/files/gnunet-gns-flat.defaults b/net/gnunet/files/gnunet-gns-flat.defaults
index f37228dd7..e2794b7a8 100644
--- a/net/gnunet/files/gnunet-gns-flat.defaults
+++ b/net/gnunet/files/gnunet-gns-flat.defaults
@@ -7,7 +7,7 @@ uci -q batch <<EOF
 	del gnunet.namestore_heap
 	set gnunet.namestore_heap=gnunet-config
 	set gnunet.namestore_heap.FILENAME=/etc/gnunet/namestore.flat
-	set gnunet.namestore.DATABASE=heap
+	set gnunet.namestore.DATABASE=flat
 	del gnunet.namecache_flat
 	set gnunet.namecache_flat=gnunet-config
 	set gnunet.namecache_flat.FILENAME=/var/run/gnunet/namecache.flat