diff --git a/libimobiledevice/.SRCINFO b/libimobiledevice/.SRCINFO
new file mode 100644
index 0000000000..4bb5b1016f
--- /dev/null
+++ b/libimobiledevice/.SRCINFO
@@ -0,0 +1,21 @@
+pkgbase = libimobiledevice
+	pkgdesc = Library to communicate with services on iOS devices using native protocols
+	pkgver = 1.3.0
+	pkgrel = 14
+	url = https://libimobiledevice.org/
+	arch = x86_64
+	license = LGPL-2.1-or-later
+	makedepends = cython
+	makedepends = doxygen
+	makedepends = git
+	makedepends = python-setuptools
+	depends = glibc
+	depends = libimobiledevice-glue
+	depends = libplist
+	depends = libusbmuxd
+	depends = openssl
+	optdepends = python: Python bindings
+	source = git+https://github.com/libimobiledevice/libimobiledevice.git#tag=1.3.0
+	b2sums = 49d7d01a78a618860b774db835e4f0a7fb37743dc8f4b0b1a1fbefe71c3590d07de04616de2129c2a6090ac4211826004227c28dacff0e61e130e1c4c87c3072
+
+pkgname = libimobiledevice
diff --git a/libimobiledevice/.nvchecker.toml b/libimobiledevice/.nvchecker.toml
new file mode 100644
index 0000000000..965e194bf3
--- /dev/null
+++ b/libimobiledevice/.nvchecker.toml
@@ -0,0 +1,3 @@
+[libimobiledevice]
+source = "git"
+git = "https://github.com/libimobiledevice/libimobiledevice.git"
diff --git a/libimobiledevice/PKGBUILD b/libimobiledevice/PKGBUILD
index c84f163d90..fb075a34f4 100644
--- a/libimobiledevice/PKGBUILD
+++ b/libimobiledevice/PKGBUILD
@@ -6,47 +6,54 @@
 
 pkgname=libimobiledevice
 pkgver=1.3.0
-pkgrel=13
+pkgrel=14
 pkgdesc='Library to communicate with services on iOS devices using native protocols'
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url='https://libimobiledevice.org/'
-license=('LGPL-2.1-or-later')
-depends=('glibc' 'libplist' 'libusbmuxd' 'openssl')
-makedepends=('cython' 'python' 'python-setuptools')
+license=(LGPL-2.1-or-later)
+depends=(
+  glibc
+  libimobiledevice-glue
+  libplist
+  libusbmuxd
+  openssl
+)
+makedepends=(
+  cython
+  doxygen
+  git
+  python-setuptools
+)
 optdepends=('python: Python bindings')
-source=("https://github.com/libimobiledevice/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.bz2"
-        'libimobiledevice-libplist-2.3.0.patch'
-        'libimobiledevice-cython3.patch'
-        'libimobiledevice-python3.patch')
-sha256sums=('53f2640c6365cd9f302a6248f531822dc94a6cced3f17128d4479a77bd75b0f6'
-            '57fb4616c68c240aad47df52168fa30e4bf43845bfbe53df23cc412003ae64fd'
-            'cb6e7feb779f8a414551ecc90423dee1e654fab3acc5fdd15c61d5cea410bff4'
-            '3b706669b52d51cd7dff6c12f244ef6421eaa68c9ac5001e5f38fae1876f8b16')
+source=("git+https://github.com/libimobiledevice/libimobiledevice.git#tag=$pkgver")
+b2sums=(49d7d01a78a618860b774db835e4f0a7fb37743dc8f4b0b1a1fbefe71c3590d07de04616de2129c2a6090ac4211826004227c28dacff0e61e130e1c4c87c3072)
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd $pkgname
 
-  # Fix build with libplist 2.3.0
-  patch -Np1 -i ../libimobiledevice-libplist-2.3.0.patch
+  # Various fixes from upstream
+  git cherry-pick -n 1.3.0..6fc41f57fc607df9b07446ca45bdf754225c9bd9
 
   # Fix build with cython 3
-  patch -Np1 -i ../libimobiledevice-cython3.patch
-
-  # Fix compatibility with python 3
-  patch -Np1 -i ../libimobiledevice-python3.patch
+  git cherry-pick -n fb1dec7e2cbb2eae14536d8d68db25d3f9384ac1
+  git cherry-pick -n 59ec38cb6465f794cf8e2ab204711b9a10dd9eda
 
   autoreconf -fi
 }
 
 build() (
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
+  cd $pkgname
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
+  make docs
 )
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 
   # Include documentation
diff --git a/libimobiledevice/libimobiledevice-libplist-2.3.0.patch b/libimobiledevice/libimobiledevice-libplist-2.3.0.patch
deleted file mode 100644
index 25f8d3d478..0000000000
--- a/libimobiledevice/libimobiledevice-libplist-2.3.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git i/common/utils.c w/common/utils.c
-index 7f66ec2..7ebe997 100644
---- i/common/utils.c
-+++ w/common/utils.c
-@@ -314,7 +314,7 @@ int plist_read_from_filename(plist_t *plist, const char *filename)
- 	return 1;
- }
- 
--int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format)
-+int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format)
- {
- 	char *buffer = NULL;
- 	uint32_t length;
-diff --git i/common/utils.h w/common/utils.h
-index 2c3acec..4faa5bd 100644
---- i/common/utils.h
-+++ w/common/utils.h
-@@ -51,13 +51,8 @@ char *generate_uuid(void);
- void buffer_read_from_filename(const char *filename, char **buffer, uint64_t *length);
- void buffer_write_to_filename(const char *filename, const char *buffer, uint64_t length);
- 
--enum plist_format_t {
--	PLIST_FORMAT_XML,
--	PLIST_FORMAT_BINARY
--};
--
- int plist_read_from_filename(plist_t *plist, const char *filename);
--int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format);
-+int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format);
- 
- void plist_print_to_stream(plist_t plist, FILE* stream);
-