diff --git a/sys-fs/fatsort/fatsort-0.9.17.269.recipe b/sys-fs/fatsort/fatsort-0.9.17.269.recipe
deleted file mode 100644
index ed7671c09..000000000
--- a/sys-fs/fatsort/fatsort-0.9.17.269.recipe
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION="
-Sorts files on FAT16/32 partitions, ideal for basic audio players.
-"
-HOMEPAGE="http://fatsort.sourceforge.net/"
-SOURCE_URI="http://downloads.sourceforge.net/project/fatsort/fatsort-0.9.17.269.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Ffatsort%2Ffiles%2F&ts=1364726083&use_mirror=freefr"
-CHECKSUM_MD5="3d04984b08afe8119475d0f1343120db"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-
-BUILD()
-{
-	cd fatsort-0.9.17.269
-	make CFLAGS="-include /boot/develop/headers/posix/stdint.h" LDFLAGS=-ltextencoding
-}
-
-INSTALL()
-{
-	cd fatsort-0.9.17.269
-	make install MANDIR=/boot/common/documentation/man/man1 SBINDIR=/boot/common/bin
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2004 Boris Leidner"
diff --git a/sys-fs/fatsort/fatsort-1.3.365.recipe b/sys-fs/fatsort/fatsort-1.3.365.recipe
new file mode 100644
index 000000000..9956709c1
--- /dev/null
+++ b/sys-fs/fatsort/fatsort-1.3.365.recipe
@@ -0,0 +1,45 @@
+SUMMARY="Sorts files on FAT16/32 partitions"
+DESCRIPTION="FATSort is a small utilitiy for Linux that sorts directory \
+structures of FAT12, FAT16 and FAT32 file systems. It is written in C and \
+can be run from the command line."
+HOMEPAGE="http://fatsort.sourceforge.net/"
+COPYRIGHT="2004-2014 Boris Leidner"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://sf.net/projects/fatsort/files/fatsort-1.3.365.tar.gz"
+CHECKSUM_SHA256="77acc374b189e80e3d75d3508f3c0ca559f8030f1c220f7cfde719a4adb03f3d"
+PATCHES="fatsort-$portVersion.patchset"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	fatsort$secondaryArchSuffix = $portVersion
+	cmd:fatsort$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libiconv$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:help2man
+	cmd:make
+	"
+
+BUILD()
+{
+	make LDFLAGS=-ltextencoding
+}
+
+INSTALL()
+{
+	mkdir -p $manDir/man1
+
+	make install MANDIR=$manDir/man1 SBINDIR=$sbinDir
+}
diff --git a/sys-fs/fatsort/patches/fatsort-1.3.365.patchset b/sys-fs/fatsort/patches/fatsort-1.3.365.patchset
new file mode 100644
index 000000000..5a953b7a5
--- /dev/null
+++ b/sys-fs/fatsort/patches/fatsort-1.3.365.patchset
@@ -0,0 +1,84 @@
+From ef1e258751d98564f94120f7f188d1f234ff1b88 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Wed, 10 May 2017 21:57:25 +0200
+Subject: fix stdint.h references
+
+
+diff --git a/src/FAT_fs.h b/src/FAT_fs.h
+index 27b0746..6fb9413 100644
+--- a/src/FAT_fs.h
++++ b/src/FAT_fs.h
+@@ -66,6 +66,10 @@
+ #include <sys/types.h>
+ #include <iconv.h>
+ 
++#if defined (__HAIKU__)
++#include <stdint.h>
++#endif
++
+ #include "platform.h"
+ 
+ // Directory entry structures
+diff --git a/src/clusterchain.h b/src/clusterchain.h
+index deb3c17..3c68661 100644
+--- a/src/clusterchain.h
++++ b/src/clusterchain.h
+@@ -29,6 +29,10 @@
+ 
+ #include <sys/types.h>
+ 
++#if defined (__HAIKU__)
++#include <stdint.h>
++#endif
++
+ #include "platform.h"
+ 
+ struct sClusterChain {
+diff --git a/src/fileio.h b/src/fileio.h
+index badd5a3..1b45234 100644
+--- a/src/fileio.h
++++ b/src/fileio.h
+@@ -28,6 +28,10 @@
+ #include <sys/types.h>
+ #include "platform.h"
+ 
++#if defined (__HAIKU__)
++#include <stdint.h>
++#endif
++
+ int fs_seek(FILE *stream, off_t offset, int whence);
+ off_t fs_read(void *ptr, u_int32_t size, u_int32_t n, FILE *stream);
+ off_t fs_write(const void *ptr, u_int32_t size, u_int32_t n, FILE *stream);
+diff --git a/src/natstrcmp.h b/src/natstrcmp.h
+index a2f4463..f092c37 100644
+--- a/src/natstrcmp.h
++++ b/src/natstrcmp.h
+@@ -26,6 +26,10 @@
+ 
+ #include <sys/types.h>
+ 
++#if defined (__HAIKU__)
++#include <stdint.h>
++#endif
++
+ // natural order comparison
+ int32_t natstrcmp(const char *str1, const char *str2);
+ 
+diff --git a/src/stringlist.h b/src/stringlist.h
+index 52943fb..c0b4082 100644
+--- a/src/stringlist.h
++++ b/src/stringlist.h
+@@ -28,6 +28,10 @@
+ #include "platform.h"
+ #include "FAT_fs.h"
+ 
++#if defined (__HAIKU__)
++#include <stdint.h>
++#endif
++
+ struct sStringList {
+ 	char *str;
+ 	struct sStringList *next;
+-- 
+2.7.0
+