diff --git a/Makefile b/Makefile
index c16f03a..398c521 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ CXXFLAGS	:=	$(CFLAGS) -fno-rtti -fno-exceptions
 
 ASFLAGS		:=	-g $(ARCH)
 
-ifeq ($(filter $(MAKECMDGOALS),clean dist-src),)
+ifeq ($(filter $(MAKECMDGOALS),clean dist-src fs-libs),)
     # Check BUILD_TYPE flag
     ifneq ($(origin BUILD_TYPE),undefined)
         ifeq (${BUILD_TYPE},ISC)
diff --git a/README.md b/README.md
index 54ffe8e..9964d7a 100644
--- a/README.md
+++ b/README.md
@@ -158,6 +158,13 @@ Thanks to
 Changelog
 --------------
 
+**v0.2.5:**
+
+* Updated lwext4 patch to fix mountpoint corruption issues if a mountpoint name is reused after a previous call to `ext4_mount` failed.
+    * This fixes a data abort discovered by [phisch](https://github.com/phisch). Thanks for the report!
+    * The fix is based on [HenriChataing](https://github.com/HenriChataing)'s [pull request in lwext4's repository](https://github.com/gkostka/lwext4/pull/51), but also adds an additional `memset` call to `ext4_umount` to fully clear every unmounted mountpoint.
+    * A note to all developers using the GPL-licensed version of the library: update the `switch-lwext4` package by running `make fs-libs` in your libusbhsfs clone *before* building your project.
+
 **v0.2.4:**
 
 * Updated FatFs to R0.14b.
diff --git a/include/usbhsfs.h b/include/usbhsfs.h
index 32f3006..bece435 100644
--- a/include/usbhsfs.h
+++ b/include/usbhsfs.h
@@ -22,7 +22,7 @@ extern "C" {
 /// Library version.
 #define LIBUSBHSFS_VERSION_MAJOR    0
 #define LIBUSBHSFS_VERSION_MINOR    2
-#define LIBUSBHSFS_VERSION_MICRO    4
+#define LIBUSBHSFS_VERSION_MICRO    5
 
 /// Helper macro to generate a string based on a filesystem type value.
 #define LIBUSBHSFS_FS_TYPE_STR(x)   ((x) == UsbHsFsDeviceFileSystemType_FAT12 ? "FAT12" : ((x) == UsbHsFsDeviceFileSystemType_FAT16 ? "FAT16" : ((x) == UsbHsFsDeviceFileSystemType_FAT32 ? "FAT32" : \
diff --git a/liblwext4/Makefile b/liblwext4/Makefile
index bd70ac5..81c64ab 100644
--- a/liblwext4/Makefile
+++ b/liblwext4/Makefile
@@ -6,7 +6,7 @@ MAKEPKG	:=	dkp-makepkg
 endif
 
 all:
-	@$(MAKEPKG) -i -s --needed --noconfirm > /dev/null
+	@$(MAKEPKG) -c -C -f -i -s --noconfirm > /dev/null
 
 deps:
 	@pacman -S --needed --noconfirm patch cmake > /dev/null
diff --git a/liblwext4/PKGBUILD b/liblwext4/PKGBUILD
index 09535d8..eefbd7a 100644
--- a/liblwext4/PKGBUILD
+++ b/liblwext4/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbasename=lwext4
 pkgname=switch-${pkgbasename}
 pkgver=733b2c40d7121900e339bee8784977467a9fe8c9
-pkgrel=4
+pkgrel=3
 pkgdesc='ext2/ext3/ext4 filesystem library for microcontrollers'
 url='https://github.com/gkostka/lwext4'
 license=('GPL')
@@ -17,7 +17,7 @@ source=(
 )
 sha256sums=(
   '7840f378f39483e5de25dbd7271652b187263c4d7e116db395effe7c6a5e692e'
-  'b66c88824a194e301dd8a9d19a1c0e82d599421aa006b418f941323edc7ff0a9'
+  '6bddc3ded6ba6c00c31346f48397699557c699126327afccff880004b2e755c5'
 )
 
 prepare() {
diff --git a/libntfs-3g/Makefile b/libntfs-3g/Makefile
index be3bbee..16a24c4 100644
--- a/libntfs-3g/Makefile
+++ b/libntfs-3g/Makefile
@@ -6,7 +6,7 @@ MAKEPKG	:=	dkp-makepkg
 endif
 
 all:
-	@$(MAKEPKG) -i -s --needed --noconfirm > /dev/null
+	@$(MAKEPKG) -c -C -f -i -s --noconfirm > /dev/null
 
 deps:
 	@pacman -S --needed --noconfirm patch > /dev/null