diff --git a/_data/tools/hdm.json b/_data/tools/hdm.json
new file mode 100644
index 0000000..9a4cd8f
--- /dev/null
+++ b/_data/tools/hdm.json
@@ -0,0 +1,6 @@
+{
+    "name": "hdm",
+    "display_name": "Hiera Data Manager",
+    "description": "Web interface for Hiera data",
+    "url": "https://github.com/betadots/hdm"
+}
diff --git a/_data/tools/puppet-ghostbuster.json b/_data/tools/puppet-ghostbuster.json
index 5ec6c9e..ae29194 100644
--- a/_data/tools/puppet-ghostbuster.json
+++ b/_data/tools/puppet-ghostbuster.json
@@ -1,6 +1,6 @@
 {
   "name": "puppet-ghostbuster",
   "display_name": "Ghostbuster",
-  "url": "https://github.com/camptocamp/puppet-ghostbuster",
+  "url": "https://github.com/voxpupuli/puppet-ghostbuster",
   "description": "Dead code detector for Puppet."
 }
diff --git a/_data/tools/puppet-summary.json b/_data/tools/puppet-summary.json
new file mode 100644
index 0000000..6fa9511
--- /dev/null
+++ b/_data/tools/puppet-summary.json
@@ -0,0 +1,6 @@
+{
+    "name": "puppet-summary",
+    "display_name": "Puppet Summary",
+    "description": "Another web interface for Puppet reports",
+    "url": "https://github.com/skx/puppet-summary"
+}
diff --git a/_data/tools/r10k.json b/_data/tools/r10k.json
index e5d8a42..726a11b 100644
--- a/_data/tools/r10k.json
+++ b/_data/tools/r10k.json
@@ -32,6 +32,11 @@
       "name": "Ra10ke",
       "url": "https://github.com/voxpupuli/ra10ke",
       "description": " Rake tasks related to R10K and Puppetfile"
+    },
+    {
+      "name": "G10k",
+      "url": "https://github.com/xorpaul/g10k",
+      "description": "r10k fork in Go."
     }
   ]
 }