diff --git a/build/packages/edge.packages b/build/packages/edge.packages
index e203e05..61c564c 100644
--- a/build/packages/edge.packages
+++ b/build/packages/edge.packages
@@ -19,6 +19,7 @@ elephant-symbols
 elephant-todo
 elephant-unicode
 elephant-websearch
+libretro-fbneo-git
 limine-mkinitcpio-hook
 limine-snapper-sync
 macbook12-spi-driver-dkms
diff --git a/pkgbuilds/edge/libretro-fbneo-git/.SRCINFO b/pkgbuilds/edge/libretro-fbneo-git/.SRCINFO
new file mode 100644
index 0000000..e96028a
--- /dev/null
+++ b/pkgbuilds/edge/libretro-fbneo-git/.SRCINFO
@@ -0,0 +1,31 @@
+pkgbase = libretro-fbneo-git
+	pkgdesc = FinalBurn Neo multi-arcade core
+	pkgver = 1.0.0.02.r7631.g8d2b25c
+	pkgrel = 1
+	epoch = 1
+	url = https://github.com/libretro/FBNeo
+	arch = aarch64
+	arch = armv7h
+	arch = i486
+	arch = i686
+	arch = pentium4
+	arch = x86_64
+	groups = libretro
+	license = LicenseRef-FBNeo
+	makedepends = git
+	makedepends = libgcc
+	makedepends = libstdc++
+	makedepends = zlib
+	depends = glibc
+	depends = libretro-core-info
+	provides = libretro-fbneo=1.0.0.02.r7631.g8d2b25c
+	conflicts = libretro-fbneo
+	source = libretro-fbneo::git+https://github.com/libretro/FBNeo.git
+	b2sums = SKIP
+
+pkgname = libretro-fbneo-git
+	depends = glibc
+	depends = libretro-core-info
+	depends = libgcc_s.so
+	depends = libstdc++.so
+	depends = libz.so
diff --git a/pkgbuilds/edge/libretro-fbneo-git/PKGBUILD b/pkgbuilds/edge/libretro-fbneo-git/PKGBUILD
new file mode 100644
index 0000000..2c40608
--- /dev/null
+++ b/pkgbuilds/edge/libretro-fbneo-git/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Alexandre Bouvier <contact@amb.tf>
+# Contributor: Oliver Jaksch <arch-aur@com-in.de>
+_pkgname=libretro-fbneo
+pkgname=$_pkgname-git
+pkgver=1.0.0.02.r7631.g8d2b25c
+pkgrel=1
+epoch=1
+pkgdesc="FinalBurn Neo multi-arcade core"
+arch=('aarch64' 'armv7h' 'i486' 'i686' 'pentium4' 'x86_64')
+url="https://github.com/libretro/FBNeo"
+license=('LicenseRef-FBNeo')
+groups=('libretro')
+depends=('glibc' 'libretro-core-info')
+makedepends=('git' 'libgcc' 'libstdc++' 'zlib')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+source=("$_pkgname::git+$url.git")
+b2sums=('SKIP')
+
+pkgver() {
+	cd $_pkgname
+	git describe --long --tags --abbrev=7 | sed 's/^v//;s/[^-]*-g/r&/;s/-/./g'
+}
+
+prepare() {
+	cd $_pkgname/src/burner/libretro
+	# remove hardcoded optimization flags
+	sed -Ei 's/-O([0123s]|fast)//' Makefile
+	make generate-files
+}
+
+build() {
+	cd $_pkgname/src/burner/libretro
+	make EXTERNAL_ZLIB=1
+}
+
+package() {
+	depends+=('libgcc_s.so' 'libstdc++.so' 'libz.so')
+
+	cd $_pkgname/src
+	# shellcheck disable=SC2154
+	install -D -t "$pkgdir"/usr/lib/libretro burner/libretro/fbneo_libretro.so
+	install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname license.txt
+}