diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index ac1d95e..a967056 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -48,7 +48,7 @@ prepare() {
   patch -Np1 -i "${srcdir}"/cups-systemd-socket.patch
 
   # FS#56818 - https://github.com/apple/cups/issues/5236
-  patch -Np1 -i "${srcdir}"/guid.patch
+#  patch -Np1 -i "${srcdir}"/guid.patch
 
   # set MaxLogSize to 0 to prevent using cups internal log rotation
   sed -i -e '5i\ ' conf/cupsd.conf.in
@@ -72,8 +72,8 @@ build() {
      --with-logdir=/var/log/cups \
      --with-docdir=/usr/share/cups/doc \
      --with-exe-file-perm=0755 \
-     --with-cups-user=209 \
-     --with-cups-group=209 \
+     --with-cups-user=daemon \
+     --with-cups-group=lp \
      --enable-pam=yes \
      --enable-raw-printing \
      --enable-dbus=yes \
@@ -141,12 +141,12 @@ optdepends=('xdg-utils: xdg .desktop file support'
   chmod 755 "${pkgdir}"/etc
 
   # use cups group FS#36769
-  install -Dm644 "$srcdir"/cups.sysusers "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
-  sed -i "s:#User 209:User 209:" "${pkgdir}"/etc/cups/cups-files.conf{,.default}
-  sed -i "s:#Group 209:Group 209:" "${pkgdir}"/etc/cups/cups-files.conf{,.default}
+#  install -Dm644 "$srcdir"/cups.sysusers "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
+#  sed -i "s:#User 209:User 209:" "${pkgdir}"/etc/cups/cups-files.conf{,.default}
+#  sed -i "s:#Group 209:Group 209:" "${pkgdir}"/etc/cups/cups-files.conf{,.default}
 
   # install ssl directory where to store the certs, solves some samba issues
-  install -dm700 -g 209 "${pkgdir}"/etc/cups/ssl
+#  install -dm700 -g 209 "${pkgdir}"/etc/cups/ssl
   # remove directory from package, it will be recreated at each server start
   rm -rf "${pkgdir}"/run
 
@@ -154,7 +154,7 @@ optdepends=('xdg-utils: xdg .desktop file support'
   touch "${pkgdir}"/etc/cups/printers.conf
   touch "${pkgdir}"/etc/cups/classes.conf
   touch "${pkgdir}"/etc/cups/subscriptions.conf
-  chgrp -R 209 "${pkgdir}"/etc/cups
+  chgrp -R lp "${pkgdir}"/etc/cups
 
   # fix .desktop file
   sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' "${pkgdir}"/usr/share/applications/cups.desktop