diff --git a/reactos/dll/win32/fmifs/fmifs.rbuild b/reactos/dll/win32/fmifs/fmifs.rbuild
index dee10fe3902..d4498926012 100644
--- a/reactos/dll/win32/fmifs/fmifs.rbuild
+++ b/reactos/dll/win32/fmifs/fmifs.rbuild
@@ -1,4 +1,4 @@
-<module name="fmifs" type="win32dll" entrypoint="_InitializeFmIfs@12" baseaddress="${BASEADDRESS_FMIFS}" installbase="system32" installname="fmifs.dll">
+<module name="fmifs" type="win32dll" entrypoint="InitializeFmIfs@12" baseaddress="${BASEADDRESS_FMIFS}" installbase="system32" installname="fmifs.dll">
 	<importlibrary definition="fmifs.def" />
 	<include base="fmifs">.</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/dll/win32/fmifs/init.c b/reactos/dll/win32/fmifs/init.c
index 459f60380d0..41ef3115d35 100644
--- a/reactos/dll/win32/fmifs/init.c
+++ b/reactos/dll/win32/fmifs/init.c
@@ -21,10 +21,10 @@ GetProvider(
 	PIFS_PROVIDER Provider;
 
 	ListEntry = ProviderListHead.Flink;
-	while (ListEntry != ProviderListHead.Flink)
+	while (ListEntry != &ProviderListHead)
 	{
 		Provider = CONTAINING_RECORD(ListEntry, IFS_PROVIDER, ListEntry);
-		if (wcscmp(Provider->Name, FileSystem) == 0)
+		if (_wcsicmp(Provider->Name, FileSystem) == 0)
 			return Provider;
 		ListEntry = ListEntry->Flink;
 	}
diff --git a/reactos/dll/win32/ufat/ufat.def b/reactos/dll/win32/ufat/ufat.def
new file mode 100644
index 00000000000..53da9341f3a
--- /dev/null
+++ b/reactos/dll/win32/ufat/ufat.def
@@ -0,0 +1,3 @@
+LIBRARY UFAT.DLL
+EXPORTS
+FormatEx=VfatFormat@24
\ No newline at end of file
diff --git a/reactos/dll/win32/ufat/ufat.rbuild b/reactos/dll/win32/ufat/ufat.rbuild
new file mode 100644
index 00000000000..c214aed2f24
--- /dev/null
+++ b/reactos/dll/win32/ufat/ufat.rbuild
@@ -0,0 +1,10 @@
+<module name="ufat" type="win32dll" baseaddress="${BASEADDRESS_UFAT}" installbase="system32" installname="ufat.dll">
+	<importlibrary definition="ufat.def" />
+	<include base="ufat">.</include>
+	<define name="_DISABLE_TIDENTS" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_WINNT">0x0600</define>
+	<library>vfatlib</library>
+	<library>ntdll</library>
+	<file>ufat.rc</file>
+</module>
diff --git a/reactos/dll/win32/ufat/ufat.rc b/reactos/dll/win32/ufat/ufat.rc
new file mode 100644
index 00000000000..b6b57661884
--- /dev/null
+++ b/reactos/dll/win32/ufat/ufat.rc
@@ -0,0 +1,5 @@
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"FAT File System Management\0"
+#define REACTOS_STR_INTERNAL_NAME	"ufat\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ufat.dll\0"
+#include <reactos/version.rc>
diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild
index 4eaaad1b317..9b7819a6589 100644
--- a/reactos/dll/win32/win32.rbuild
+++ b/reactos/dll/win32/win32.rbuild
@@ -226,6 +226,9 @@
 <directory name="twain_32">
 	<xi:include href="twain_32/twain_32.rbuild" />
 </directory>
+<directory name="ufat">
+	<xi:include href="ufat/ufat.rbuild" />
+</directory>
 <directory name="urlmon">
 	<xi:include href="urlmon/urlmon.rbuild" />
 </directory>