diff --git a/kernel/exfat-nofuse/Makefile b/kernel/exfat-nofuse/Makefile
index e2392100..f9110b73 100644
--- a/kernel/exfat-nofuse/Makefile
+++ b/kernel/exfat-nofuse/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=exfat-nofuse
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=https://github.com/dorimanx/exfat-nofuse.git
 PKG_SOURCE_PROTO:=git
@@ -24,28 +24,23 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/fs-exfat
+define KernelPackage/fs-exfat0
 	SUBMENU:=Filesystems
-	TITLE:=ExFAT Kernel driver
+	TITLE:=ExFAT Kernel driver (deprecated)
 	FILES:=$(PKG_BUILD_DIR)/exfat.ko
 	AUTOLOAD:=$(call AutoLoad,30,exfat,1)
-	DEPENDS:=+kmod-nls-base @BUILD_PATENTED
+	DEPENDS:=+kmod-nls-base @(LINUX_4_14||LINUX_4_19)
 endef
 
-define KernelPackage/fs-exfat/description
+define KernelPackage/fs-exfat0/description
 	Kernel module for ExFAT Filesytems
 endef
 
-MAKE_OPTS:= \
-	ARCH="$(LINUX_KARCH)" \
-	CROSS_COMPILE="$(TARGET_CROSS)" \
-	M="$(PKG_BUILD_DIR)"
-
 define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		$(MAKE_OPTS) \
+	$(KERNEL_MAKE) \
 		CONFIG_EXFAT_FS=m \
+		M="$(PKG_BUILD_DIR)" \
 		modules
 endef
 
-$(eval $(call KernelPackage,fs-exfat))
+$(eval $(call KernelPackage,fs-exfat0))
diff --git a/utils/exfatprogs/Makefile b/utils/exfatprogs/Makefile
new file mode 100644
index 00000000..f66ff4ea
--- /dev/null
+++ b/utils/exfatprogs/Makefile
@@ -0,0 +1,53 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=exfatprogs
+PKG_VERSION:=1.0.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/$(PKG_NAME)/$(PKG_NAME)/tar.gz/$(PKG_VERSION)?
+PKG_HASH:=5cb2c9e65a1633148d498913508977e6073d6f454a7addfa98623f6d065d5589
+
+PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=COPYING
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/exfatprogs/Default
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Filesystem
+  URL:=https://github.com/exfatprogs/exfatprogs
+endef
+
+define Package/exfat-mkfs
+  $(Package/exfatprogs/Default)
+  TITLE:=Utility for creating an exFAT File System
+endef
+
+define Package/exfat-fsck
+  $(Package/exfatprogs/Default)
+  TITLE:=Utility for checking/repairing an exFAT File System
+endef
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--disable-static
+
+define Package/exfat-mkfs/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.exfat $(1)/usr/sbin
+endef
+
+define Package/exfat-fsck/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fsck.exfat $(1)/usr/sbin
+endef
+
+$(eval $(call BuildPackage,exfat-mkfs))
+$(eval $(call BuildPackage,exfat-fsck))