diff --git a/user/xf86-video-fbdev-rm/APKBUILD b/pmos/xf86-video-fbdev-remarkable-zero-gravitas/APKBUILD
similarity index 66%
rename from user/xf86-video-fbdev-rm/APKBUILD
rename to pmos/xf86-video-fbdev-remarkable-zero-gravitas/APKBUILD
index edfe76b..7478b54 100644
--- a/user/xf86-video-fbdev-rm/APKBUILD
+++ b/pmos/xf86-video-fbdev-remarkable-zero-gravitas/APKBUILD
@@ -1,14 +1,16 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xf86-video-fbdev-rm
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+
+pkgname=xf86-video-fbdev-remarkable-zero-gravitas
 pkgver=0.5.0
-pkgrel=3
-pkgdesc="Video driver for framebuffer device with rM patches"
+_kver=5.4.70
+pkgrel=0
+pkgdesc="Video driver for framebuffer device with support for reMarkable rM1 (remarkable-zero-gravitas)"
 url="https://www.x.org"
-arch="all"
+arch="armv7"
 license="MIT"
 subpackages="$pkgname-doc"
 provides="xf86-video-fbdev=$pkgver-r$pkgrel"
-makedepends="xorg-server-dev libxi-dev util-macros xorgproto linux-rm-headers"
+makedepends="xorg-server-dev libxi-dev util-macros xorgproto linux-remarkable-zero-gravitas-dev"
 builddir="$srcdir"/xf86-video-fbdev-$pkgver
 source="
 	https://www.x.org/releases/individual/driver/xf86-video-fbdev-$pkgver.tar.bz2
@@ -17,11 +19,13 @@ source="
 	"
 
 build() {
-	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
+	export LDFLAGS="$LDFLAGS -Wl,-z,lazy -I/usr/src/linux-headers-$_kver/include"
+	export CPPFLAGS="$CPPFLAGS -I/usr/src/linux-headers-$_kver/include"
+	export CFLAGS="$CFLAGS -I/usr/src/linux-headers-$_kver/include"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
 	make
 }
 
diff --git a/user/xf86-video-fbdev-rm/epdc_auto-update-patch.patch b/pmos/xf86-video-fbdev-remarkable-zero-gravitas/epdc_auto-update-patch.patch
similarity index 100%
rename from user/xf86-video-fbdev-rm/epdc_auto-update-patch.patch
rename to pmos/xf86-video-fbdev-remarkable-zero-gravitas/epdc_auto-update-patch.patch
diff --git a/user/xf86-video-fbdev-rm/fix-build.patch b/pmos/xf86-video-fbdev-remarkable-zero-gravitas/fix-build.patch
similarity index 100%
rename from user/xf86-video-fbdev-rm/fix-build.patch
rename to pmos/xf86-video-fbdev-remarkable-zero-gravitas/fix-build.patch