diff --git a/README.md b/README.md
index 0032e3d..26c4c0a 100644
--- a/README.md
+++ b/README.md
@@ -149,6 +149,7 @@ Sniffs the DHT gossip and indexes file and directory hashes. Metadata and search
 - [IPLD Explorer](https://explore.ipld.io) - Explore the Merkle Forest from the comfort of your browser [Source](https://github.com/ipfs-shipyard/ipld-explorer)
 - [IPRedirect](https://github.com/JayBrown/IPRedirect) - Browser userscript for redirecting IPFS/IPNS addresses to your local gateway. This should work on any browser that hasn't had an extension written for it yet and has support for userscripts.
 - [ipscend](https://github.com/diasdavid/ipscend) - Tool for hosting web apps and static websites in IPFS
+- [mahuta](https://github.com/ConsenSys/Mahuta) - Mahuta is a plug and play service for your micro-service architecture allowing to collect, store and index data on IPFS and offering search functionalities (full text, query).
 - [pinbot](https://github.com/whyrusleeping/pinbot) - Pin content via IRC
 - [Public gateway status checker](https://ipfs.fooock.com/) - Web app to check public states of IPFS gateways, including latency and gateway writable state. [Source](https://github.com/fooock/ipfs-gateway-checker)
 - [Siderus Orion](https://orion.siderus.io) - Easy to use IPFS desktop client for macOS, Windows and Linux [Source](https://github.com/Siderus/Orion)
diff --git a/data/tools.yaml b/data/tools.yaml
index 32b134f..dfd0a57 100644
--- a/data/tools.yaml
+++ b/data/tools.yaml
@@ -101,6 +101,11 @@ content:
   source: https://github.com/arsyun/ipfs-common
   description: >
       some common tools, 1.CID to human readable cid, 2.cid and block name convert, 3. read the leveldb tools.
+- title: mahuta
+  website: https://github.com/ConsenSys/Mahuta
+  source: https://github.com/ConsenSys/Mahuta
+  description: >
+    Mahuta is a plug and play service for your micro-service architecture allowing to collect, store and index data on IPFS and offering search functionalities (full text, query).
 - title: Public gateway status checker
   website: https://ipfs.fooock.com/
   source: https://github.com/fooock/ipfs-gateway-checker