diff --git a/pkg/littlefs/Makefile b/pkg/littlefs/Makefile
index 3881f76fea45482ff61e5d62e5e78e781a3afda4..2db6990774b9cc10f192e6123973b389036d682b 100644
--- a/pkg/littlefs/Makefile
+++ b/pkg/littlefs/Makefile
@@ -1,15 +1,11 @@
 PKG_NAME=littlefs
 PKG_URL=https://github.com/geky/littlefs.git
-PKG_VERSION=be22d3449f23a24e7462114349ce04d751e42437
-PKG_BUILDDIR ?= $(PKGDIRBASE)/$(PKG_NAME)
+PKG_VERSION=v1.3
+PKG_LICENSE=Apache-2.0
 
 .PHONY: all
 
 all: git-download
-	@mkdir -p "$(PKG_BUILDDIR)/riotbuild"
-	@cp $(PKG_BUILDDIR)/*.c $(PKG_BUILDDIR)/*.h $(PKG_BUILDDIR)/riotbuild
-	@cp $(CURDIR)/Makefile.littlefs $(PKG_BUILDDIR)/riotbuild/Makefile
-
-	"$(MAKE)" -C $(PKG_BUILDDIR)/riotbuild
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.littlefs
 
 include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/littlefs/Makefile.include b/pkg/littlefs/Makefile.include
index 1505758926509c05346ae3374e5b0fbe48939d4e..a5467e8f04351fb73fbdd9e31afc08430604f383 100644
--- a/pkg/littlefs/Makefile.include
+++ b/pkg/littlefs/Makefile.include
@@ -1,4 +1,4 @@
-INCLUDES += -I$(PKGDIRBASE)/littlefs/riotbuild/
+INCLUDES += -I$(PKGDIRBASE)/littlefs
 
 ifneq (,$(filter littlefs_fs,$(USEMODULE)))
   DIRS += $(RIOTBASE)/pkg/littlefs/fs
diff --git a/pkg/littlefs/fs/littlefs_fs.c b/pkg/littlefs/fs/littlefs_fs.c
index 6800ec0980f0e10f8ab6ceec4a5e2e64c0f12f2e..c0dfaf57b19f2f56dba4345856afeec45e16efc1 100644
--- a/pkg/littlefs/fs/littlefs_fs.c
+++ b/pkg/littlefs/fs/littlefs_fs.c
@@ -48,6 +48,10 @@ static int littlefs_err_to_errno(ssize_t err)
         return -ENOTDIR;
     case LFS_ERR_ISDIR:
         return -EISDIR;
+    case LFS_ERR_NOTEMPTY:
+        return -ENOTEMPTY;
+    case LFS_ERR_BADF:
+        return -EBADF;
     case LFS_ERR_INVAL:
         return -EINVAL;
     case LFS_ERR_NOSPC: