diff --git a/build/packages/edge.packages b/build/packages/edge.packages
index f84a5bb..8dd26e3 100644
--- a/build/packages/edge.packages
+++ b/build/packages/edge.packages
@@ -20,8 +20,11 @@ elephant-todo
 elephant-unicode
 elephant-websearch
 heroic-games-launcher-bin
+libretro-cap32-git
 libretro-database-git
 libretro-fbneo-git
+libretro-uae-git
+libretro-vice-git
 limine-mkinitcpio-hook
 limine-snapper-sync
 macbook12-spi-driver-dkms
diff --git a/pkgbuilds/edge/libretro-cap32-git/.SRCINFO b/pkgbuilds/edge/libretro-cap32-git/.SRCINFO
new file mode 100644
index 0000000..420f7fc
--- /dev/null
+++ b/pkgbuilds/edge/libretro-cap32-git/.SRCINFO
@@ -0,0 +1,23 @@
+pkgbase = libretro-cap32-git
+	pkgdesc = Amstrad CPC core
+	pkgver = 4.5.4.r43.g54eabbb
+	pkgrel = 1
+	epoch = 1
+	url = https://github.com/libretro/libretro-cap32
+	arch = aarch64
+	arch = armv7h
+	arch = i486
+	arch = i686
+	arch = pentium4
+	arch = x86_64
+	groups = libretro
+	license = GPL-2.0-or-later
+	makedepends = git
+	depends = glibc
+	depends = libretro-core-info
+	provides = libretro-cap32
+	conflicts = libretro-cap32
+	source = libretro-cap32::git+https://github.com/libretro/libretro-cap32.git
+	b2sums = SKIP
+
+pkgname = libretro-cap32-git
diff --git a/pkgbuilds/edge/libretro-cap32-git/PKGBUILD b/pkgbuilds/edge/libretro-cap32-git/PKGBUILD
new file mode 100644
index 0000000..b98b1b0
--- /dev/null
+++ b/pkgbuilds/edge/libretro-cap32-git/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Alexandre Bouvier <contact@amb.tf>
+# Contributor: Oliver Jaksch <arch-aur@com-in.de>
+_pkgname=libretro-cap32
+pkgname=$_pkgname-git
+pkgver=4.5.4.r43.g54eabbb
+pkgrel=1
+epoch=1
+pkgdesc="Amstrad CPC core"
+arch=('aarch64' 'armv7h' 'i486' 'i686' 'pentium4' 'x86_64')
+url="https://github.com/libretro/libretro-cap32"
+license=('GPL-2.0-or-later')
+groups=('libretro')
+depends=('glibc' 'libretro-core-info')
+makedepends=('git')
+provides=("$_pkgname")
+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
+	# remove hardcoded optimization flags
+	sed -Ei 's/-O([0123s]|fast)//' Makefile
+}
+
+build() {
+	cd $_pkgname
+	make
+}
+
+package() {
+	cd $_pkgname
+	# shellcheck disable=SC2154
+	install -D -t "$pkgdir"/usr/lib/libretro cap32_libretro.so
+}
diff --git a/pkgbuilds/edge/libretro-uae-git/.SRCINFO b/pkgbuilds/edge/libretro-uae-git/.SRCINFO
new file mode 100644
index 0000000..ed1f1e3
--- /dev/null
+++ b/pkgbuilds/edge/libretro-uae-git/.SRCINFO
@@ -0,0 +1,20 @@
+pkgbase = libretro-uae-git
+	pkgdesc = A port of the Commodore Amiga Emulator to libretro (WIP)
+	pkgver = 443.be625e3
+	pkgrel = 1
+	url = https://github.com/libretro/libretro-uae
+	arch = i686
+	arch = x86_64
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	groups = libretro
+	license = GPL3
+	makedepends = git
+	depends = zlib
+	depends = libretro-core-info
+	source = git+https://github.com/libretro/libretro-uae.git
+	sha256sums = SKIP
+
+pkgname = libretro-uae-git
+
diff --git a/pkgbuilds/edge/libretro-uae-git/PKGBUILD b/pkgbuilds/edge/libretro-uae-git/PKGBUILD
new file mode 100644
index 0000000..a57dcee
--- /dev/null
+++ b/pkgbuilds/edge/libretro-uae-git/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: quellen <lodgerz@gmail.com>
+
+pkgname=libretro-uae-git
+pkgver=443.be625e3
+pkgrel=1
+pkgdesc="A port of the Commodore Amiga Emulator to libretro (WIP)"
+arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
+url="https://github.com/libretro/libretro-uae"
+license=('GPL3')
+groups=('libretro')
+depends=('zlib' 'libretro-core-info')
+makedepends=('git')
+
+_libname=puae_libretro
+_gitname=libretro-uae
+source=("git+https://github.com/libretro/${_gitname}.git")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "${_gitname}"
+  echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
+build() {
+  cd "${_gitname}"
+  make
+}
+
+package() {
+  install -Dm644 "${_gitname}/${_libname}.so" "${pkgdir}/usr/lib/libretro/${_libname}.so"
+}
\ No newline at end of file
diff --git a/pkgbuilds/edge/libretro-vice-git/.SRCINFO b/pkgbuilds/edge/libretro-vice-git/.SRCINFO
new file mode 100644
index 0000000..e7ac8fe
--- /dev/null
+++ b/pkgbuilds/edge/libretro-vice-git/.SRCINFO
@@ -0,0 +1,119 @@
+pkgbase = libretro-vice-git
+	pkgver = r21243.cd9b682
+	pkgrel = 1
+	url = https://github.com/libretro/vice-libretro
+	arch = aarch64
+	arch = armv7h
+	arch = i486
+	arch = i686
+	arch = pentium4
+	arch = x86_64
+	groups = libretro
+	license = GPL-2.0-or-later
+	makedepends = git
+	makedepends = libgcc
+	makedepends = libstdc++
+	depends = glibc
+	depends = libretro-core-info
+	conflicts = libretro-vice-git
+	source = libretro-vice::git+https://github.com/libretro/vice-libretro.git
+	b2sums = SKIP
+
+pkgname = libretro-vice-x128-git
+	pkgdesc = Commodore C128 core
+	depends = glibc
+	depends = libretro-core-info
+	depends = libgcc_s.so
+	depends = libstdc++.so
+	provides = libretro-vice-x128=21243.cd9b682
+	conflicts = libretro-vice-git
+	conflicts = libretro-vice-x128
+
+pkgname = libretro-vice-x64-git
+	pkgdesc = Commodore C64 core (fast)
+	depends = glibc
+	depends = libretro-core-info
+	depends = libgcc_s.so
+	depends = libstdc++.so
+	provides = libretro-vice-x64=21243.cd9b682
+	conflicts = libretro-vice-git
+	conflicts = libretro-vice-x64
+
+pkgname = libretro-vice-x64dtv-git
+	pkgdesc = Commodore C64DTV core
+	depends = glibc
+	depends = libretro-core-info
+	depends = libstdc++.so
+	provides = libretro-vice-x64dtv=21243.cd9b682
+	conflicts = libretro-vice-git
+	conflicts = libretro-vice-x64dtv
+
+pkgname = libretro-vice-x64sc-git
+	pkgdesc = Commodore C64 core (accurate)
+	depends = glibc
+	depends = libretro-core-info
+	depends = libgcc_s.so
+	depends = libstdc++.so
+	provides = libretro-vice-x64sc=21243.cd9b682
+	conflicts = libretro-vice-git
+	conflicts = libretro-vice-x64sc
+
+pkgname = libretro-vice-xcbm2-git
+	pkgdesc = Commodore CBM-II 6x0/7x0 core
+	depends = glibc
+	depends = libretro-core-info
+	depends = libgcc_s.so
+	depends = libstdc++.so
+	provides = libretro-vice-xcbm2=21243.cd9b682
+	conflicts = libretro-vice-git
+	conflicts = libretro-vice-xcbm2
+
+pkgname = libretro-vice-xcbm5x0-git
+	pkgdesc = Commodore CBM-II 5x0 core
+	depends = glibc
+	depends = libretro-core-info
+	depends = libgcc_s.so
+	depends = libstdc++.so
+	provides = libretro-vice-xcbm5x0=21243.cd9b682
+	conflicts = libretro-vice-git
+	conflicts = libretro-vice-xcbm5x0
+
+pkgname = libretro-vice-xpet-git
+	pkgdesc = Commodore PET core
+	depends = glibc
+	depends = libretro-core-info
+	depends = libgcc_s.so
+	depends = libstdc++.so
+	provides = libretro-vice-xpet=21243.cd9b682
+	conflicts = libretro-vice-git
+	conflicts = libretro-vice-xpet
+
+pkgname = libretro-vice-xplus4-git
+	pkgdesc = Commodore Plus/4 core
+	depends = glibc
+	depends = libretro-core-info
+	depends = libgcc_s.so
+	depends = libstdc++.so
+	provides = libretro-vice-xplus4=21243.cd9b682
+	conflicts = libretro-vice-git
+	conflicts = libretro-vice-xplus4
+
+pkgname = libretro-vice-xscpu64-git
+	pkgdesc = Commodore C64 SuperCPU core
+	depends = glibc
+	depends = libretro-core-info
+	depends = libgcc_s.so
+	depends = libstdc++.so
+	provides = libretro-vice-xscpu64=21243.cd9b682
+	conflicts = libretro-vice-git
+	conflicts = libretro-vice-xscpu64
+
+pkgname = libretro-vice-xvic-git
+	pkgdesc = Commodore VIC-20 core
+	depends = glibc
+	depends = libretro-core-info
+	depends = libgcc_s.so
+	depends = libstdc++.so
+	provides = libretro-vice-xvic=21243.cd9b682
+	conflicts = libretro-vice-git
+	conflicts = libretro-vice-xvic
diff --git a/pkgbuilds/edge/libretro-vice-git/PKGBUILD b/pkgbuilds/edge/libretro-vice-git/PKGBUILD
new file mode 100644
index 0000000..ffbbe1a
--- /dev/null
+++ b/pkgbuilds/edge/libretro-vice-git/PKGBUILD
@@ -0,0 +1,156 @@
+# Maintainer: Alexandre Bouvier <contact@amb.tf>
+# Contributor: Anthony Wang <ta180m@pm.me>
+# Contributor: quellen <lodgerz@gmail.com>
+# Contributor: Daniel Menelkir <menelkir@itroll.org>
+_pkgbase=libretro-vice
+pkgname=("$_pkgbase"-{x128,x64,x64dtv,x64sc,xcbm2,xcbm5x0,xpet,xplus4,xscpu64,xvic}-git)
+pkgbase=$_pkgbase-git
+pkgver=r21243.cd9b682
+pkgrel=1
+arch=('aarch64' 'armv7h' 'i486' 'i686' 'pentium4' 'x86_64')
+url="https://github.com/libretro/vice-libretro"
+license=('GPL-2.0-or-later')
+groups=('libretro')
+depends=('glibc' 'libretro-core-info')
+makedepends=('git' 'libgcc' 'libstdc++')
+conflicts=("$pkgbase")
+source=("$_pkgbase::git+$url.git")
+b2sums=('SKIP')
+
+pkgver() {
+	cd $_pkgbase
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
+}
+
+prepare() {
+	cd $_pkgbase
+	# remove hardcoded optimization flags
+	sed -Ei 's/-O([0123s]|fast)//' Makefile
+	# remove hardcoded strip
+	sed -i '/LDFLAGS/s/-s\b//' Makefile
+}
+
+build() {
+	cd $_pkgbase
+	make clean EMUTYPE=x128
+	make all EMUTYPE=x128
+	make clean EMUTYPE=x64
+	make all EMUTYPE=x64
+	make clean EMUTYPE=x64dtv
+	make all EMUTYPE=x64dtv
+	make clean EMUTYPE=x64sc
+	make all EMUTYPE=x64sc
+	make clean EMUTYPE=xcbm2
+	make all EMUTYPE=xcbm2
+	make clean EMUTYPE=xcbm5x0
+	make all EMUTYPE=xcbm5x0
+	make clean EMUTYPE=xpet
+	make all EMUTYPE=xpet
+	make clean EMUTYPE=xplus4
+	make all EMUTYPE=xplus4
+	make clean EMUTYPE=xscpu64
+	make all EMUTYPE=xscpu64
+	make clean EMUTYPE=xvic
+	make all EMUTYPE=xvic
+}
+
+package_libretro-vice-x128-git() {
+	pkgdesc="Commodore C128 core"
+	depends+=('libgcc_s.so' 'libstdc++.so')
+	provides=("$_pkgbase-x128=${pkgver#r}")
+	conflicts+=("$_pkgbase-x128")
+
+	cd $_pkgbase
+	# shellcheck disable=SC2154
+	install -D -t "$pkgdir"/usr/lib/libretro vice_x128_libretro.so
+}
+
+package_libretro-vice-x64-git() {
+	pkgdesc="Commodore C64 core (fast)"
+	depends+=('libgcc_s.so' 'libstdc++.so')
+	provides=("$_pkgbase-x64=${pkgver#r}")
+	conflicts+=("$_pkgbase-x64")
+
+	cd $_pkgbase
+	install -D -t "$pkgdir"/usr/lib/libretro vice_x64_libretro.so
+}
+
+package_libretro-vice-x64dtv-git() {
+	pkgdesc="Commodore C64DTV core"
+	depends+=('libstdc++.so')
+	provides=("$_pkgbase-x64dtv=${pkgver#r}")
+	conflicts+=("$_pkgbase-x64dtv")
+
+	cd $_pkgbase
+	install -D -t "$pkgdir"/usr/lib/libretro vice_x64dtv_libretro.so
+}
+
+package_libretro-vice-x64sc-git() {
+	pkgdesc="Commodore C64 core (accurate)"
+	depends+=('libgcc_s.so' 'libstdc++.so')
+	provides=("$_pkgbase-x64sc=${pkgver#r}")
+	conflicts+=("$_pkgbase-x64sc")
+
+	cd $_pkgbase
+	install -D -t "$pkgdir"/usr/lib/libretro vice_x64sc_libretro.so
+}
+
+package_libretro-vice-xcbm2-git() {
+	pkgdesc="Commodore CBM-II 6x0/7x0 core"
+	depends+=('libgcc_s.so' 'libstdc++.so')
+	provides=("$_pkgbase-xcbm2=${pkgver#r}")
+	conflicts+=("$_pkgbase-xcbm2")
+
+	cd $_pkgbase
+	install -D -t "$pkgdir"/usr/lib/libretro vice_xcbm2_libretro.so
+}
+
+package_libretro-vice-xcbm5x0-git() {
+	pkgdesc="Commodore CBM-II 5x0 core"
+	depends+=('libgcc_s.so' 'libstdc++.so')
+	provides=("$_pkgbase-xcbm5x0=${pkgver#r}")
+	conflicts+=("$_pkgbase-xcbm5x0")
+
+	cd $_pkgbase
+	install -D -t "$pkgdir"/usr/lib/libretro vice_xcbm5x0_libretro.so
+}
+
+package_libretro-vice-xpet-git() {
+	pkgdesc="Commodore PET core"
+	depends+=('libgcc_s.so' 'libstdc++.so')
+	provides=("$_pkgbase-xpet=${pkgver#r}")
+	conflicts+=("$_pkgbase-xpet")
+
+	cd $_pkgbase
+	install -D -t "$pkgdir"/usr/lib/libretro vice_xpet_libretro.so
+}
+
+package_libretro-vice-xplus4-git() {
+	pkgdesc="Commodore Plus/4 core"
+	depends+=('libgcc_s.so' 'libstdc++.so')
+	provides=("$_pkgbase-xplus4=${pkgver#r}")
+	conflicts+=("$_pkgbase-xplus4")
+
+	cd $_pkgbase
+	install -D -t "$pkgdir"/usr/lib/libretro vice_xplus4_libretro.so
+}
+
+package_libretro-vice-xscpu64-git() {
+	pkgdesc="Commodore C64 SuperCPU core"
+	depends+=('libgcc_s.so' 'libstdc++.so')
+	provides=("$_pkgbase-xscpu64=${pkgver#r}")
+	conflicts+=("$_pkgbase-xscpu64")
+
+	cd $_pkgbase
+	install -D -t "$pkgdir"/usr/lib/libretro vice_xscpu64_libretro.so
+}
+
+package_libretro-vice-xvic-git() {
+	pkgdesc="Commodore VIC-20 core"
+	depends+=('libgcc_s.so' 'libstdc++.so')
+	provides=("$_pkgbase-xvic=${pkgver#r}")
+	conflicts+=("$_pkgbase-xvic")
+
+	cd $_pkgbase
+	install -D -t "$pkgdir"/usr/lib/libretro vice_xvic_libretro.so
+}