diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 40cad3d5c02..93b70ba4c8f 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -2,10 +2,11 @@
 pkgname=cups
 version=2.3.3
 revision=1
-hostmakedepends="automake avahi-libs-devel gnutls-devel pkg-config
- poppler-utils"
-makedepends="acl-devel avahi-libs-devel gnutls-devel libpaper-devel
- libpng-devel libusb-devel pam-devel poppler-devel tiff-devel
+hostmakedepends="automake $(vopt_if avahi avahi-libs-devel)
+ gnutls-devel pkg-config poppler-utils"
+makedepends="acl-devel gnutls-devel libpaper-devel libpng-devel
+ libusb-devel pam-devel poppler-devel tiff-devel
+ $(vopt_if avahi avahi-libs-devel)
  $(vopt_if gssapi 'mit-krb5-devel')"
 depends="xdg-utils"
 short_desc="Common Unix Printing System"
@@ -23,9 +24,11 @@ make_dirs="
 	/var/spool/cups 	0755 cups lp
 	/etc/cups/ssl 		0700 cups lp"
 
-build_options="gssapi"
+build_options="avahi gssapi"
 
 # Package build options
+build_options_default="avahi"
+
 system_accounts="cups"
 system_groups=lpadmin
 cups_pgroup=lp
@@ -50,7 +53,7 @@ do_configure() {
 		--enable-threads --with-logdir=/var/log/cups \
 		--with-docdir=/usr/share/cups/doc --with-rundir=/run/cups \
 		--with-cups-user=cups --with-cups-group=lp --with-system-groups="lpadmin sys root" --enable-relro \
-		--enable-libpaper --enable-avahi --enable-pam --enable-ssl \
+		--enable-libpaper $(vopt_enable avahi) --enable-pam --enable-ssl \
 		--with-menudir=/usr/share/applications --with-xinetd=/etc/xinetd.d \
 		--with-optim="${CFLAGS}" --disable-systemd --disable-launchd \
 		--without-rcdir --without-java --without-perl --without-php \