diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index ec4adc046..7cb1e1461 100644
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnunet
-PKG_SOURCE_VERSION:=38096
+PKG_SOURCE_VERSION:=38151
 PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
@@ -268,6 +268,9 @@ LIB_social:=consensus identityprovider multicast psyc psycstore psycutil secrets
 LIBEXEC_social:=service-consensus service-evil-consensus service-identity-provider service-multicast service-psyc service-psycstore service-secretsharing service-social
 CONF_social:=consensus multicast psyc psycstore secretsharing social
 
+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_flat
 
@@ -275,7 +278,7 @@ DEPENDS_peerstore-flat:=+gnunet-peerstore
 PLUGIN_peerstore-flat:=peerstore_flat
 
 DEPENDS_fs-heap:=+gnunet-datastore
-PLUGIN_fs-heap:=datacache_heap datastore_heap
+PLUGIN_fs-heap:=datastore_heap
 CONFLICTS_fs-heap:=gnunet-fs-mysql gnunet-fs-pgsql gnunet-fs-sqlite
 
 DEPENDS_mysql:=+libmysqlclient
@@ -292,8 +295,12 @@ CONFLICTS_fs-mysql:=gnunet-fs-pgsql gnunet-fs-sqlite
 DEPENDS_pgsql:=+libpq
 LIB_pgsql:=postgres pq
 
+DEPENDS_dhtcache-pgsql:=+gnunet-pgsql
+PLUGIN_dhtcache-pgsql:=datacache_postgres
+CONFLICTS_dhtcache-pgsql:=gnunet-dhtcache-sqlite
+
 DEPENDS_fs-pgsql:=+gnunet-pgsql +gnunet-datastore
-PLUGIN_fs-pgsql:=datacache_postgres datastore_postgres
+PLUGIN_fs-pgsql:=datastore_postgres
 CONFLICTS_fs-pgsql:=gnunet-fs-sqlite
 
 DEPENDS_gns-pgsql:=+gnunet-pgsql +gnunet-gns
@@ -314,8 +321,11 @@ DEPENDS_peerstore-sqlite:=+gnunet-sqlite +gnunet-peerstore
 PLUGIN_peerstore-sqlite:=peerstore_sqlite
 CONFLICTS_peerstore-sqlite:=gnunet-peerstore-flat
 
+DEPENDS_dhtcache-sqlite:=+gnunet-sqlite
+PLUGIN_dhtcache-sqlite:=datacache_sqlite
+
 DEPENDS_fs-sqlite:=+gnunet-sqlite +gnunet-datastore
-PLUGIN_fs-sqlite:=datacache_sqlite datastore_sqlite
+PLUGIN_fs-sqlite:=datastore_sqlite
 LIBEXEC_fs-sqlite:=daemon-latency-logger
 
 DEPENDS_social-sqlite:=+gnunet-sqlite +gnunet-social
@@ -393,18 +403,21 @@ $(eval $(call BuildComponent,rest,REST interface,))
 $(eval $(call BuildComponent,rps,RPS routing component,y))
 $(eval $(call BuildComponent,social,social components,))
 $(eval $(call BuildComponent,namestore-fcfsd,first-come-first-serve registration server,))
-$(eval $(call BuildComponent,fs-heap,heap-based filesharing plugins,))
+$(eval $(call BuildComponent,dhtcache-heap,heap-based dhtcache plugin,y))
+$(eval $(call BuildComponent,fs-heap,heap-based filesharing plugin,))
 $(eval $(call BuildComponent,gns-flat,flat storage GNS plugins,y))
 $(eval $(call BuildComponent,peerstore-flat,flat storage peerstore plugin,))
 $(eval $(call BuildComponent,mysql,mySQL datastore backend,))
 $(eval $(call BuildComponent,fs-mysql,mySQL filesharing plugins,))
 $(eval $(call BuildComponent,social-mysql,mySQL social plugins,))
 $(eval $(call BuildComponent,pgsql,PostgreSQL storage backends,))
-$(eval $(call BuildComponent,fs-pgsql,PostgreSQL filesharing plugins,))
+$(eval $(call BuildComponent,dhtcache-pgsql,PostgreSQL dhtcache plugin,))
+$(eval $(call BuildComponent,fs-pgsql,PostgreSQL filesharing plugin,))
 $(eval $(call BuildComponent,gns-pgsql,PostgreSQL GNS plugins,))
-$(eval $(call BuildComponent,social-pgsql,PostgreSQL social plugins,))
+$(eval $(call BuildComponent,social-pgsql,PostgreSQL social plugin,))
 $(eval $(call BuildComponent,sqlite,libsqlite3 storage backends,))
-$(eval $(call BuildComponent,fs-sqlite,libsqlite3 filesharing plugins,))
+$(eval $(call BuildComponent,dhtcache-sqlite,libsqlite3 dhtcache plugin,))
+$(eval $(call BuildComponent,fs-sqlite,libsqlite3 filesharing plugin,))
 $(eval $(call BuildComponent,gns-sqlite,libsqlite3 gns plugins,))
 $(eval $(call BuildComponent,peerstore-sqlite,libsqlite3 peerstore plugin,))
 $(eval $(call BuildComponent,social-sqlite,libsqlite3 social plugins,))
diff --git a/net/gnunet/files/gnunet-dhtcache-heap.defaults b/net/gnunet/files/gnunet-dhtcache-heap.defaults
new file mode 100644
index 000000000..09172b65f
--- /dev/null
+++ b/net/gnunet/files/gnunet-dhtcache-heap.defaults
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+uci -q get gnunet.dhtcache || uci set gnunet.dhtcache=gnunet-config
+
+uci -q batch <<EOF
+	set gnunet.dhtcache.DATABASE=heap
+	commit gnunet
+EOF
diff --git a/net/gnunet/files/gnunet-dhtcache-pgsql.defaults b/net/gnunet/files/gnunet-dhtcache-pgsql.defaults
new file mode 100644
index 000000000..7ea8061ce
--- /dev/null
+++ b/net/gnunet/files/gnunet-dhtcache-pgsql.defaults
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+uci -q get gnunet.dhtcache || uci set gnunet.dhtcache=gnunet-config
+
+uci -q batch <<EOF
+	set gnunet.dhtcache.DATABASE=postgres
+	commit gnunet
+EOF
diff --git a/net/gnunet/files/gnunet-dhtcache-sqlite.defaults b/net/gnunet/files/gnunet-dhtcache-sqlite.defaults
new file mode 100644
index 000000000..51660527f
--- /dev/null
+++ b/net/gnunet/files/gnunet-dhtcache-sqlite.defaults
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q get gnunet.dhtcache || uci set gnunet.dhtcache=gnunet-config
+
+uci -q batch <<EOF
+	del gnunet.datacache_sqlite
+	set gnunet.datacache_sqlite=gnunet-config
+	set gnunet.datacache_sqlite.FILENAME=/var/run/gnunet/datacache.sqlite
+	set gnunet.dhtcache.DATABASE=sqlite
+	commit gnunet
+EOF
diff --git a/net/gnunet/files/gnunet-fs-heap.defaults b/net/gnunet/files/gnunet-fs-heap.defaults
index 78a03c1d4..19b05319f 100644
--- a/net/gnunet/files/gnunet-fs-heap.defaults
+++ b/net/gnunet/files/gnunet-fs-heap.defaults
@@ -1,10 +1,8 @@
 #!/bin/sh
 
 uci -q get gnunet.datastore || uci set gnunet.datastore=gnunet-config
-uci -q get gnunet.dhtcache || uci set gnunet.dhtcache=gnunet-config
 
 uci -q batch <<EOF
 	set gnunet.datastore.DATABASE=heap
-	set gnunet.dhtcache.DATABASE=heap
 	commit gnunet
 EOF
diff --git a/net/gnunet/files/gnunet-fs-pgsql.defaults b/net/gnunet/files/gnunet-fs-pgsql.defaults
index 72ad2cd31..cc602023e 100644
--- a/net/gnunet/files/gnunet-fs-pgsql.defaults
+++ b/net/gnunet/files/gnunet-fs-pgsql.defaults
@@ -1,10 +1,8 @@
 #!/bin/sh
 
 uci -q get gnunet.datastore || uci set gnunet.datastore=gnunet-config
-uci -q get gnunet.dhtcache || uci set gnunet.dhtcache=gnunet-config
 
 uci -q batch <<EOF
 	set gnunet.datastore.DATABASE=postgres
-	set gnunet.dhtcache.DATABASE=postgres
 	commit gnunet
 EOF
diff --git a/net/gnunet/files/gnunet-fs-sqlite.defaults b/net/gnunet/files/gnunet-fs-sqlite.defaults
index 04a5472f1..ff7233569 100644
--- a/net/gnunet/files/gnunet-fs-sqlite.defaults
+++ b/net/gnunet/files/gnunet-fs-sqlite.defaults
@@ -1,16 +1,11 @@
 #!/bin/sh
 
 uci -q get gnunet.datastore || uci set gnunet.datastore=gnunet-config
-uci -q get gnunet.dhtcache || uci set gnunet.dhtcache=gnunet-config
 
 uci -q batch <<EOF
 	del gnunet.datastore_sqlite
 	set gnunet.datastore_sqlite=gnunet-config
 	set gnunet.datastore_sqlite.FILENAME=/etc/gnunet/datastore.sqlite
 	set gnunet.datastore.DATABASE=sqlite
-	del gnunet.datacache_sqlite
-	set gnunet.datacache_sqlite=gnunet-config
-	set gnunet.datacache_sqlite.FILENAME=/var/run/gnunet/datacache.sqlite
-	set gnunet.dhtcache.DATABASE=sqlite
 	commit gnunet
 EOF