diff --git a/pkg/emlib/Makefile b/pkg/emlib/Makefile
deleted file mode 100644
index dbb57b2031..0000000000
--- a/pkg/emlib/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-PKG_NAME=emlib
-PKG_URL=https://github.com/basilfx/RIOT-emlib
-PKG_VERSION=0bd74c8a2756a466e256434a598468ccd5b5af54
-PKG_LICENSE=Zlib
-
-.PHONY: all
-
-all: git-download
-	"$(MAKE)" -C $(PKG_BUILDDIR)
-
-include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/emlib/Makefile.include b/pkg/emlib/Makefile.include
deleted file mode 100644
index 12722f7587..0000000000
--- a/pkg/emlib/Makefile.include
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDES += -I$(PKGDIRBASE)/emlib/emlib/inc -I$(PKGDIRBASE)/emlib/emlib-extra/inc
diff --git a/pkg/emlib/doc.txt b/pkg/emlib/doc.txt
deleted file mode 100644
index 3966da69b6..0000000000
--- a/pkg/emlib/doc.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * @defgroup pkg_emlib   Vendor library for EFM/EFR/EZR32 MCUs by Silicon Labs
- * @ingroup  pkg
- * @brief    Vendor library for EFM/EFR/EZR32 targets by Silicon Labs
- * @see      https://github.com/SiliconLabs/Gecko_SDK
- */
diff --git a/pkg/gecko_sdk/Makefile b/pkg/gecko_sdk/Makefile
new file mode 100644
index 0000000000..95a34929d4
--- /dev/null
+++ b/pkg/gecko_sdk/Makefile
@@ -0,0 +1,15 @@
+PKG_NAME=gecko_sdk
+PKG_URL=https://github.com/basilfx/RIOT-gecko-sdk
+PKG_VERSION=f8a90e4db4680984b5f9d3dd44ca528772458456
+PKG_LICENSE=Zlib
+
+ifneq ($(CPU),efm32)
+  $(error This package can only be used with EFM32 CPUs)
+endif
+
+.PHONY: all
+
+all: git-download
+	"$(MAKE)" -C $(PKG_BUILDDIR)/dist
+
+include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/gecko_sdk/Makefile.include b/pkg/gecko_sdk/Makefile.include
new file mode 100644
index 0000000000..7695622be5
--- /dev/null
+++ b/pkg/gecko_sdk/Makefile.include
@@ -0,0 +1,5 @@
+INCLUDES += -I$(PKGDIRBASE)/gecko_sdk/dist/emlib/inc
+INCLUDES += -I$(PKGDIRBASE)/gecko_sdk/dist/emlib-extra/inc
+
+USEMODULE += gecko_sdk_emlib
+USEMODULE += gecko_sdk_emlib_extra
diff --git a/pkg/gecko_sdk/doc.txt b/pkg/gecko_sdk/doc.txt
new file mode 100644
index 0000000000..edbc1bdf82
--- /dev/null
+++ b/pkg/gecko_sdk/doc.txt
@@ -0,0 +1,6 @@
+/**
+ * @defgroup pkg_gecko_sdk    Vendor library for EFM/EFR/EZR32 MCUs
+ * @ingroup  pkg
+ * @brief    Vendor library for EFM/EFR/EZR32 targets by Silicon Labs
+ * @see      https://siliconlabs.github.io/Gecko_SDK_Doc/
+ */