diff --git a/pkg.info b/pkg.info
index 733e427..940a729 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,20 +1,18 @@
 name: cups
 description: An open-source printing system
 version: 2.4.15
-revision: 1
+revision: 2
 url: https://openprinting.github.io/cups/
 license: Apache2 with LLVM-exception and BSD-3-Clause and Zlib and BSD-2-Clause
 architecture: any
 type: source
-keep:
-  - etc/cups/client.conf
-optional_depends:
-  - libusb
-  - xdg-utils
 make_depends:
   - acl
+  - avahi
+  - cups-filters
   - dbus
   - gnutls
+  - libpaper
   - libusb
   - pam
   - udev
@@ -25,20 +23,37 @@ downloads:
     checksum: eff0bbd48ff1abcbb8e46e28e85aefaffa391a1d9c4d8dc92ab3822a13008d7f
 split_packages:
   - name: cups
+    keep:
+      - etc/cups/client.conf
+      - etc/cups/cupsd.conf
+      - etc/cups/snmp.conf
+      - etc/cups/printers.conf
+      - etc/cups/classes.conf
+      - etc/cups/cups-files.conf
+      - etc/cups/subscriptions.conf
+      - etc/pam.d/cups
     depends:
       - acl
+      - avahi
+      - cups-filters
       - dbus
       - gcc-libs
       - glibc
       - gnutls
       - hicolor-icon-theme
       - libcups
+      - libpaper
       - sysusers
       - pam
       - udev
+    optional_depends:
+      - cups-browsed
+      - libusb
+      - xdg-utils
   - name: libcups
     description: Library and header files for the CUPS printing system
     depends:
+      - avahi
       - glibc
       - gnutls
       - zlib
diff --git a/source-files/cups-pam b/source-files/cups-pam
new file mode 100644
index 0000000..ffa1ac9
--- /dev/null
+++ b/source-files/cups-pam
@@ -0,0 +1,3 @@
+auth    include system-auth
+account include system-account
+session include system-session
diff --git a/source-files/sysusers b/source-files/sysusers
index 4e290d6..53fc9a2 100644
--- a/source-files/sysusers
+++ b/source-files/sysusers
@@ -1 +1,2 @@
-u lp - "Print Service User" /var/spool/cups /bin/false
+g lpadmin 209
+u cups 209 "Cups helper user" /var/spool/cups /bin/false
diff --git a/source.sh b/source.sh
index 897f256..aa4640a 100644
--- a/source.sh
+++ b/source.sh
@@ -7,7 +7,17 @@
 build() {
   sed -i 's#@CUPS_HTMLVIEW@#xdg-open#' desktop/cups.desktop.in
   
-  ./configure --libdir=/usr/lib --localstatedir=/var --disable-systemd --with-rundir=/run/cups
+  ./configure --libdir=/usr/lib       \
+              --localstatedir=/var    \
+              --with-rundir=/run/cups \
+              --with-cups-user=209    \
+              --with-cups-group=209   \
+              --with-optim="$CFLAGS" \
+              --with-tls=gnutls      \
+              --enable-pam           \
+              --enable-raw-printing  \
+              --enable-dbus=yes      \
+              --enable-relro
   make
 }
 
@@ -23,8 +33,7 @@ package_cups() {
   rm "$BPM_OUTPUT"/usr/bin/cups-config
 
   # Remove SysV files
-  rm -rf "$BPM_OUTPUT"/etc/rd*.d
-  rm -rf "$BPM_OUTPUT"/etc/init.d
+  rm -r "$BPM_OUTPUT"/etc/rc.d
 
   # Create default cups client config
   install -d "$BPM_OUTPUT"/etc/cups
@@ -33,6 +42,9 @@ package_cups() {
   # Install sysusesrs
   install -Dm644 "$BPM_WORKDIR"/sysusers "$BPM_OUTPUT"/usr/lib/sysusers.d/cups.conf
 
+  # Install pam configuration file
+  install -Dm644 "$BPM_WORKDIR"/cups-pam "$BPM_OUTPUT"/etc/pam.d/cups
+
   # Install ESVM service
   install -Dm644 "$BPM_WORKDIR"/cupsd.esv "$BPM_OUTPUT"/etc/esvm/services/cupsd.esv