diff --git a/dist/tools/edbg/.gitignore b/dist/tools/edbg/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..87a897f7ec512bea68c3af91a4e24d242199701a
--- /dev/null
+++ b/dist/tools/edbg/.gitignore
@@ -0,0 +1 @@
+edbg
diff --git a/dist/tools/edbg/Makefile b/dist/tools/edbg/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..82f7fbbf1658e65b6c00959305d8d51ae7fcc875
--- /dev/null
+++ b/dist/tools/edbg/Makefile
@@ -0,0 +1,13 @@
+PKG_NAME=edbg
+PKG_URL=https://github.com/ataradov/edbg
+PKG_VERSION=d499ffd8297233b65dd91fd58fb98b9f9a03fec1
+PKG_LICENSE=BSD-3-Clause
+PKG_BUILDDIR=$(CURDIR)/bin
+
+.PHONY: all
+
+all: git-download
+	"$(MAKE)" -C $(PKG_BUILDDIR)
+	mv $(PKG_BUILDDIR)/edbg .
+
+include $(RIOTBASE)/pkg/pkg.mk
diff --git a/makefiles/tools/targets.inc.mk b/makefiles/tools/targets.inc.mk
index f1a0ed5032bd10f185de1f0ca3a257381f413a09..4be923a92a05dba55afdfa17b7608b62f2625e4b 100644
--- a/makefiles/tools/targets.inc.mk
+++ b/makefiles/tools/targets.inc.mk
@@ -9,3 +9,8 @@ $(RIOTBASE)/dist/tools/bossa/bossac:
 	@echo "[INFO] bossac binary not found - building it from source"
 	@make -C $(RIOTBASE)/dist/tools/bossa
 	@echo "[INFO] bossac binary successfully build!"
+
+$(RIOTBASE)/dist/tools/edbg/edbg:
+	@echo "[INFO] edbg binary not found - building it from source now"
+	CC= CFLAGS= make -C $(RIOTBASE)/dist/tools/edbg
+	@echo "[INFO] edbg binary successfully build!"