diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD
deleted file mode 100644
index ca263fc90..000000000
--- a/extra/fsarchiver/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - patch to fix conflicting type definitions (fixes AArch64 build) (thanks Fedora)
-
-pkgname=fsarchiver
-pkgver=0.6.20
-pkgrel=1
-pkgdesc='Safe and flexible file-system backup and deployment tool'
-arch=('i686' 'x86_64')
-url='http://www.fsarchiver.org/'
-license=('GPL2')
-depends=('bzip2' 'e2fsprogs' 'lzo' 'xz' 'libgcrypt')
-source=(https://github.com/fdupoux/fsarchiver/releases/download/$pkgver/fsarchiver-$pkgver.tar.gz
-        fsarchiver-0.6.19-do-not-duplicate-types.patch)
-md5sums=('04d73f8f8e8dd0063e06f74a125bdcb6'
-         '009bafd9ec764dc2863e18742992bc45')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../fsarchiver-0.6.19-do-not-duplicate-types.patch
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sbindir=/usr/bin
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/extra/fsarchiver/fsarchiver-0.6.19-do-not-duplicate-types.patch b/extra/fsarchiver/fsarchiver-0.6.19-do-not-duplicate-types.patch
deleted file mode 100644
index cf99b2693..000000000
--- a/extra/fsarchiver/fsarchiver-0.6.19-do-not-duplicate-types.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/fs_btrfs.h b/src/fs_btrfs.h
-index e2461f3..923e7f5 100644
---- a/src/fs_btrfs.h
-+++ b/src/fs_btrfs.h
-@@ -18,6 +18,8 @@
- #ifndef __FS_BTRFS_H__
- #define __FS_BTRFS_H__
- 
-+#include <linux/types.h>
-+
- struct s_dico;
- struct s_strlist;
- 
-diff --git a/src/fs_xfs.h b/src/fs_xfs.h
-index ee3c53d..17d0d5e 100644
---- a/src/fs_xfs.h
-+++ b/src/fs_xfs.h
-@@ -18,6 +18,8 @@
- #ifndef __FS_XFS_H__
- #define __FS_XFS_H__
- 
-+#include <linux/types.h>
-+
- struct s_dico;
- struct s_strlist;
- 
-@@ -36,8 +38,6 @@ typedef uint16_t __u16;
- typedef int16_t __s16;
- typedef uint32_t __u32;
- typedef int32_t __s32;
--typedef uint64_t __u64;
--typedef int64_t __s64;
- 
- typedef __uint32_t      xfs_agblock_t;  /* blockno in alloc. group */
- typedef __uint32_t      xfs_extlen_t;   /* extent length in blocks */
-diff --git a/src/types.h b/src/types.h
-index b69dfd7..a18e139 100644
---- a/src/types.h
-+++ b/src/types.h
-@@ -34,7 +34,6 @@ typedef int64_t s64;
- 
- typedef uint16_t __le16;
- typedef uint32_t __le32;
--typedef uint64_t __le64;
- 
- #define le8_to_cpu(v) (v)
- #define cpu_to_le8(v) (v)