diff --git a/hardware/disk/exfatprogs/actions.py b/hardware/disk/exfatprogs/actions.py
index a25cddb985..83dd568f06 100644
--- a/hardware/disk/exfatprogs/actions.py
+++ b/hardware/disk/exfatprogs/actions.py
@@ -2,18 +2,37 @@
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
-# See the file https://www.gnu.org/licenses/gpl-3.0.txt
+# See the file http://www.gnu.org/licenses/gpl.txt
 
-from pisi.actionsapi import autotools, pisitools, get
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import get
 
 def setup():
-	autotools.configure("--disable-static")
+    shelltools.export("OPTIMIZER", "%s" % get.CFLAGS())
+    shelltools.export("DEBUG", "-DNDEBUG")
+
+    autotools.configure("--enable-readline=yes \
+                         --enable-blkid=yes")
 
 def build():
-	autotools.make()
+    autotools.make()
 
 def install():
-	autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    autotools.rawInstall("DIST_ROOT=%s" % get.installDIR())
+    autotools.rawInstall("DIST_ROOT=%s" % get.installDIR(), "install-dev")
+    # Needed for building the QA testsuite
+    #autotools.rawInstall("DIST_ROOT=%s" % get.installDIR(), "install-qa")
 
-	pisitools.dodoc("NEWS")
+    # Nuke static libraries
+    #pisitools.remove("/lib/libhandle.a")
+    #pisitools.remove("/lib/libhandle.la")
+    #pisitools.remove("/usr/lib/*.a")
 
+    # Fix the symlink
+    #pisitools.remove("/usr/lib/libhandle.so")
+    #pisitools.dosym("/lib/libhandle.so.1", "/usr/lib/libhandle.so")
+
+    # Set +x bit for the library
+    shelltools.chmod("%s/lib/libhandle.so.*.*.*" % get.installDIR(), 0755)
diff --git a/hardware/disk/exfatprogs/pspec.xml b/hardware/disk/exfatprogs/pspec.xml
index 4a9d07649a..6a15e61ed1 100644
--- a/hardware/disk/exfatprogs/pspec.xml
+++ b/hardware/disk/exfatprogs/pspec.xml
@@ -1,76 +1,142 @@
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
-	<Source>
-		<Name>exfatprogs</Name>
-		<Homepage>https://github.com/exfatprogs/exfatprogs</Homepage>
-		<Packager>
-			<Name>fury</Name>
-			<Email>uglyside@yandex.ru</Email>
-		</Packager>
-		<License>GPL-2</License>
-		<IsA>app:console</IsA>
-		<PartOf>hardware.disk</PartOf>
-		<Summary>exFAT filesystem userspace utilities.</Summary>
-		<Description>As new exfat filesystem is merged into linux-5.7 kernel, exfatprogs is created as an official userspace utilities that contain all of the standard utilities for creating and fixing and debugging exfat filesystem in linux system.</Description>
-		<Archive sha1sum="6ff0ad86aceef6067af9d85bf7df181a86793c74" type="tarxz">
-			https://github.com/exfatprogs/exfatprogs/releases/download/1.1.3/exfatprogs-1.1.3.tar.xz
-		</Archive>
-		<BuildDependencies>
-			<!-- <Dependency></Dependency> -->
-		</BuildDependencies>
-	</Source>
+    <Source>
+        <Name>xfsprogs</Name>
+        <Homepage>http://oss.sgi.com/projects/xfs/</Homepage>
+        <Packager>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>LGPLv2.1</License>
+        <IsA>app:console</IsA>
+        <Summary>XFS filesystem utilities</Summary>
+        <Description>xfsprogs contains a number of administrative utilities to work with and manage XFS filesystems.</Description>
+        <Archive sha1sum="31ace06bcf1ff14eaf0e5c858d138374b8311dc8" type="tarxz">https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.18.0.tar.xz</Archive>
+        <BuildDependencies>
+           <Dependency>icu4c-devel</Dependency>
+           <Dependency>liburcu-devel</Dependency>
+           <Dependency>libinih-devel</Dependency>
+           <Dependency>readline-devel</Dependency>
+           <Dependency>libunistring-devel</Dependency>
+           <Dependency>libutil-linux-devel</Dependency>
+           <Dependency>device-mapper-devel</Dependency>
+        </BuildDependencies>
+    </Source>
 
-	<Package>
-		<Name>exfatprogs</Name>
-		<Conflicts>
-			<!-- <Package>exfat-utils</Package> -->
-		</Conflicts>
-		<RuntimeDependencies>
-			<!-- <Dependency></Dependency> -->
-		</RuntimeDependencies>
-		<Files>
-			<Path fileType="executable">/usr/sbin</Path>
-			<Path fileType="man">/usr/share/man/man8</Path>
-			<Path fileType="doc">/usr/share/doc/exfatprogs/NEWS</Path>
-		</Files>
-	</Package>
+    <Package>
+        <Name>xfsprogs</Name>
+        <RuntimeDependencies>
+            <Dependency>icu4c</Dependency>
+            <Dependency>liburcu</Dependency>
+            <Dependency>libinih</Dependency>
+            <Dependency>readline</Dependency>
+            <Dependency>libunistring</Dependency>
+            <Dependency>libutil-linux</Dependency>
+            <Dependency>device-mapper</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/lib</Path>
+            <Path fileType="executable">/sbin</Path>
+            <Path fileType="executable">/usr/sbin</Path>
+            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="data">/usr/share/xfsprogs</Path>
+        </Files>
+    </Package>
 
-	<History>
-		<Update release="5">
-			<Date>2021-11-17</Date>
-			<Version>1.1.3</Version>
-			<Comment>Version bump.</Comment>
-			<Name>fury</Name>
-			<Email>uglyside@yandex.ru</Email>
-		</Update>
-		<Update release="4">
-			<Date>2021-06-22</Date>
-			<Version>1.1.2</Version>
-			<Comment>Version bump.</Comment>
-			<Name>fury</Name>
-			<Email>uglyside@yandex.ru</Email>
-		</Update>
-		<Update release="3">
-			<Date>2021-05-04</Date>
-			<Version>1.1.1</Version>
-			<Comment>Version bump.</Comment>
-			<Name>fury</Name>
-			<Email>uglyside@yandex.ru</Email>
-		</Update>
-		<Update release="2">
-			<Date>2021-03-07</Date>
-			<Version>1.1.0</Version>
-			<Comment>Version bump.</Comment>
-			<Name>fury</Name>
-			<Email>uglyside@yandex.ru</Email>
-		</Update>
-		<Update release="1">
-			<Date>2021-01-26</Date>
-			<Version>1.0.4</Version>
-			<Comment>First Beta build.</Comment>
-			<Name>fury</Name>
-			<Email>uglyside@yandex.ru</Email>
-		</Update>
-	</History>
+    <Package>
+        <Name>xfsprogs-devel</Name>
+        <Summary>Development headers for xfsprogs</Summary>
+        <RuntimeDependencies>
+            <Dependency>libutil-linux-devel</Dependency>
+            <Dependency release="current">xfsprogs</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="header">/usr/include</Path>
+            <Path fileType="man">/usr/share/man/man3</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="11">
+            <Date>2022-06-04</Date>
+            <Version>5.18.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="10">
+            <Date>2021-12-08</Date>
+            <Version>5.14.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="9">
+            <Date>2021-11-21</Date>
+            <Version>5.14.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="8">
+            <Date>2021-08-23</Date>
+            <Version>5.13.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="7">
+            <Date>2021-02-27</Date>
+            <Version>5.10.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
+        <Update release="6">
+            <Date>2020-01-19</Date>
+            <Version>5.4.0</Version>
+            <Comment>Version Bump</Comment>
+            <Name>İdris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
+        <Update release="5">
+            <Date>2019-04-26</Date>
+            <Version>4.19.0</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="4">
+            <Date>2016-06-09</Date>
+            <Version>4.15.0</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="3">
+            <Date>2017-01-29</Date>
+            <Version>4.9.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Stefan Gronewold(groni)</Name>
+            <Email>groni@pisilinux.org</Email>
+        </Update>
+        <Update release="2">
+            <Date>2016-06-09</Date>
+            <Version>3.2.4</Version>
+            <Comment>Release Bump</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
+            <Date>2015-08-04</Date>
+            <Version>3.2.4</Version>
+            <Comment>First release</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+    </History>
 </PISI>