diff --git a/pkg/fatfs/Makefile b/pkg/fatfs/Makefile
index 55aec0d3b0..a2ef257868 100644
--- a/pkg/fatfs/Makefile
+++ b/pkg/fatfs/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME=fatfs
-PKG_URL=https://github.com/MichelRottleuthner/FatFs_for_RIOT.git
-PKG_VERSION=61fd6ae3815170bf7bf6121f33f1ef68c2b11599
+PKG_URL=https://github.com/RIOT-OS/FatFS
+PKG_VERSION=34f371c7735fc6fc8e714a74a7a73a61d3ed5633
 PKG_LICENSE=BSD-1-Clause
 MODULE_MAKEFILE := $(CURDIR)/Makefile.fatfs