diff --git a/common/shlibs b/common/shlibs
index 27763bf428b..82a21cfa274 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2939,7 +2939,6 @@ libspectrum.so.8 libspectrum-1.2.2_1
 libbearssl.so.0 bearssl-0.3_1
 libXfont2.so.2 libXfont2-2.0.1_1
 libqalculate.so.22 libqalculate-3.20.1_1
-libweston-9.so.0 weston-9.0.0_1
 libostree-1.so.1 ostree-2023.1_1
 librhash.so.1 rhash-1.4.4_1
 libserialport.so.0 libserialport-0.1.1_1
diff --git a/srcpkgs/weston-devel b/srcpkgs/weston-devel
new file mode 120000
index 00000000000..d103f6c5f48
--- /dev/null
+++ b/srcpkgs/weston-devel
@@ -0,0 +1 @@
+weston
\ No newline at end of file
diff --git a/srcpkgs/weston/files/README.voidlinux b/srcpkgs/weston/files/README.voidlinux
index 907324979cd..85677e8a85f 100644
--- a/srcpkgs/weston/files/README.voidlinux
+++ b/srcpkgs/weston/files/README.voidlinux
@@ -1,2 +1,4 @@
-Add your user to the "weston-launch" group to be able to run weston
-with a regular user and then execute "weston-launch".
+"weston-launch" was deprecated and has been removed
+To launch weston, enable either elogind, or seatd and run "weston"
+
+For more information on session management: https://docs.voidlinux.org/config/session-management.html
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index d58693b2550..ba9eda8f8c0 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -1,38 +1,35 @@
 # Template file for 'weston'
 pkgname=weston
-version=9.0.0
+version=13.0.0
 revision=1
 build_style=meson
-configure_args="-Dtest-junit-xml=false -Dbackend-rdp=false -Dsystemd=false
- -Dremoting=false -Dlauncher-logind=$(vopt_if elogind true false)
- -Dbackend-drm-screencast-vaapi=$(vopt_if vaapi true false) -Dpipewire=false"
+configure_args=" $(vopt_bool vaapi backend-drm-screencast-vaapi) "
 hostmakedepends="pkg-config wayland-devel wayland-protocols"
 makedepends="libpng-devel wayland-devel wayland-protocols libxkbcommon-devel
  pixman-devel pango-devel cairo-devel mtdev-devel libwebp-devel
  poppler-glib-devel pam-devel lcms2-devel eudev-libudev-devel libdrm-devel
- libinput-devel libxcb-devel libXcursor-devel colord-devel dbus-devel
- $(vopt_if vaapi 'glu-devel libva-devel') $(vopt_if elogind elogind-devel)
- libevdev-devel"
+ libinput-devel libxcb-devel libXcursor-devel dbus-devel libevdev-devel
+ xorg-server-xwayland neatvnc-devel libseat-devel pipewire-devel
+ gst-plugins-base1-devel libdisplay-info-devel freerdp-devel freerdp-server-devel
+ $(vopt_if vaapi 'glu-devel libva-devel')"
 short_desc="Reference implementation of a Wayland compositor"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
 license="MIT"
 homepage="https://wayland.freedesktop.org/"
 distfiles="https://wayland.freedesktop.org/releases/${pkgname}-${version}.tar.xz"
-checksum=5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe
-system_groups="weston-launch"
+checksum=52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a
 lib32disabled=yes
+replaces="weston-colord>=0"
 
 # Package build options
-build_options="elogind vaapi"
-desc_option_elogind="Use elogind for suidless startup"
+build_options="vaapi"
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|aarch64*|ppc*)
-		build_options_default+=" vaapi"
-		configure_args+=" -Drenderer-gl=true"
+		build_options_default="vaapi"
 		;;
 	armv*)
-		configure_args+=" -Ddemo-clients=false -Drenderer-gl=false -Dsimple-clients=[]"
+		configure_args+=" -Ddemo-clients=false -Dsimple-clients=[]"
 		;;
 esac
 
@@ -41,21 +38,16 @@ pre_configure() {
 }
 
 post_install() {
-	# weston-launch must be setuid
-	if [ -z "$build_option_elogind" ]; then
-		chmod u+s ${DESTDIR}/usr/bin/weston-launch
-	fi
 	vlicense COPYING LICENSE
-	# Remove development files.
-	rm -rf ${DESTDIR}/usr/include
-	rm -rf ${DESTDIR}/usr/lib/pkgconfig
 	vdoc "${FILESDIR}/README.voidlinux"
 }
 
-weston-colord_package() {
-	short_desc+=" - colord plugin"
+weston-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
 	pkg_install() {
-		vmove /usr/lib/weston/cms-colord.so
+		vmove usr/include
+		vmove usr/lib/pkgconfig
 	}
 }
 
@@ -73,3 +65,9 @@ weston-xwayland_package() {
 		vmove "/usr/lib/libweston-${version%%.*}/xwayland.so"
 	}
 }
+
+weston-colord_package() {
+	short_desc+=" - colord (folded into weston)"
+	build_style=meta
+	depends="${sourcepkg}"
+}