diff --git a/pkg/cmsis-dsp/Makefile b/pkg/cmsis-dsp/Makefile
index 6584d149d48c3e3bb77cb4df475e06d4b8265967..b5ace34db14ba02005cdcf06d0df79bef615c17d 100644
--- a/pkg/cmsis-dsp/Makefile
+++ b/pkg/cmsis-dsp/Makefile
@@ -1,13 +1,12 @@
 PKG_NAME=cmsis-dsp
-PKG_URL=https://github.com/gebart/CMSIS-DSP.git
-PKG_VERSION=v1.4.5a-riot2
-PKG_LICENSE=BSD-3-Clause
-
-CFLAGS += -Wno-strict-aliasing
+PKG_URL=https://github.com/ARM-software/CMSIS_5
+PKG_VERSION=5.4.0
+PKG_LICENSE=Apache-2.0
+CFLAGS += -Wno-strict-aliasing -Wno-unused-parameter
 
 .PHONY: all
 
 all: git-download
-	"$(MAKE)" -C $(PKG_BUILDDIR)
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME)
 
 include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/cmsis-dsp/Makefile.cmsis-dsp b/pkg/cmsis-dsp/Makefile.cmsis-dsp
new file mode 100644
index 0000000000000000000000000000000000000000..7bd5831e6b1f76545ed77f1edd849adbdecb498a
--- /dev/null
+++ b/pkg/cmsis-dsp/Makefile.cmsis-dsp
@@ -0,0 +1,43 @@
+PKG_NAME=cmsis-dsp
+
+# A list of all the directories to build for CMSIS-DSP
+CMSIS_DIRS += \
+  CMSIS/DSP/Source/BasicMathFunctions \
+  CMSIS/DSP/Source/CommonTables \
+  CMSIS/DSP/Source/ComplexMathFunctions \
+  CMSIS/DSP/Source/ControllerFunctions \
+  CMSIS/DSP/Source/FastMathFunctions \
+  CMSIS/DSP/Source/FilteringFunctions \
+  CMSIS/DSP/Source/MatrixFunctions \
+  CMSIS/DSP/Source/StatisticsFunctions \
+  CMSIS/DSP/Source/SupportFunctions \
+  CMSIS/DSP/Source/TransformFunctions \
+#
+
+INCLUDES += -I$(CURDIR)/CMSIS/DSP/Include
+CMSIS_BINDIRS = $(addprefix $(BINDIR)/$(PKG_NAME)/,$(CMSIS_DIRS))
+
+# Override default RIOT search path for sources to include all of the CMSIS-DSP
+# sources in one library instead of one library per subdirectory.
+SRC := $(foreach DIR,$(CMSIS_DIRS),$(wildcard $(DIR)/*.c))
+SRCXX := $(foreach DIR,$(CMSIS_DIRS),$(wildcard $(DIR)/*.cpp))
+ASMSRC := $(foreach DIR,$(CMSIS_DIRS),$(wildcard $(DIR)/*.s))
+ASSMSRC := $(foreach DIR,$(CMSIS_DIRS),$(wildcard $(DIR)/*.S))
+
+OBJC    := $(SRC:%.c=$(BINDIR)/$(PKG_NAME)/%.o)
+OBJCXX  := $(SRCXX:%.cpp=$(BINDIR)/$(PKG_NAME)/%.o)
+ASMOBJ  := $(ASMSRC:%.s=$(BINDIR)/$(PKG_NAME)/%.o)
+ASSMOBJ := $(ASSMSRC:%.S=$(BINDIR)/$(PKG_NAME)/%.o)
+OBJ = $(OBJC) $(OBJCXX) $(ASMOBJ) $(ASSMOBJ)
+
+# Create subdirectories if they do not already exist
+$(OBJ): | $(CMSIS_BINDIRS)
+
+$(CMSIS_BINDIRS):
+	@mkdir -p $@
+
+# Reset the default goal.
+.DEFAULT_GOAL :=
+
+# Include RIOT settings and recipes
+include $(RIOTBASE)/Makefile.base
diff --git a/pkg/cmsis-dsp/Makefile.include b/pkg/cmsis-dsp/Makefile.include
index d76141ecfc1c9d0834654c089f181b163ddb4b06..c60a187ebcda5652ff76c4dc9070e048d3b9690e 100644
--- a/pkg/cmsis-dsp/Makefile.include
+++ b/pkg/cmsis-dsp/Makefile.include
@@ -1 +1 @@
-INCLUDES += -I$(PKGDIRBASE)/cmsis-dsp/include
+INCLUDES += -I$(PKGDIRBASE)/cmsis-dsp/CMSIS/DSP/Include
diff --git a/pkg/cmsis-dsp/README.md b/pkg/cmsis-dsp/README.md
index ad0392fa971e49918851757df5245605001de7eb..8d81a73e803a1baa0daa06a1461c521c7f16a888 100644
--- a/pkg/cmsis-dsp/README.md
+++ b/pkg/cmsis-dsp/README.md
@@ -1 +1,2 @@
-Since there is no official public repository for the CMSIS-DSP library, we are using our own repo.
+This package uses DSP ARM CMSIS header from the official
+[ARM github repo](https://github.com/ARM-software/CMSIS_5)
diff --git a/pkg/cmsis-dsp/patches/0001-PATCH-arm_math-add-clang-branch-for-optimization-mac.patch b/pkg/cmsis-dsp/patches/0001-PATCH-arm_math-add-clang-branch-for-optimization-mac.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ed67f6a9805406962c32675b0dab0d1984876044
Binary files /dev/null and b/pkg/cmsis-dsp/patches/0001-PATCH-arm_math-add-clang-branch-for-optimization-mac.patch differ
diff --git a/pkg/cmsis-dsp/patches/0001-arm_math-add-clang-branch-for-optimization-macros.patch b/pkg/cmsis-dsp/patches/0001-arm_math-add-clang-branch-for-optimization-macros.patch
deleted file mode 100644
index fe462365530e3b72030fb60bb92277562ff5ffee..0000000000000000000000000000000000000000
Binary files a/pkg/cmsis-dsp/patches/0001-arm_math-add-clang-branch-for-optimization-macros.patch and /dev/null differ
diff --git a/pkg/cmsis-dsp/patches/0001-include-cpu_conf.h.patch b/pkg/cmsis-dsp/patches/0001-include-cpu_conf.h.patch
deleted file mode 100644
index 7064e4624dc8e91613a144ef9cbbdfa55f71186e..0000000000000000000000000000000000000000
Binary files a/pkg/cmsis-dsp/patches/0001-include-cpu_conf.h.patch and /dev/null differ
diff --git a/pkg/cmsis-dsp/patches/0002-PATCH-include-cpu_conf.h.patch b/pkg/cmsis-dsp/patches/0002-PATCH-include-cpu_conf.h.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0e7ec01ed7860e507fe55b2b10d417fef834a5f3
Binary files /dev/null and b/pkg/cmsis-dsp/patches/0002-PATCH-include-cpu_conf.h.patch differ