diff --git a/srcpkgs/cups/patches/avahi-missing-in-conditionals.patch b/srcpkgs/cups/patches/avahi-missing-in-conditionals.patch
deleted file mode 100644
index c04e3f53806..00000000000
--- a/srcpkgs/cups/patches/avahi-missing-in-conditionals.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -uraN cups/scheduler/client.c cups-new/scheduler/client.c
---- cups/scheduler/client.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/client.c	2012-08-04 20:13:17.082220961 +0200
-@@ -4021,7 +4021,7 @@
-	    !strncmp(host, "[::1]:", 6));
-   }
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  /*
-   * Check if the hostname is something.local (Bonjour); if so, allow it.
-   */
-@@ -4040,7 +4040,7 @@
-	      !_cups_strcasecmp(end, ".local.") ||
-	      !_cups_strncasecmp(end, ".local.:", 8)))
-     return (1);
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
-  /*
-   * Check if the hostname is an IP address...
-@@ -4101,7 +4101,7 @@
-     }
-   }
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   for (a = (cupsd_alias_t *)cupsArrayFirst(DNSSDAlias);
-        a;
-        a = (cupsd_alias_t *)cupsArrayNext(DNSSDAlias))
-@@ -4126,7 +4126,7 @@
-         return (1);
-     }
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
-  /*
-   * Check for interface hostname matches...
-diff -uraN cups/scheduler/conf.c cups-new/scheduler/conf.c
---- cups/scheduler/conf.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/conf.c	2012-08-04 20:15:49.830978405 +0200
-@@ -89,9 +89,9 @@
- {
-   { "AccessLog",		&AccessLog,		CUPSD_VARTYPE_STRING },
-   { "AutoPurgeJobs", 		&JobAutoPurge,		CUPSD_VARTYPE_BOOLEAN },
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   { "BrowseDNSSDSubTypes",	&DNSSDSubTypes,		CUPSD_VARTYPE_STRING },
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-   { "BrowseWebIF",		&BrowseWebIF,		CUPSD_VARTYPE_BOOLEAN },
-   { "Browsing",			&Browsing,		CUPSD_VARTYPE_BOOLEAN },
-   { "CacheDir",			&CacheDir,		CUPSD_VARTYPE_STRING },
-@@ -735,9 +735,9 @@
-   Browsing                 = CUPS_DEFAULT_BROWSING;
-   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdSetString(&DNSSDSubTypes, "_cups,_print");
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
-   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
-   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
-diff -uraN cups/scheduler/ipp.c cups-new/scheduler/ipp.c
---- cups/scheduler/ipp.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/ipp.c	2012-08-04 20:13:17.086220978 +0200
-@@ -4813,7 +4813,7 @@
-     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
-                ippTimeToDate(curtime));
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
-   {
-     if (printer->reg_name)
-@@ -4823,7 +4823,7 @@
-       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
-                    "printer-dns-sd-name", 0);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
-   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
-     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
-diff -uraN cups/scheduler/main.c cups-new/scheduler/main.c
---- cups/scheduler/main.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/main.c	2012-08-04 20:13:17.090221001 +0200
-@@ -781,9 +781,9 @@
-       * Got an error from select!
-       */
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       cupsd_printer_t	*p;		/* Current printer */
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
-
-       if (errno == EINTR)		/* Just interrupted by a signal */
-@@ -824,13 +824,13 @@
-			job->print_pipes[0], job->print_pipes[1],
-			job->back_pipes[0], job->back_pipes[1]);
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
-	   p;
-	   p = (cupsd_printer_t *)cupsArrayNext(Printers))
-         cupsdLogMessage(CUPSD_LOG_EMERG, "printer[%s] reg_name=\"%s\"", p->name,
-	                p->reg_name ? p->reg_name : "(null)");
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
-       break;
-     }
diff --git a/srcpkgs/cups/patches/cups-1.6.0-fix-install-perms.patch b/srcpkgs/cups/patches/cups-1.6.0-fix-install-perms.patch
deleted file mode 100644
index 5b6bfc5fadc..00000000000
--- a/srcpkgs/cups/patches/cups-1.6.0-fix-install-perms.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: Makedefs.in
-===================================================================
---- cups-1.5.0/Makedefs.in	(Revision 10520)
-+++ cups-1.5.0/Makedefs.in	(Arbeitskopie)
-@@ -40,14 +40,14 @@
- # Installation programs...
- #
- 
--INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
--INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
-+INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
- INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
--INSTALL_DATA	=	$(INSTALL) -c -m 444
-+INSTALL_DATA	=	$(INSTALL) -c -m 644
- INSTALL_DIR	=	$(INSTALL) -d
--INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
--INSTALL_MAN	=	$(INSTALL) -c -m 444
--INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
-+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
-+INSTALL_MAN	=	$(INSTALL) -c -m 644
-+INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
- 
- #
- # Default user, group, and system groups for the scheduler...
diff --git a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch b/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
index 9be3c819b72..e227bd18239 100644
--- a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
+++ b/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
@@ -1,7 +1,7 @@
 diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
---- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
-@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES)
+--- cups-1.6.2/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
++++ cups-1.6.2/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
+@@ -180,7 +180,7 @@
  AC_SUBST(SSLFLAGS)
  AC_SUBST(SSLLIBS)
  
@@ -9,4 +9,4 @@ diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/conf
 +EXPORT_SSLLIBS=""
  AC_SUBST(EXPORT_SSLLIBS)
  
- 
+ dnl
diff --git a/srcpkgs/cups/patches/cups-no-gcrypt.patch b/srcpkgs/cups/patches/cups-no-gcrypt.patch
index 42f71d0d471..4eaff67ceec 100644
--- a/srcpkgs/cups/patches/cups-no-gcrypt.patch
+++ b/srcpkgs/cups/patches/cups-no-gcrypt.patch
@@ -9,12 +9,14 @@ diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/
  	if $PKGCONFIG --exists gnutls; then
  	    have_ssl=1
  	    SSLLIBS=`$PKGCONFIG --libs gnutls`
-@@ -110,16 +109,6 @@
- 	    AC_DEFINE(HAVE_SSL)
+@@ -108,18 +107,6 @@
  	    AC_DEFINE(HAVE_GNUTLS)
  	fi
--
+ 
 -	if test $have_ssl = 1; then
+-	    CUPS_SERVERCERT="ssl/server.crt"
+-	    CUPS_SERVERKEY="ssl/server.key"
+-
 -            if $PKGCONFIG --exists gcrypt; then
 -	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
 -	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
diff --git a/srcpkgs/cups/patches/cups-no-gzip-man.patch b/srcpkgs/cups/patches/cups-no-gzip-man.patch
index d4d95883969..69899b9cb7d 100644
--- a/srcpkgs/cups/patches/cups-no-gzip-man.patch
+++ b/srcpkgs/cups/patches/cups-no-gzip-man.patch
@@ -2,9 +2,9 @@ diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/confi
 --- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man	2011-05-12 07:21:56.000000000 +0200
 +++ cups-1.5b1/config-scripts/cups-manpages.m4	2011-05-23 17:25:50.000000000 +0200
 @@ -69,10 +69,10 @@ case "$uname" in
-		;;
-	Linux* | GNU* | Darwin*)
-		# Linux, GNU Hurd, and OS X
+ 		;;
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and OS X
 -		MAN1EXT=1.gz
 -		MAN5EXT=5.gz
 -		MAN7EXT=7.gz
@@ -13,6 +13,6 @@ diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/confi
 +		MAN5EXT=5
 +		MAN7EXT=7
 +		MAN8EXT=8
-		MAN8DIR=8
-		;;
-	*)
+ 		MAN8DIR=8
+ 		;;
+ 	*)
diff --git a/srcpkgs/cups/patches/cups-systemd-socket.patch b/srcpkgs/cups/patches/cups-systemd-socket.patch
index 815bdd2f27b..83fabdb4f63 100644
--- a/srcpkgs/cups/patches/cups-systemd-socket.patch
+++ b/srcpkgs/cups/patches/cups-systemd-socket.patch
@@ -2,8 +2,8 @@ diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in
 --- cups-1.6b1/config.h.in.systemd-socket	2012-05-17 00:57:03.000000000 +0200
 +++ cups-1.6b1/config.h.in	2012-05-28 11:16:35.657250584 +0200
 @@ -506,6 +506,13 @@
-
-
+ 
+ 
  /*
 + * Do we have systemd support?
 + */
@@ -14,7 +14,7 @@ diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in
 +/*
   * Various scripting languages...
   */
-
+ 
 diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4
 --- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket	2012-05-28 11:16:35.658250577 +0200
 +++ cups-1.6b1/config-scripts/cups-systemd.m4	2012-05-28 11:16:35.658250577 +0200
@@ -65,23 +65,23 @@ diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in
 +sinclude(config-scripts/cups-systemd.m4)
  sinclude(config-scripts/cups-defaults.m4)
  sinclude(config-scripts/cups-scripting.m4)
-
+ 
 @@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs
-	  conf/snmp.conf
-	  cups-config
-	  data/testprint
+ 	  conf/snmp.conf
+ 	  cups-config
+ 	  data/testprint
 +          data/cups.service
 +          data/cups.socket
 +          data/cups.path
-	  desktop/cups.desktop
-	  doc/help/ref-cupsd-conf.html
-	  doc/help/standard.html
+ 	  desktop/cups.desktop
+ 	  doc/help/ref-cupsd-conf.html
+ 	  doc/help/standard.html
 diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c
 --- cups-1.6b1/cups/usersys.c.systemd-socket	2012-04-23 19:26:57.000000000 +0200
 +++ cups-1.6b1/cups/usersys.c	2012-05-28 11:16:35.659250570 +0200
 @@ -975,7 +975,7 @@ cups_read_client_conf(
      struct stat	sockinfo;		/* Domain socket information */
-
+ 
      if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
 -	(sockinfo.st_mode & S_IRWXO) == S_IRWXO)
 +	(sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
@@ -130,27 +130,27 @@ diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile
 --- cups-1.6b1/data/Makefile.systemd-socket	2011-08-27 11:23:01.000000000 +0200
 +++ cups-1.6b1/data/Makefile	2012-05-28 11:16:35.660250563 +0200
 @@ -100,6 +100,12 @@ install-data:
-		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
-	done
-	$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
+ 		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
 +	if test "x$(SYSTEMD_UNITS)" != "x" ; then \
 +		$(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \
 +		for file in $(SYSTEMD_UNITS); do \
 +			$(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \
 +		done; \
 +	fi
-
-
+ 
+ 
  #
 @@ -143,6 +149,9 @@ uninstall:
-	-$(RMDIR) $(DATADIR)/data
-	-$(RMDIR) $(DATADIR)/banners
-	-$(RMDIR) $(DATADIR)
+ 	-$(RMDIR) $(DATADIR)/data
+ 	-$(RMDIR) $(DATADIR)/banners
+ 	-$(RMDIR) $(DATADIR)
 +	for file in $(SYSTEMD_UNITS); do \
 +		$(RM) $(SYSTEMDUNITDIR)/$$file; \
 +	done
-
-
+ 
+ 
  #
 diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
 --- cups-1.6b1/Makedefs.in.systemd-socket	2012-05-28 11:16:35.648250647 +0200
@@ -167,15 +167,15 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
  LAUNCHDLIBS	=	@LAUNCHDLIBS@
 +SDLIBS		=	@SDLIBS@
  LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
-			-L../scheduler @LDARCHFLAGS@ \
-			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
+ 			-L../scheduler @LDARCHFLAGS@ \
+ 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
 @@ -229,6 +231,7 @@ PAMFILE		=	@PAMFILE@
-
+ 
  DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
  DBUSDIR		=	@DBUSDIR@
 +SYSTEMDUNITDIR  =       $(BUILDROOT)@systemdsystemunitdir@
-
-
+ 
+ 
  #
 diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h
 --- cups-1.6b1/scheduler/client.h.systemd-socket	2012-03-22 21:30:20.000000000 +0100
@@ -188,8 +188,8 @@ diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/clien
 +  int			is_systemd;	/* Is this a systemd socket? */
 +#endif /* HAVE_SYSTEMD */
  } cupsd_listener_t;
-
-
+ 
+ 
 diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c
 --- cups-1.6b1/scheduler/listen.c.systemd-socket	2011-04-16 01:38:13.000000000 +0200
 +++ cups-1.6b1/scheduler/listen.c	2012-05-28 11:16:35.661250556 +0200
@@ -221,7 +221,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
 @@ -62,6 +64,10 @@
  #  endif /* !LAUNCH_JOBKEY_SERVICEIPC */
  #endif /* HAVE_LAUNCH_H */
-
+ 
 +#ifdef HAVE_SYSTEMD
 +#include <systemd/sd-daemon.h>
 +#endif /* HAVE_SYSTEMD */
@@ -242,7 +242,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
 @@ -528,6 +537,13 @@ main(int  argc,				/* I - Number of comm
    }
  #endif /* HAVE_LAUNCHD */
-
+ 
 +#ifdef HAVE_SYSTEMD
 + /*
 +  * If we were started by systemd get the listen sockets file descriptors...
@@ -254,9 +254,9 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
    * Startup the server...
    */
 @@ -738,6 +754,15 @@ main(int  argc,				/* I - Number of comm
-	}
+ 	}
  #endif /* HAVE_LAUNCHD */
-
+ 
 +#ifdef HAVE_SYSTEMD
 +       /*
 +	* If we were started by systemd get the listen sockets file
@@ -272,7 +272,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
 @@ -1516,6 +1541,102 @@ launchd_checkout(void)
  }
  #endif /* HAVE_LAUNCHD */
-
+ 
 +#ifdef HAVE_SYSTEMD
 +static void
 +systemd_checkin(void)
@@ -369,27 +369,27 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
 +  }
 +}
 +#endif /* HAVE_SYSTEMD */
-
+ 
  /*
   * 'parent_handler()' - Catch USR1/CHLD signals...
 diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile
 --- cups-1.6b1/scheduler/Makefile.systemd-socket	2012-05-21 19:40:22.000000000 +0200
 +++ cups-1.6b1/scheduler/Makefile	2012-05-28 11:16:35.663250542 +0200
 @@ -371,7 +371,7 @@ cupsd:	$(CUPSDOBJS) $(LIBCUPSMIME) ../cu
-	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
-		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
-		$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
+ 	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
+ 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
+ 		$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
 -		$(LIBGSSAPI) $(LIBWRAP)
 +		$(LIBGSSAPI) $(LIBWRAP) $(SDLIBS)
-
+ 
  cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
-	echo Linking $@...
+ 	echo Linking $@...
 @@ -379,7 +379,7 @@ cupsd-static:	$(CUPSDOBJS) libcupsmime.a
-		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
-		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
-		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
+ 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
+ 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
+ 		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
 -		$(LIBWRAP)
 +		$(LIBWRAP)  $(SDLIBS)
-
+ 
  tls.o:	tls-darwin.c tls-gnutls.c tls-openssl.c
-
+ 
diff --git a/srcpkgs/cups/patches/cupsd-conf-remove-obsolete-browse-directives.patch b/srcpkgs/cups/patches/cupsd-conf-remove-obsolete-browse-directives.patch
deleted file mode 100644
index 1da0960c3a2..00000000000
--- a/srcpkgs/cups/patches/cupsd-conf-remove-obsolete-browse-directives.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uraN cups/conf/cupsd.conf.in cups-new/conf/cupsd.conf.in
---- cups/conf/cupsd.conf.in	2012-05-25 15:28:25.000000000 +0200
-+++ cups-new/conf/cupsd.conf.in	2012-08-04 20:56:26.699062177 +0200
-@@ -19,8 +19,6 @@
-
- # Show shared printers on the local network.
- Browsing On
--BrowseOrder allow,deny
--BrowseAllow all
- BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
-
- # Default authentication type, when authentication is required...
diff --git a/srcpkgs/cups/patches/recognize-remote-cups-queue-via-dnssd-uri.patch b/srcpkgs/cups/patches/recognize-remote-cups-queue-via-dnssd-uri.patch
deleted file mode 100644
index 23d638d5942..00000000000
--- a/srcpkgs/cups/patches/recognize-remote-cups-queue-via-dnssd-uri.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -uraN cups/scheduler/printers.c cups-new/scheduler/printers.c
---- cups/scheduler/printers.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/printers.c	2012-08-04 20:58:40.475725544 +0200
-@@ -4829,13 +4829,14 @@
-		   "printer-make-and-model", NULL,
-		   "Local System V Printer");
-     }
--    else if (!strncmp(p->device_uri, "ipp://", 6) &&
--	     (strstr(p->device_uri, "/printers/") != NULL ||
--	      strstr(p->device_uri, "/classes/") != NULL ||
--	      ((strstr(p->device_uri, "._ipp.") != NULL ||
--	        strstr(p->device_uri, "._ipps.") != NULL) &&
--	       !strcmp(p->device_uri + strlen(p->device_uri) - 5,
--		       "/cups"))))
-+    else if ((!strncmp(p->device_uri, "ipp://", 6) &&
-+	      (strstr(p->device_uri, "/printers/") != NULL ||
-+	       strstr(p->device_uri, "/classes/") != NULL)) ||
-+	     (!strncmp(p->device_uri, "dnssd://", 8) &&
-+	      (strstr(p->device_uri, "._ipp.") != NULL ||
-+	       strstr(p->device_uri, "._ipps.") != NULL) &&
-+	      !strcmp(p->device_uri + strlen(p->device_uri) - 5,
-+		      "/cups")))
-     {
-      /*
-       * Tell the client this is really a hard-wired remote printer.
diff --git a/srcpkgs/cups/patches/usb-backend-reset-after-job-only-for-specific-devices.patch b/srcpkgs/cups/patches/usb-backend-reset-after-job-only-for-specific-devices.patch
deleted file mode 100644
index 736d2c8506a..00000000000
--- a/srcpkgs/cups/patches/usb-backend-reset-after-job-only-for-specific-devices.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- cups/backend/usb-libusb.c.orig	2012-07-16 19:10:55.000000000 +0200
-+++ cups/backend/usb-libusb.c	2012-08-06 11:01:58.034150159 +0200
-@@ -70,7 +70,7 @@
-			read_endp,	/* Read endpoint */
-			protocol,	/* Protocol: 1 = Uni-di, 2 = Bi-di. */
-			usblp_attached,	/* "usblp" kernel module attached? */
--			opened_for_job;	/* Set to 1 by print_device() */
-+			reset_after_job; /* Set to 1 by print_device() */
-   unsigned int		quirks;		/* Quirks flags */
-   struct libusb_device_handle *handle;	/* Open handle to device */
- } usb_printer_t;
-@@ -122,6 +122,8 @@
- #define USBLP_QUIRK_USB_INIT	0x2	/* needs vendor USB init string */
- #define USBLP_QUIRK_BAD_CLASS	0x4	/* descriptor uses vendor-specific
-					   Class or SubClass */
-+#define USBLP_QUIRK_RESET	0x4000	/* After printing do a reset
-+					   for clean-up */
- #define USBLP_QUIRK_NO_REATTACH	0x8000	/* After printing we cannot re-attach
-					   the usblp kernel module */
-
-@@ -147,9 +149,11 @@
-	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
-						      Printer M129C */
-	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
--			  USBLP_QUIRK_NO_REATTACH },
-+			  USBLP_QUIRK_NO_REATTACH |
-+	                  USBLP_QUIRK_RESET },
-	/* Prolific Technology, Inc. PL2305 Parallel Port
-	   (USB -> Parallel adapter) */
-+	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices */
-	{ 0, 0 }
- };
-
-@@ -256,7 +260,12 @@
-   }
-
-   g.print_fd = print_fd;
--  g.printer->opened_for_job = 1;
-+
-+ /*
-+  * Some devices need a reset after finishing a job, these devices are
-+  * marked with the USBLP_QUIRK_RESET quirk.
-+  */
-+  g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0);
-
-  /*
-   * If we are printing data from a print driver on stdin, ignore SIGTERM
-@@ -772,7 +781,7 @@
-     * Reset the device to clean up after the job
-     */
-
--    if (printer->opened_for_job == 1)
-+    if (printer->reset_after_job == 1)
-     {
-       if ((errcode = libusb_reset_device(printer->handle)) < 0)
-	fprintf(stderr,
-@@ -1288,7 +1297,7 @@
-   }
-
-   printer->usblp_attached = 0;
--  printer->opened_for_job = 0;
-+  printer->reset_after_job = 0;
-
-   if (verbose)
-     fputs("STATE: +connecting-to-device\n", stderr);
-@@ -1586,7 +1595,7 @@
-   for (i = 0; quirk_printers[i].vendorId; i++)
-   {
-     if (vendor == quirk_printers[i].vendorId &&
--	product == quirk_printers[i].productId)
-+	(product == 0x0000 || product == quirk_printers[i].productId))
-       return quirk_printers[i].quirks;
-   }
-   return 0;
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index bc7b426df1c..db7b8ef40cc 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,19 +1,19 @@
 # Template file for 'cups'
 pkgname=cups
-version=1.6.1
-revision=9
+version=1.6.2
+revision=1
 patch_args="-Np1"
 short_desc="Common Unix Printing System"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.cups.org/"
 license="GPL-2"
 distfiles="ftp://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"
-checksum=5842ab1144e653160fe667ee78b932ee036b054c0c2d20533d19e309149a7790
+checksum=37a3ebd305e76cfd4c9c53013e89c0f7a4dcb04b2e9da61029a29faa57e0f10d
 
 hostmakedepends="automake pkg-config poppler-utils"
 makedepends="acl-devel libjpeg-turbo-devel libpng-devel>=1.5.10 tiff-devel
  openssl-devel pam-devel mit-krb5-devel poppler-devel libusb-devel avahi-libs-devel
- systemd-devel gnutls-devel>=3.1.5"
+ systemd-devel gnutls-devel>=3.1.5 bc"
 
 pre_configure() {
 	aclocal -I config-scripts