From 89a0b8ea361cfbb76ab7134bbde229ddc26aa385 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Thu, 20 Oct 2005 14:05:54 +0000
Subject: - Updated printerdrake to the state of Mandriva 2006:    o HPLIP
 support    o Gutenprint support    o support for several other new drivers   
 o Printer communication error handling    o Main window of printerdrake comes
 up faster    o Many bug fixes and detail improvements

---
 perl-install/printer/cups.pm         |   23 +-
 perl-install/printer/data.pm         |  114 +-
 perl-install/printer/default.pm      |   23 +-
 perl-install/printer/detect.pm       |  249 +++-
 perl-install/printer/gimp.pm         |  361 -----
 perl-install/printer/main.pm         | 1674 +++++++++++++---------
 perl-install/printer/office.pm       |  375 -----
 perl-install/printer/printerdrake.pm | 2535 +++++++++++++++++++++++-----------
 perl-install/printer/services.pm     |    4 +-
 perl-install/standalone/printerdrake |  284 ++--
 10 files changed, 3212 insertions(+), 2430 deletions(-)
 delete mode 100644 perl-install/printer/gimp.pm
 delete mode 100644 perl-install/printer/office.pm

diff --git a/perl-install/printer/cups.pm b/perl-install/printer/cups.pm
index ab9e28b21..eb443482e 100644
--- a/perl-install/printer/cups.pm
+++ b/perl-install/printer/cups.pm
@@ -27,15 +27,17 @@ sub lpstat_lpv() {
     
     my $currentitem = -1;
     for my $line (@lpstat) {
-	chomp ($line);
-	if (!($line =~ m!^\s*$!)) {
-	    if ($line =~ m!^printer\s+(\S+)\s+(\S.*)$!) {
+	chomp($line);
+	if ($line !~ m!^\s*$!) {
+	    if ($line =~ m!^printer\s+(\S+)\s+.*\b(enabled|disabled)\b!) {
 		# Beginning of new printer's entry
 		my $name = $1;
+		my $state = $2;
 		push(@items, {});
 		$currentitem = $#items;
 		$itemshash->{$name} = $currentitem;
 		$items[$currentitem]{queuename} ||= $name;
+		$items[$currentitem]{state} ||= $state;
 	    } elsif ($line =~ m!^\s+Description:\s+(\S.*)$!) {
 		# Description field
 		if ($currentitem != -1) {
@@ -51,7 +53,7 @@ sub lpstat_lpv() {
 		my $name = $1;
 		my $uri = $2;
 		if (defined($itemshash->{$name})) {
-		    if ($uri !~ /:/) {$uri = "file:" . $uri};
+		    if ($uri !~ /:/) { $uri = "file:" . $uri }
 		    $currentitem = $itemshash->{$name};
 		    if (($currentitem <= $#items) &&
 			($items[$currentitem]{queuename} eq $name)) {
@@ -114,10 +116,10 @@ sub get_formatted_remote_queues {
     map {
 	join('!', if_($printer->{expert}, N("CUPS")), N("Configured on other machines"), $_);
     } map {
-	my $comment = N("On CUPS server \"%s\"", $_->{ipp}) . ($_->{queuename} eq $printer->{DEFAULT} ? N(" (Default)") : "");
+	my $comment = N("On CUPS server \"%s\"", ($_->{ipp} ? $_->{ipp} : $printer->{remote_cups_server})) . ($_->{queuename} eq $printer->{DEFAULT} ? N(" (Default)") : "");
 	"$_->{queuename}: $comment";
     } grep { 
-	$_->{ipp} && !$printer->{configured}{$_->{queuename}};
+	!$printer->{configured}{$_->{queuename}};
     } lpstat_v();
 }
 
@@ -133,4 +135,13 @@ sub get_remote_queues {
     } lpstat_v();
 }
 
+sub queue_enabled {
+    my ($queue) = @_;
+    0 != grep {
+	/\b$queue\b.*\benabled\b/i;
+    } run_program::rooted_get_stdout($::prefix, 'lpstat', '-p', $queue);
+}
+
+
+
 1;
diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm
index 4a64ead75..1b824636a 100644
--- a/perl-install/printer/data.pm
+++ b/perl-install/printer/data.pm
@@ -6,64 +6,110 @@ use vars qw(@ISA @EXPORT);
 
 @ISA = qw(Exporter);
 @EXPORT = qw(%spoolers %spooler_inv %shortspooler_inv
-	     $kernelversion $usbprintermodule);
+	     $kernelversion $usbprintermodule $lib
+	     $commonpackages $gimpprintingpackages $gnomecupspackages
+	     $localqueuepackages);
 
 
+# Kernel-specific data
 our $kernelversion = `uname -r 2>/dev/null`;
 $kernelversion =~ s/^(\s*)(\d+\.\d+)(\..*)$/$2/;
 chomp $kernelversion;
 
 our $usbprintermodule = ($kernelversion eq '2.6' ? "usblp" : "printer");
 
+# Architecture-specific data
+our $lib = arch() =~ /x86_64/ ? "lib64" : "lib";
+
+# Packages which are always needed to run printerdrake
+our $commonpackages = [ [ 'foomatic-db-engine' ], 
+			[ '/usr/bin/foomatic-configure' ] ];
+
+# Packages which are needed to print with the GIMP
+our $gimpprintingpackages = [ [ 'gutenprint-gimp' ], 
+			      [ "/usr/$lib/gimp/1.2/plug-ins/print" ] ];
+
+# Packages which are needed for CUPS under GNOME
+our $gnomecupspackages = [ [ 'desktop-printing' ], 
+			   [ '/usr/bin/eggcups' ] ];
+
+# Packages which are needed to create and manage local print queues
+our $localqueuepackages = [ [ 'foomatic-filters', 'foomatic-db',
+			      'foomatic-db-hpijs', 'foomatic-db-engine',
+			      'printer-filters', 
+			      'printer-utils', 'printer-testpages', 
+			      'ghostscript', 'hplip-hpijs', 'gutenprint-ijs',
+			      'gutenprint-foomatic', 'gutenprint-escputil', 
+			      'postscript-ppds', 
+			      'hplip-model-data', 'nmap', 'scli' ],
+			    [qw(/usr/bin/foomatic-rip
+				/usr/share/foomatic/db/source/driver/ljet4.xml
+				/usr/share/foomatic/db/source/driver/hpijs.xml
+				/usr/bin/foomatic-configure
+				/usr/bin/pnm2ppa
+				/usr/bin/getusbprinterid
+				/usr/share/printer-testpages/testprint.ps
+				/usr/bin/gs-common
+				/usr/bin/hpijs
+				/usr/share/man/man1/ijsgutenprint.1.bz2
+				/usr/share/foomatic/db/source/driver/gutenprint-ijs.5.0.xml
+				/usr/bin/escputil
+				/usr/share/cups/model/postscript.ppd.gz
+				/usr/share/hplip/data/xml/models.xml
+				/usr/bin/nmap
+				/usr/bin/scli)] ];
+
+# Spooler-specific data
 our %spoolers = ('pdq' => {
                           'help' => "/usr/bin/pdq -h -P %s 2>&1 |",
 			  'print_command' => 'lpr-pdq',
 			  'print_gui' => 'xpdq',
-			  'long_name' => N("PDQ - Print, Don't Queue"),
+			  'long_name' => N("PDQ - Print, Do not Queue"),
 			  'short_name' => N("PDQ"),
+			  'local_queues' => 1,
                           'packages2add' => [ [ 'pdq' ], [qw(/usr/bin/pdq /usr/X11R6/bin/xpdq)] ],
                           'alternatives' => [
                               [ 'lpr', '/usr/bin/lpr-pdq' ],
                               [ 'lpq', '/usr/bin/lpq-foomatic' ],
                               [ 'lprm', '/usr/bin/lprm-foomatic' ]
                           ],
-                 },
-                'lpd' => {
+			  },
+		 'lpd' => {
                         'print_command' => 'lpr-lpd',
-			'print_gui' => 'gpr',
+			'print_gui' => 'lpr-lpd',
 			'long_name' => N("LPD - Line Printer Daemon"),
                         'short_name' => N("LPD"),
                         'boot_spooler' => 'lpd',
                         'service' => 'lpd',
-                        'packages2add' => [ [qw(lpr net-tools gpr a2ps ImageMagick)],
+			'local_queues' => 1,
+                        'packages2add' => [ [qw(lpr net-tools a2ps ImageMagick)],
                                             [qw(/usr/sbin/lpf
                                                 /usr/sbin/lpd
                                                 /sbin/ifconfig
-                                                /usr/bin/gpr
                                                 /usr/bin/a2ps
                                                 /usr/bin/convert)] ],
-                        'packages2rm' => [ 'LPRng', '/usr/lib/filters/lpf' ],
+                        'packages2rm' => [ 'LPRng', "/usr/$lib/filters/lpf" ],
                         'alternatives' => [
                             [ 'lpr', '/usr/bin/lpr-lpd' ],
                             [ 'lpq', '/usr/bin/lpq-lpd' ],
                             [ 'lprm', '/usr/bin/lprm-lpd' ],
                             [ 'lpc', '/usr/sbin/lpc-lpd' ]
                         ]
-                 },
+		    },
 		 'lprng' => {
 		     'print_command' => 'lpr-lpd',
-		     'print_gui' => 'gpr',
+		     'print_gui' => 'lpr-lpd',
 		     'long_name' => N("LPRng - LPR New Generation"),
 		     'short_name' => N("LPRng"),
 		     'boot_spooler' => 'lpd',
 		     'service' => 'lpd',
-		     'packages2add' => [ [qw(LPRng net-tools gpr a2ps ImageMagick)],
-					 [qw(/usr/lib/filters/lpf
-					     /usr/sbin/lpd
-					     /sbin/ifconfig
-					     /usr/bin/gpr
-					     /usr/bin/a2ps
-					     /usr/bin/convert)] ],
+		     'local_queues' => 1,
+		     'packages2add' => [ [qw(LPRng net-tools a2ps ImageMagick)],
+					 ["/usr/$lib/filters/lpf",
+					  "/usr/sbin/lpd",
+					  "/sbin/ifconfig",
+					  "/usr/bin/a2ps",
+					  "/usr/bin/convert"] ],
 		     'packages2rm' => [ 'lpr', '/usr/sbin/lpf' ],
 		     'alternatives' => [
 					[ 'lpr', '/usr/bin/lpr-lpd' ],
@@ -74,7 +120,7 @@ our %spoolers = ('pdq' => {
 					[ 'lpstat', '/usr/bin/lpstat-lpd' ],
 					[ 'lpc', '/usr/sbin/lpc-lpd' ]
 					]
-		 },
+				    },
 		 'cups' => {
 		     'help' => "/usr/bin/lphelp %s |",
 		     'print_command' => 'lpr-cups',
@@ -83,16 +129,38 @@ our %spoolers = ('pdq' => {
 		     'short_name' => N("CUPS"),
 		     'boot_spooler' => 'cups',
 		     'service' => 'cups',
-		     'packages2add' => [ ['cups', 'net-tools', 'xpp', 'cups-drivers',
+		     'local_queues' => 1,
+		     'packages2add' => [ ['cups', 'net-tools', 'xpp', 'cups-drivers', 'gutenprint-cups',
 					  $::isInstall ? 'curl' : 'webfetch'],
-					 [ qw(/usr/lib/cups/cgi-bin/printers.cgi
-					      /sbin/ifconfig
-					      /usr/bin/xpp
-					      /usr/share/cups/model/postscript.ppd.gz),
+					 [ "/usr/$lib/cups/cgi-bin/printers.cgi",
+					   "/sbin/ifconfig",
+					   "/usr/bin/xpp",
+					   "/usr/$lib/cups/filter/rastertolxx74", 
+					   "/usr/$lib/cups/filter/commandtoepson",
 					   $::isInstall ||
 					   !(-x '/usr/bin/wget') ?
 					   '/usr/bin/curl' :
 					   '/usr/bin/wget' ] ],
+		     'alternatives' => [
+					[ 'lpr', '/usr/bin/lpr-cups' ],
+					[ 'lpq', '/usr/bin/lpq-cups' ],
+					[ 'lprm', '/usr/bin/lprm-cups' ],
+					[ 'lp', '/usr/bin/lp-cups' ],
+					[ 'cancel', '/usr/bin/cancel-cups' ],
+					[ 'lpstat', '/usr/bin/lpstat-cups' ],
+					[ 'lpc', '/usr/sbin/lpc-cups' ]
+					]
+				    },
+		 'rcups' => {
+		     'help' => "/usr/bin/lphelp %s |",
+		     'print_command' => 'lpr-cups',
+		     'print_gui' => 'xpp',
+		     'long_name' => N("CUPS - Common Unix Printing System (remote server)"),
+		     'short_name' => N("Remote CUPS"),
+		     'local_queues' => 0,
+		     'packages2add' => [ ['cups-common', 'xpp'],
+					 ['/usr/bin/lpr-cups',
+					  '/usr/bin/xpp'] ],
 		     'alternatives' => [
 					[ 'lpr', '/usr/bin/lpr-cups' ],
 					[ 'lpq', '/usr/bin/lpq-cups' ],
diff --git a/perl-install/printer/default.pm b/perl-install/printer/default.pm
index af997fd48..41da25c56 100644
--- a/perl-install/printer/default.pm
+++ b/perl-install/printer/default.pm
@@ -11,17 +11,25 @@ my $FOOMATIC_DEFAULT_SPOOLER = "$FOOMATICCONFDIR/defaultspooler";
 
 sub set_printer {
     my ($printer) = $_[0];
-    run_program::rooted($::prefix, "foomatic-configure",
-			"-D", "-q", "-s", $printer->{SPOOLER},
-			"-n", $printer->{DEFAULT}) or return 0;
+    my $spooler = $printer->{SPOOLER};
+    if ($spooler eq "rcups") {
+	run_program::rooted($::prefix, "lpoptions",
+			    "-d", $printer->{DEFAULT}) or return 0;
+    } else {
+	run_program::rooted($::prefix, "foomatic-configure",
+			    "-D", "-q", "-s", $spooler,
+			    "-n", $printer->{DEFAULT}) or return 0;
+    }
     return 1;
 }
 
 sub get_printer {
     my $printer = $_[0];
+    my $spooler = $printer->{SPOOLER};
+    $spooler = "cups" if $spooler eq "rcups";
     local *F;
     open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
-	"foomatic-configure -Q -q -s $printer->{SPOOLER} |" or return undef;
+	"foomatic-configure -Q -q -s $spooler |" or return undef;
     my $line;
     while ($line = <F>) {
 	if ($line =~ m!^\s*<defaultqueue>(.*)</defaultqueue>\s*$!) {
@@ -37,7 +45,12 @@ sub get_spooler () {
     if (-f "$::prefix$FOOMATIC_DEFAULT_SPOOLER") {
         my $spool = cat_("$::prefix$FOOMATIC_DEFAULT_SPOOLER");
 	chomp $spool;
-	return $spool if $spool =~ /cups|lpd|lprng|pdq/; 
+	if ($spool =~ /cups/) {
+	    my ($daemonless_cups, $_remote_cups_server) =
+		printer::main::read_client_conf();
+	    $spool = ($daemonless_cups > 0 ? "rcups" : "cups");
+	}
+	return $spool if $spool =~ /cups|lpd|lprng|pdq/;
     }
 }
 
diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm
index 71adef0cf..fcb8316dd 100644
--- a/perl-install/printer/detect.pm
+++ b/perl-install/printer/detect.pm
@@ -8,17 +8,23 @@ use printer::data;
 
 sub local_detect() {
     modules::get_probeall("usb-interface") and eval { modules::load($usbprintermodule) };
-    eval { modules::unload(qw(lp parport_pc parport)) }; #- on kernel 2.4 parport has to be unloaded to probe again
-    eval { modules::load(qw(parport_pc lp)) }; #- take care as not available on 2.4 kernel (silent error).
-    whatPrinter();
+    # Reload parallel port modules only when we were not called by
+    # automatic setup of print queues, to avoid recursive calls
+    if ($::autoqueue) {
+	whatUsbport();
+    } else {
+	eval { modules::unload(qw(lp parport_pc ppdev parport)) }; #- on kernel 2.4 parport has to be unloaded to probe again
+	eval { modules::load(qw(ppdev parport_pc lp)) }; #- take care as not available on 2.4 kernel (silent error).
+	whatPrinter();
+    }
 }
 
-sub net_detect() { whatNetPrinter(1, 0) }
+sub net_detect { whatNetPrinter(1, 0, @_) }
 
-sub net_smb_detect() { whatNetPrinter(0, 1) }
+sub net_smb_detect { whatNetPrinter(0, 1, @_) }
 
-sub detect() {
-    local_detect(), whatNetPrinter(1, 1);
+sub detect {
+    local_detect(), whatNetPrinter(1, 1, @_);
 }
 
 
@@ -34,26 +40,32 @@ sub whatPrinter() {
 
 sub whatParport() {
     my @res;
-    foreach (0..3) {
+    my $i = 0;
+    foreach (sort { $a =~ /(\d+)/; my $m = $1; $b =~ /(\d+)/; my $n = $1; $m <=> $n } `ls -1d /proc/parport/[0-9]* /proc/sys/dev/parport/parport[0-9]* 2>/dev/null`) {
+	chomp;
 	my $elem = {};
 	my $F;
-	open $F, "/proc/parport/$_/autoprobe" or open $F, "/proc/sys/dev/parport/parport$_/autoprobe" or next;
+	open $F, "$_/autoprobe" or next;
 	{
 	    local $_;
 	    my $itemfound = 0;
-	    while (<$F>) { 
+	    while (<$F>) {
+		chomp;
 		if (/(.*):(.*);/) { #-#
 		    $elem->{$1} = $2;
 		    $elem->{$1} =~ s/Hewlett[-\s_]Packard/HP/;
 		    $elem->{$1} =~ s/HEWLETT[-\s_]PACKARD/HP/;
 		    $itemfound = 1;
+		    # Add IEEE-1284 device ID string
+		    $elem->{IEEE1284} .= $_;
 		}
 	    }
 	    # Some parallel printers miss the "CLASS" field
 	    $elem->{CLASS} = 'PRINTER' 
 		if $itemfound && !defined($elem->{CLASS});
 	}
-	push @res, { port => "/dev/lp$_", val => $elem };
+	push @res, { port => "/dev/lp$i", val => $elem };
+	$i ++;
     }
     @res;
 }
@@ -99,6 +111,10 @@ sub whatUsbport() {
 		next;
 	    };
 	    close $PORT;
+	    # Cut resulting string to its real length
+	    my $length = ord(substr($idstr, 1, 1)) +
+		(ord(substr($idstr, 0, 1)) << 8);
+	    $idstr = substr($idstr, 2, $length-2);
 	    # Remove non-printable characters
 	    $idstr =~ tr/[\x00-\x1f]/./;
 	    # If we do not find any item in the ID string, we try to read
@@ -108,6 +124,9 @@ sub whatUsbport() {
 	    my ($manufacturer, $model, $serialnumber, $description, $commandset) =
 		    ("", "", "", "", "");
 	    my ($sku);
+	    if ($idstr =~ /CLS:([^;]+);/ || $idstr =~ /CLASS:([^;]+);/) {
+		$itemfound = 1;
+	    }
 	    if ($idstr =~ /MFG:([^;]+);/ || $idstr =~ /MANUFACTURER:([^;]+);/) {
 		$manufacturer = $1;
 		$manufacturer =~ s/Hewlett[-\s_]Packard/HP/;
@@ -141,12 +160,12 @@ sub whatUsbport() {
 		$itemfound = 1;
 	    }
 	    # Nothing found? Try again if not in the third attempt,
-	    # in the third attempt always accept.
-	    next if !$itemfound && $j < 3;
+	    # after the third attempt give up
+	    next if !$itemfound;
 	    # Was there a manufacturer and a model in the string?
 	    if ($manufacturer eq "" || $model eq "") {
 		$manufacturer = "";
-		$model = N("Unknown Model");
+		$model = N("Unknown model");
 	    }
 	    # No description field? Make one out of manufacturer and model.
 	    if ($description eq "") {
@@ -160,7 +179,8 @@ sub whatUsbport() {
 			   DESCRIPTION => $description,
 			   SERIALNUMBER => $serialnumber,
 			   'COMMAND SET' => $commandset,
-			   SKU => $sku
+			   SKU => $sku,
+			   IEEE1284 => $idstr,
 			   } };
 	    last;
 	}
@@ -169,10 +189,14 @@ sub whatUsbport() {
 }
 
 sub whatNetPrinter {
-    my ($network, $smb) = @_;
+    my ($network, $smb, $timeout) = @_;
 
     my (@res);
 
+    # Set timeouts for "nmap"
+    $timeout = 4000 if !$timeout;
+    my $irtimeout = $timeout / 2;
+
     # Which ports should be scanned?
     my @portstoscan;
     push @portstoscan, "139" if $smb;
@@ -180,12 +204,13 @@ sub whatNetPrinter {
     
     return () if $#portstoscan < 0;
     my $portlist = join ",", @portstoscan;
-    
+
     # Which hosts should be scanned?
-    # (Applying nmap to a whole network is very time-consuming, because nmap
-    #  waits for a certain timeout period on non-existing hosts, so we get a 
-    #  lists of existing hosts by pinging the broadcast addresses for existing
-    #  hosts and then scanning only them, which is much faster)
+    # (Applying nmap to a whole network is very time-consuming,
+    #  because nmap waits for a certain timeout period on non-existing
+    #  hosts, so we get a lists of existing hosts by pinging the
+    #  broadcast addresses for existing hosts and then scanning only
+    #  them, which is much faster)
     my @hostips = getIPsInLocalNetworks();
     return () if $#hostips < 0;
     my $hostlist = join " ", @hostips;
@@ -194,25 +219,36 @@ sub whatNetPrinter {
     # delays caused by machines blocking their ports with a firewall
     local *F;
     open F, ($::testing ? "" : "chroot $::prefix/ ") .
-	qq(/bin/sh -c "export LC_ALL=C; nmap -r -P0 --host_timeout 400 --initial_rtt_timeout 200 -p $portlist $hostlist" |)
+	qq(/bin/sh -c "export LC_ALL=C; nmap -r -P0 --host_timeout $timeout --initial_rtt_timeout $irtimeout -p $portlist $hostlist" 2> /dev/null |)
 	or return @res;
-    my ($host, $ip, $port, $modelinfo) = ("", "", "", "");
+    my ($host, $ip, $port, $modelinfo, $namechecked) = ("", "", "", "", 0);
     while (my $line = <F>) {
 	chomp $line;
 
 	# head line of the report of a host with the ports in question open
-	#if ($line =~ m/^\s*Interesting\s+ports\s+on\s+(\S*)\s*\(([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\)\s*:\s*$/i) {
-	if ($line =~ m/^\s*Interesting\s+ports\s+on\s+(\S*)\s*\((\S+)\)\s*:\s*$/i) {
+	if (($line =~ m/^\s*Interesting\s+ports\s+on\s+(\S*)\s*\((\S+)\)\s*:\s*$/i) ||
+	    ($line =~ m/^\s*Interesting\s+ports\s+on\s+(\S+)\s*:\s*$/i)) {
 	    ($host, $ip) = ($1, $2);
+	    $ip = $host if !$ip;
 	    $host = $ip if $host eq "";
 	    $port = "";
+	    $namechecked = 0;
 
 	    undef $modelinfo;
 
 	} elsif ($line =~ m!^\s*(\d+)/\S+\s+open\s+!i) {
 	    next if $ip eq "";
 	    $port = $1;
-	    
+
+	    # Check integrity of the host name (work around DNS problems
+	    # by using IP if host name is broken)
+	    if (!$namechecked && ($host ne $ip)) {
+		$namechecked = 1; # Do not check more than once
+		my $packedip = gethostbyname("$host");
+		my ($a,$b,$c,$d) = unpack('C4',$packedip);
+		my $ipfromdns = sprintf("%d.%d.%d.%d", $a, $b, $c, $d);
+		$host = $ip if $ip ne $ipfromdns;
+	    }
 	    # Now we have all info for one printer
 	    # Store this auto-detection result in the data structure
 
@@ -224,7 +260,7 @@ sub whatNetPrinter {
 		foreach my $share (@shares) {
 		    push @res, { port => "smb://$host/$share->{name}",
 				 val => { CLASS => 'PRINTER',
-					  MODEL => N("Unknown Model"),
+					  MODEL => N("Unknown model"),
 					  MANUFACTURER => "",
 					  DESCRIPTION => $share->{description},
 					  SERIALNUMBER => ""
@@ -260,7 +296,7 @@ sub getNetworkInterfaces() {
 	
     local *IFCONFIG_OUT;
     open IFCONFIG_OUT, ($::testing ? "" : "chroot $::prefix/ ") .
-	'/bin/sh -c "export LC_ALL=C; ifconfig" |' or return ();
+	'/bin/sh -c "export LC_ALL=C; ifconfig" 2> /dev/null |' or return ();
     while (my $readline = <IFCONFIG_OUT>) {
 	# New entry ...
 	if ($readline =~ /^(\S+)\s/) {
@@ -291,7 +327,7 @@ sub getIPsOfLocalMachine() {
 	
     local *IFCONFIG_OUT;
     open IFCONFIG_OUT, ($::testing ? "" : "chroot $::prefix/ ") .
-	'/bin/sh -c "export LC_ALL=C; ifconfig" |' or return ();
+	'/bin/sh -c "export LC_ALL=C; ifconfig" 2> /dev/null |' or return ();
     while (my $readline = <IFCONFIG_OUT>) {
 	# New entry ...
 	if ($readline =~ /^(\S+)\s/) {
@@ -328,57 +364,90 @@ sub getIPsInLocalNetworks() {
     # Read the output of "ifconfig" to determine the broadcast addresses of
     # the local networks
     my $dev_is_localnet = 0;
-    my @local_bcasts;
-    my $current_bcast = "";
-	
+    my $local_nets = {};
+    my $dev;
     local *IFCONFIG_OUT;
     open IFCONFIG_OUT, ($::testing ? "" : "chroot $::prefix/ ") .
-	'/bin/sh -c "export LC_ALL=C; ifconfig" |' or return ();
+	'/bin/sh -c "export LC_ALL=C; ifconfig" 2> /dev/null |' or return ();
     while (my $readline = <IFCONFIG_OUT>) {
 	# New entry ...
 	if ($readline =~ /^(\S+)\s/) {
-	    my $dev = $1;
+	    $dev = $1;
 	    # ... for a local network (eth = ethernet, 
 	    #     vmnet = VMWare,
 	    #     ethernet card connected to ISP excluded)?
 	    $dev_is_localnet = $dev =~ /^eth/ || $dev =~ /^vmnet/;
-	    # delete previous address
-	    $current_bcast = "";
 	}
-	# Are we in the important line now?
-	if ($readline =~ /\sBcast:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s/) {
-	    # Rip out the broadcast IP address
-	    $current_bcast = $1;
-	    
-	    # Are we in an entry for a local network?
-	    if ($dev_is_localnet == 1) {
-		# Store current IP address
-		push @local_bcasts, $current_bcast;
+	if ($dev_is_localnet) {
+	    # Are we in the important line now?
+	    if ($readline =~ /\saddr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s/) {
+		# Rip out the broadcast IP address
+		$local_nets->{$dev}{ip} = $1;
+	    }
+	    if ($readline =~ /\sBcast:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s/) {
+		# Rip out the broadcast IP address
+		$local_nets->{$dev}{bcast} = $1;
+	    }
+	    if ($readline =~ /\sMask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s/) {
+		# Rip out the broadcast IP address
+		$local_nets->{$dev}{mask} = $1;
 	    }
 	}
     }
     close(IFCONFIG_OUT);
 
+    # Now find all addresses in the local networks which we will investigate
     my @addresses;
-    # Now ping all broadcast addresses and additionally "nmblookup" the
-    # networks (to find Windows servers which do not answer to ping)
-    foreach my $bcast (@local_bcasts) {
-	local *F;
-	open F, ($::testing ? "" : "chroot $::prefix/ ") . 
-	    qq(/bin/sh -c "export LC_ALL=C; ping -w 1 -b -n $bcast | cut -f 4 -d ' ' | sed s/:// | egrep '^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+' | uniq | sort" |) 
-	    or next;
-	local $_;
-	while (<F>) { chomp; push @addresses, $_ }
-	close F;
-	if (-x "/usr/bin/nmblookup") {
+    foreach $dev (keys %{$local_nets}) {
+	my $ip = $local_nets->{$dev}{ip};
+	my $bcast = $local_nets->{$dev}{bcast};
+	my $mask = $local_nets->{$dev}{mask};
+	if ($mask =~ /255.255.255.(\d+)/) {
+	    # Small network, never more than 255 boxes, so we return
+	    # all addresses belonging to this network, without pinging
+	    my $lastnumber = $1;
+	    my $masknumber;
+	    if ($lastnumber < 128) {
+		$masknumber = 24;
+	    } elsif ($lastnumber < 192) {
+		$masknumber = 25;
+	    } elsif ($lastnumber < 224) {
+		$masknumber = 26;
+	    } elsif ($lastnumber < 240) {
+		$masknumber = 27;
+	    } elsif ($lastnumber < 248) {
+		$masknumber = 28;
+	    } elsif ($lastnumber < 252) {
+		$masknumber = 29;
+	    } elsif ($lastnumber < 254) {
+		$masknumber = 30;
+	    } elsif ($lastnumber < 255) {
+		$masknumber = 31;
+	    } else {
+		$masknumber = 32;
+	    }
+	    push @addresses, "$ip/$masknumber";
+	} else {
+	    # Big network, probably more than 255 boxes, so ping the 
+	    # broadcast address and additionally "nmblookup" the
+	    # networks (to find Windows servers which do not answer to ping)
 	    local *F;
 	    open F, ($::testing ? "" : "chroot $::prefix/ ") . 
-		qq(/bin/sh -c "export LC_ALL=C; nmblookup -B $bcast \\* | cut -f 1 -d ' ' | egrep '^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+' | uniq | sort" |)
+		qq(/bin/sh -c "export LC_ALL=C; ping -w 1 -b -n $bcast 2> /dev/null | cut -f 4 -d ' ' | sed s/:// | egrep '^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+' | uniq | sort" |) 
 		or next;
 	    local $_;
-	    while (<F>) { 
-		chomp;
-		push @addresses, $_ if !(member($_,@addresses));
+	    while (<F>) { chomp; push @addresses, $_ }
+	    close F;
+	    if (-x "/usr/bin/nmblookup") {
+		local *F;
+		open F, ($::testing ? "" : "chroot $::prefix/ ") . 
+		    qq(/bin/sh -c "export LC_ALL=C; nmblookup -B $bcast \\* 2> /dev/null | cut -f 1 -d ' ' | egrep '^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+' | uniq | sort" |)
+		    or next;
+		local $_;
+		while (<F>) { 
+		    chomp;
+		    push @addresses, $_ if !(member($_,@addresses));
+		}
 	    }
 	}
     }
@@ -392,7 +461,7 @@ sub getSMBPrinterShares {
     # SMB request to auto-detect shares
     local *F;
     open F, ($::testing ? "" : "chroot $::prefix/ ") .
-	qq(/bin/sh -c "export LC_ALL=C; smbclient -N -L $host" |) or return ();
+	qq(/bin/sh -c "export LC_ALL=C; smbclient -N -L $host" 2> /dev/null |) or return ();
     my $insharelist = 0;
     my @shares;
     while (my $l = <F>) {
@@ -424,9 +493,9 @@ sub getSNMPModel {
     # SNMP request to auto-detect model
     local *F;
     open F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
-	qq(/bin/sh -c "scli -v 1 -c 'show printer info' $host" |) or
+	qq(/bin/sh -c "scli -v 1 -c 'show printer info' $host" 2> /dev/null |) or
 	return { CLASS => 'PRINTER',
-		 MODEL => N("Unknown Model"),
+		 MODEL => N("Unknown model"),
 		 MANUFACTURER => "",
 		 DESCRIPTION => "",
 		 SERIALNUMBER => ""
@@ -453,7 +522,43 @@ sub getSNMPModel {
     # Was there a manufacturer and a model in the output?
     # If not, get them from the description
     if ($manufacturer eq "" || $model eq "") {
-	if ($description =~ /^\s*(\S*)\s+(\S.*)$/) {
+	# Replace bad description
+	if ((length($description) < 5) &&
+	    (length($description) >= 5)) {
+	    $description = $model;
+	}
+	# Guess manufacturer by model name
+	if ($description =~
+	    /^\s*(DeskJet|LaserJet|OfficeJet|PSC|PhotoSmart)\b/i) {
+	    # HP printer
+	    $manufacturer = "HP";
+	    $model = $description;
+	} elsif ($description =~
+	    /^\s*(Stylus|EPL|AcuLaser)\b/i) {
+	    # Epson printer
+	    $manufacturer = "Epson";
+	    $model = $description;
+	} elsif ($description =~
+	    /^\s*(Aficio)\b/i) {
+	    # Ricoh printer
+	    $manufacturer = "Ricoh";
+	    $model = $description;
+	} elsif ($description =~
+	    /^\s*(Optra|Color\s+JetPrinter)\b/i) {
+	    # Lexmark printer
+	    $manufacturer = "Lexmark";
+	    $model = $description;
+	} elsif ($description =~
+	    /^\s*(imageRunner|Pixma|Pixus|BJC|LBP)\b/i) {
+	    # Canon printer
+	    $manufacturer = "Canon";
+	    $model = $description;
+	} elsif ($description =~
+	    /^\s*(Phaser|DocuPrint|(Work|Document)\s*(Home|)Centre)\b/i) {
+	    # Xerox printer
+	    $manufacturer = "Xerox";
+	    $model = $description;
+	} elsif ($description =~ /^\s*(\S*)\s+(\S.*)$/) {
 	    $manufacturer = $1 if $manufacturer eq "";
 	    $model = $2 if $model eq "";
 	}
@@ -463,7 +568,7 @@ sub getSNMPModel {
     }
     
     # We couldn't determine a model
-    $model = N("Unknown Model") if $model eq "";
+    $model = N("Unknown model") if $model eq "";
     
     # Remove trailing spaces
     $manufacturer =~ s/(\S+)\s+$/$1/;
@@ -485,7 +590,7 @@ sub network_running() {
     # If the network is not running return 0, otherwise 1.
     local *F; 
     open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
-	'/bin/sh -c "export LC_ALL=C; /sbin/ifconfig" |' or
+	'/bin/sh -c "export LC_ALL=C; /sbin/ifconfig" 2> /dev/null |' or
 	    die 'Could not run "ifconfig"!';
     while (my $line = <F>) {
 	if ($line !~ /^lo\s+/ && # The loopback device can have been 
@@ -506,8 +611,18 @@ sub parport_addr {
     $device =~ m!^/dev/lp(\d+)$! or
 	$device =~ m!^/dev/printers/(\d+)$!;
     my $portnumber = $1;
+    my $i = 0;
+    my $parportdir;
+    foreach (sort { $a =~ /(\d+)/; my $m = $1; $b =~ /(\d+)/; my $n = $1; $m <=> $n } `ls -1d /proc/parport/[0-9]* /proc/sys/dev/parport/parport[0-9]* 2>/dev/null`) {
+	chomp;
+	if ($i == $portnumber) {
+	    $parportdir = $_;
+	    last;
+	}
+	$i++;
+    }
     my $parport_addresses = 
-	`cat /proc/sys/dev/parport/parport$portnumber/base-addr`;
+	`cat $parportdir/base-addr`;
     my $address_arg;
     if ($parport_addresses =~ /^\s*(\d+)\s+(\d+)\s*$/) {
 	$address_arg = sprintf(" -base 0x%x -basehigh 0x%x", $1, $2);
diff --git a/perl-install/printer/gimp.pm b/perl-install/printer/gimp.pm
deleted file mode 100644
index 8da3a7625..000000000
--- a/perl-install/printer/gimp.pm
+++ /dev/null
@@ -1,361 +0,0 @@
-package printer::gimp;
-
-use strict;
-use run_program;
-use common;
-use printer::common;
-use printer::data;
-use printer::cups;
-
-# ------------------------------------------------------------------
-#   GIMP-print related stuff
-# ------------------------------------------------------------------
-
-sub configure {
-    my ($printer) = @_;
-    # Do we have files to treat?
-    my @configfilenames = findconfigfiles();
-    return 1 if $#configfilenames < 0;
-    # There is no system-wide config file, treat every user's config file
-    foreach my $configfilename (@configfilenames) {
-	# Load GIMP's printer config file
-	my $configfilecontent = readconfigfile($configfilename);
-	# Update local printer queues
-	foreach my $queue (keys(%{$printer->{configured}})) {
-	    # Check if we have a PPD file
-	    if (! -r "$::prefix/etc/foomatic/$queue.ppd") {
-		if (-r "$::prefix/etc/cups/ppd/$queue.ppd") {
-		    # If we have a PPD file in the CUPS config dir, link to it
-		    run_program::rooted($::prefix, 
-					"ln", "-sf",
-					"/etc/cups/ppd/$queue.ppd",
-					"/etc/foomatic/$queue.ppd");
-		} elsif (-r "$::prefix/usr/share/postscript/ppd/$queue.ppd") {
-		    # Check PPD directory of GPR, too
-		    run_program::rooted(
-			 $::prefix, 
-			 "ln", "-sf",
-			 "/usr/share/postscript/ppd/$queue.ppd",
-			 "/etc/foomatic/$queue.ppd");
-		} else {
-		    # No PPD file at all? We cannot set up this printer
-		    next;
-		}
-	    }
-	    # Add the printer entry
-	    if (!isprinterconfigured($queue, $configfilecontent)) {
-		# Remove the old printer entry
-		$configfilecontent = 
-		    removeprinter($queue, $configfilecontent);
-		# Add the new printer entry
-		$configfilecontent = 
-		    makeprinterentry($printer, $queue,
-					 $configfilecontent);
-	    }
-	}
-	# Default printer
-	if ($printer->{DEFAULT}) {
-	    if ($configfilecontent !~ /^\s*Current\-Printer\s*:/m) {
-		$configfilecontent =~
-		    s/\n/\nCurrent-Printer: $printer->{DEFAULT}\n/s;
-	    } else {
-		if ($configfilecontent =~ /^\s*Current\-Printer\s*:\s*(\S+)\s*$/m &&
-              !isprinterconfigured($1, $configfilecontent)) {
-		    $configfilecontent =~
-			s/(Current\-Printer\s*:\s*)\S+/$1$printer->{DEFAULT}/;
-		}
-	    }
-	}
-	# Write back GIMP's printer configuration file
-	writeconfigfile($configfilename, $configfilecontent);
-    }
-    return 1;
-}
-
-sub addcupsremoteto {
-    my ($printer, $queue) = @_;
-    # Do we have files to treat?
-    my @configfilenames = findconfigfiles();
-    return 1 if $#configfilenames < 0;
-    my @printerlist = printer::cups::get_remote_queues();
-    my $ppdfile = "";
-    if ($printer->{SPOOLER} eq "cups" && 
-	(-x "$::prefix/usr/bin/curl" || -x "$::prefix/usr/bin/wget")) {
-	foreach my $listentry (@printerlist) {
-	    next if $listentry !~ /^([^\|]+)\|([^\|]+)$/;
-	    my $q = $1;
-	    next if $q ne $queue;
-	    my $server = $2;
-	    # Remove server name from queue name
-	    $q =~ s/^([^@]*)@.*$/$1/;
-	    if (-x "$::prefix/usr/bin/wget") {
-		eval(run_program::rooted(
-		      $::prefix, "/usr/bin/wget", "-O",
-		      "/etc/foomatic/$queue.ppd",
-		      "http://$server:631/printers/$q.ppd"));
-	    } else {
-		eval(run_program::rooted(
-		      $::prefix, "/usr/bin/curl", "-o",
-		      "/etc/foomatic/$queue.ppd",
-		      "http://$server:631/printers/$q.ppd"));
-	    }
-	    # Does the file exist and is it not an error message?
-	    if (-r "$::prefix/etc/foomatic/$queue.ppd" &&
-		cat_("$::prefix/etc/foomatic/$queue.ppd") =~ /^\*PPD-Adobe/) {
-		$ppdfile = "/etc/foomatic/$queue.ppd";
-	    } else {
-		unlink "$::prefix/etc/foomatic/$queue.ppd";
-		return 0;
-	    }
-	}
-    } else { return 1 }
-    # There is no system-wide config file, treat every user's config file
-    foreach my $configfilename (@configfilenames) {
-	# Load GIMP's printer config file
-	my $configfilecontent = readconfigfile($configfilename);
-	# Add the printer entry
-	if (!isprinterconfigured($queue, $configfilecontent)) {
-	    # Remove the old printer entry
-	    $configfilecontent = removeprinter($queue, $configfilecontent);
-	    # Add the new printer entry
-	    $configfilecontent = makeprinterentry($printer, $queue, $configfilecontent);
-	}
-	# Write back GIMP's printer configuration file
-	writeconfigfile($configfilename, $configfilecontent);
-    }
-    return 1;
-}
-
-sub removeprinterfrom {
-    my ($_printer, $queue) = @_;
-    # Do we have files to treat?
-    my @configfilenames = findconfigfiles();
-    return 1 if $#configfilenames < 0;
-    # There is no system-wide config file, treat every user's config file
-    foreach my $configfilename (@configfilenames) {
-	# Load GIMP's printer config file
-	my $configfilecontent = readconfigfile($configfilename);
-	# Remove the printer entry
-	$configfilecontent = removeprinter($queue, $configfilecontent);
-	# Write back GIMP's printer configuration file
-	writeconfigfile($configfilename, $configfilecontent);
-    }
-    return 1;
-}
-
-sub removelocalprintersfrom {
-    my ($printer) = @_;
-    # Do we have files to treat?
-    my @configfilenames = findconfigfiles();
-    return 1 if $#configfilenames < 0;
-    # There is no system-wide config file, treat every user's config file
-    foreach my $configfilename (@configfilenames) {
-	# Load GIMP's printer config file
-	my $configfilecontent = readconfigfile($configfilename);
-	# Remove the printer entries
-	foreach my $queue (keys(%{$printer->{configured}})) {
-	    $configfilecontent = removeprinter($queue, $configfilecontent);
-	}
-	# Write back GIMP's printer configuration file
-	writeconfigfile($configfilename, $configfilecontent);
-    }
-    return 1;
-}
-
-sub makeprinterentry {
-    my ($printer, $queue, $configfile) = @_;
-    # Make printer's section
-    $configfile = addprinter($queue, $configfile);
-    # Load PPD file
-    my $ppd = cat_("$::prefix/etc/foomatic/$queue.ppd");
-    # Is the printer configured with GIMP-Print?
-    my $gimpprintqueue = 0;
-    my $gimpprintdriver = "ps2";
-    if ($ppd =~ /CUPS\s*\+\s*GIMP\s*\-\s*Print/im) {
-	# Native CUPS driver
-	$gimpprintqueue = 1;
-	$gimpprintdriver = $1 if $ppd =~ /\s*\*ModelName:\s*\"(\S+)\"\s*$/im;
-    } elsif ($ppd =~ /Foomatic\s*\+\s*gimp\s*\-\s*print/im) {
-	# GhostScript + Foomatic driver
-	$gimpprintqueue = 1;
-	$ppd =~ /\-sModel=((escp2|pcl|bjc|lexmark)\-[^\s\"\']*)/im and
-	$gimpprintdriver = $1;
-    }
-    if ($gimpprintqueue) {
-	# Get the paper size from the PPD file
-	if ($ppd =~ /^\s*\*DefaultPageSize:\s*(\S+)\s*$/m) {
-	    my $papersize = $1;
-	    $configfile = removeentry($queue,
-					  "Media-Size", $configfile);
-	    $configfile = addentry($queue, 
-				       "Media-Size: $papersize", $configfile);
-	}
-	$configfile = removeentry($queue, "PPD-File:", $configfile);
-	$configfile = addentry($queue, "PPD-File:", $configfile);
-	$configfile = removeentry($queue, "Driver:", $configfile);
-	$configfile = addentry($queue, "Driver: $gimpprintdriver", $configfile);
-	$configfile = removeentry($queue, "Destination:", $configfile);
-	$configfile = addentry($queue, 
-				   sprintf("Destination: /usr/bin/%s -P %s -o raw", $spoolers{$printer->{SPOOLER}}{print_command}, $queue), $configfile);
-    } else {
-	$configfile = removeentry($queue, "PPD-File:", $configfile);
-	$configfile = addentry($queue, "PPD-File: /etc/foomatic/$queue.ppd", $configfile);
-	$configfile = removeentry($queue, "Driver:", $configfile);
-	$configfile = addentry($queue, "Driver: ps2", $configfile);
-	$configfile = removeentry($queue, "Destination:", $configfile);
-	$configfile = addentry($queue, 
-				   sprintf("Destination: /usr/bin/%s -P %s", $spoolers{$printer->{SPOOLER}}{print_command}, $queue), $configfile);
-    }
-    return $configfile;
-}
-
-sub findconfigfiles() {
-    my @configfilenames = (if_(-d "$::prefix/usr/lib/gimp/1.2", ".gimp-1.2/printrc"),
-                           if_(-d "$::prefix/usr/lib/gimp/1.3", ".gimp-1.3/printrc"),
-                           if_(-d "$::prefix/usr/lib/gimp/2.0", ".gimp-2.0/printrc"));
-    return () unless @configfilenames;
-    my @filestotreat;
-    foreach (&list_passwd()) {
-	last if ($#filestotreat > 50);
-        my ($username, undef, $uid, $gid, undef, undef, undef, $homedir) = @$_;
-        next if 0 < $uid && $uid < 500 || $username eq "nobody";
-        foreach my $file (@configfilenames) {
-            my $dir = "$homedir/$file";
-            $dir =~ s,/[^/]*$,,;
-            next if -f $dir;
-            if (! -d "$::prefix$dir") {
-                eval { mkdir_p("$::prefix$dir") } or next;
-                run_program::rooted($::prefix, "/bin/chown", "$uid.$gid", $dir) or next;
-            }
-            if (! -f "$::prefix$homedir/$file") {
-                eval { output("$::prefix$homedir/$file", "#PRINTRCv1 written by GIMP-PRINT 4.2.2 - 13 Sep 2002\n") } or next;
-                run_program::rooted($::prefix, "/bin/chown", "$uid.$gid", "$homedir/$file") or next;
-            }
-            push @filestotreat, "$homedir/$file";
-        }
-    }
-    @filestotreat;
-}
-
-sub readconfigfile {
-    my ($file) = @_;
-    local *F; 
-    open F, "< $::prefix$file" or return "";
-    my $filecontent = join("", <F>);
-    close F;
-    return $filecontent;
-}
-
-sub writeconfigfile {
-    my ($file, $filecontent) = @_;
-    local *F; 
-    open F, "> $::prefix$file" or return 0;
-    print F $filecontent;
-    close F;
-    return 1;
-}
-
-sub addentry {
-    my ($section, $entry, $filecontent) = @_;
-    my $sectionfound = 0;
-    my $entryinserted = 0;
-    my @lines = pop_spaces(split("\n", $filecontent));
-    foreach (@lines) {
-	if (!$sectionfound) {
-	    $sectionfound = 1 if /^\s*Printer\s*:\s*($section)\s*$/;
-	} else {
-	    if (!/^\s*$/ && !/^\s*;/) {
-          $_ = "$entry\n$_";
-		$entryinserted = 1;
-		last;
-	    }
-	}
-    }
-    push(@lines, $entry) if $sectionfound && !$entryinserted;
-    return join("\n", @lines) . "\n";
-}
-
-sub addprinter {
-    my ($section, $filecontent) = @_;
-    foreach (pop_spaces(split("\n", $filecontent))) {
-     # section already there, nothing to be done
-     return $filecontent if /^\s*Printer\s*:\s*($section)\s*$/;
-    }
-    return $filecontent . "\nPrinter: $section\n";
-}
-
-sub pop_spaces {
-    my @lines = @_;
-    pop @lines while @lines && $lines[-1] !~ /\S/;
-}
-
-sub removeentry {
-    my ($section, $entry, $filecontent) = @_;
-    my $sectionfound;
-    my @lines = pop_spaces(split(/^/, $filecontent));
-    foreach (@lines) {
-	if (!$sectionfound) {
-	    $sectionfound = /^\s*Printer\s*:\s*($section)\s*$/;
-	} else {
-	    last if /^\s*Printer\s*:\s*.*\s*$/; # Next section
-         if (/^\s*$entry/) {
-             $_ = "";
-             last;
-         }
-	}
-    }
-    return join "", @lines;
-}
-
-sub removeprinter {
-    my ($section, $filecontent) = @_;
-    my $sectionfound;
-    my @lines = pop_spaces(split(/^/, $filecontent));
-    foreach (@lines) {
-	if (!$sectionfound) {
-	    if (/^\s*Printer\s*:\s*($section)\s*$/) {
-             $_ = "";
-             $sectionfound = 1;
-         }
-	} else {
-	    last if /^\s*Printer\s*:\s*.*\s*$/; # Next section
-         $_ = "";
-	}
-    }
-    return join "", @lines;
-}
-
-sub isprinterconfigured {
-    my ($queue, $filecontent) = @_;
-    my $sectionfound = 0;
-    my $done = 0;
-    my $drivernotps2 = 0;
-    my $ppdfileset = 0;
-    my $nonrawprinting = 0;
-    foreach (split("\n", $filecontent)) {
-	if (!$sectionfound) {
-	    if (/^\s*Printer\s*:\s*($queue)\s*$/) {
-		$sectionfound = 1;
-	    }
-	} else {
-	    if (/^\s*Printer\s*:\s*.*\s*$/) { # Next section
-		$done = 1;
-          last;
-	    } elsif (/^\s*Driver:\s*(\S+)\s*$/) {
-		$drivernotps2 = $1 ne "ps2";
-	    } elsif (/^\s*PPD\-File:\s*(\S+)\s*$/) {
-		$ppdfileset = 1;
-	    } elsif (my ($dest) = /^\s*Destination:\s*(\S+.*)$/) {
-		$nonrawprinting = $dest !~ /\-o\s*raw/;
-	    } 
-	}
-    }
-    return 0 if $done && !$sectionfound; # FIXME: IMPOSSIBLE; should be just $done
-    return 1 if $ppdfileset || $drivernotps2 || $nonrawprinting;
-    return 0;
-}
-
-
-# ------------------------------------------------------------------
-
-1;
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index d9f06ddde..31d8981ba 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -9,28 +9,24 @@ use run_program;
 use printer::data;
 use printer::services;
 use printer::default;
-use printer::gimp;
 use printer::cups;
-use printer::office;
 use printer::detect;
 use handle_configs;
 use services;
+use lang;
 
 use vars qw(@ISA @EXPORT);
 
 @ISA = qw(Exporter);
 @EXPORT = qw(%printer_type %printer_type_inv);
 
-#-Did we already read the subroutines of /usr/sbin/ptal-init?
-my $ptalinitread = 0;
-
 our %printer_type = (
     N("Local printer")                              => "LOCAL",
     N("Remote printer")                             => "REMOTE",
     N("Printer on remote CUPS server")              => "CUPS",
     N("Printer on remote lpd server")               => "LPD",
     N("Network printer (TCP/Socket)")               => "SOCKET",
-    N("Printer on SMB/Windows 95/98/NT server")     => "SMB",
+    N("Printer on SMB/Windows server")              => "SMB",
     N("Printer on NetWare server")                  => "NCP",
     N("Enter a printer device URI")                 => "URI",
     N("Pipe job into a command")                    => "POSTPIPE"
@@ -39,6 +35,14 @@ our %printer_type = (
 our %printer_type_inv = reverse %printer_type;
 
 our %thedb;
+our %linkedppds;
+
+our $hplipdevicesdb;
+
+# Translation of the "(recommended)" in printer driver entries
+our $recstr = N("recommended");
+our $precstr = "($recstr)";
+our $sprecstr = quotemeta($precstr);
 
 #------------------------------------------------------------------------------
 
@@ -56,9 +60,9 @@ sub spooler() {
     # PDQ is not officially supported any more since version 9.1, so
     # show it only in the spooler menu when it was manually installed.
 
-    return map { $spoolers{$_}{long_name} } qw(cups), 
+    return map { $spoolers{$_}{long_name} } ('cups', 'rcups' , 
     if_(files_exist(qw(/usr/bin/pdq)), 'pdq'),
-    if_(files_exist(qw(/usr/lib/filters/lpf /usr/sbin/lpd)), 'lprng');
+    if_(files_exist("/usr/$lib/filters/lpf", "/usr/sbin/lpd"), 'lprng'));
 }
 
 sub printer_type($) {
@@ -68,14 +72,15 @@ sub printer_type($) {
 	/lpd/   and return @printer_type_inv{qw(LOCAL LPD SOCKET SMB NCP), if_($printer->{expert}, qw(POSTPIPE URI))};
 	/lprng/ and return @printer_type_inv{qw(LOCAL LPD SOCKET SMB NCP), if_($printer->{expert}, qw(POSTPIPE URI))};
 	/pdq/   and return @printer_type_inv{qw(LOCAL LPD SOCKET), if_($printer->{expert}, qw(URI))};
+	/rcups/ and return ();
     }
 }
 
 sub SIGHUP_daemon {
     my ($service) = @_;
-    if ($service eq "cupsd") { $service = "cups" };
-    # PDQ has no daemon, exit.
-    if ($service eq "pdq") { return 1 };
+    if ($service eq "cupsd") { $service = "cups" }
+    # PDQ and remote CUPS have no daemons, exit.
+    if (($service eq "pdq") || ($service eq "rcups")) { return 1 }
     # CUPS needs auto-correction for its configuration
     run_program::rooted($::prefix, "/usr/sbin/correctcupsconfig") if $service eq "cups";
     # Name of the daemon
@@ -125,18 +130,17 @@ sub assure_device_is_available_for_cups {
     }
     my $maxattempts = 3;
     for ($i = 0; $i < $maxattempts; $i++) {
-	local *F; 
-	open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
-	    '/bin/sh -c "export LC_ALL=C; /usr/sbin/lpinfo -v" |' or
+	open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
+	    '/bin/sh -c "export LC_ALL=C; /usr/sbin/lpinfo -v" |') or
 	    die 'Could not run "lpinfo"!';
-	while (my $line = <F>) {
+	while (my $line = <$F>) {
 	    if ($line =~ /$sdevice/) { # Found a line containing the device
 		                       # name, so CUPS knows it.
-		close F;
+		close $F;
 		return 1;
 	    }
 	}
-	close F;
+	close $F;
 	$result = printer::services::restart("cups");
     }
     return $result;
@@ -150,15 +154,14 @@ sub spooler_in_security_level {
     $sp = $spooler eq "lpr" || $spooler eq "lprng" ? "lpd" : $spooler;
     my $file = "$::prefix/etc/security/msec/server.$level";
     if (-f $file) {
-	local *F; 
-	open F, "< $file" or return 0;
-	while (my $line = <F>) {
+	open(my $F, "< $file") or return 0;
+	while (my $line = <$F>) {
 	    if ($line =~ /^\s*$sp\s*$/) {
-		close F;
+		close $F;
 		return 1;
 	    }
 	}
-	close F;
+	close $F;
     }
     return 0;
 }
@@ -206,7 +209,7 @@ sub resetinfo($) {
     $printer->{QUEUE} = "";
     $printer->{OLD_QUEUE} = "";
     $printer->{OLD_CHOICE} = "";
-    $printer->{ARGS} = "";
+    $printer->{ARGS} = {};
     $printer->{DBENTRY} = "";
     $printer->{DEFAULT} = "";
     $printer->{currentqueue} = {};
@@ -222,24 +225,26 @@ sub read_configured_queues($) {
     $printer->{SPOOLER} ||= printer::default::get_spooler();
     if (!$printer->{SPOOLER}) {
 	#- Find the first spooler where there are queues
-	foreach my $spooler (qw(cups pdq lprng lpd)) {
+	foreach my $spooler (qw(rcups cups pdq lprng lpd)) {
 	    #- Is the spooler's daemon running?
 	    my $service = $spooler;
 	    if ($service eq "lprng") {
 		$service = "lpd";
 	    }
-	    if ($service ne "pdq") {
+	    if (($service ne "pdq") && ($service ne "rcups")) {
 		next unless services::is_service_running($service);
 		# daemon is running, spooler found
 		$printer->{SPOOLER} = $spooler;
 	    }
-	    #- poll queue info 
-	    local *F; 
-	    open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
-		"foomatic-configure -P -q -s $spooler |" or
-		    die "Could not run foomatic-configure";
-	    eval join('', <F>); 
-	    close F;
+	    #- poll queue info
+	    if ($service ne "rcups") {
+		open(my $F, ($::testing ? 
+			     $::prefix : "chroot $::prefix/ ") .
+		     "foomatic-configure -P -q -s $spooler |") or
+		     die "Could not run foomatic-configure";
+		eval join('', <$F>);
+		close $F;
+	    }
 	    if ($service eq "pdq") {
 		#- Have we found queues? PDQ has no damon, so we consider
 		#- it in use when there are defined printer queues
@@ -247,6 +252,17 @@ sub read_configured_queues($) {
 		    $printer->{SPOOLER} = $spooler;
 		    last;
 		}
+	    } elsif ($service eq "rcups") {
+		#- In daemon-less CUPS mode there are no local queues,
+		#- we can only recognize it by a server entry in
+		#- /etc/cups/client.conf
+		my ($daemonless_cups, $remote_cups_server) =
+		    printer::main::read_client_conf();
+		if ($daemonless_cups) {
+		    $printer->{SPOOLER} = $spooler;
+		    $printer->{remote_cups_server} = $remote_cups_server;
+		    last;
+		}
 	    } else {
 		#- For other spoolers we have already found a running
 		#- daemon when we have arrived here
@@ -254,13 +270,18 @@ sub read_configured_queues($) {
 	    }
 	}
     } else {
-	#- Poll the queues of the current default spooler
-	local *F; 
-	open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
-	    "foomatic-configure -P -q -s $printer->{SPOOLER} -r |" or
-		die "Could not run foomatic-configure";
-	eval join('', <F>); 
-	close F;
+	if ($printer->{SPOOLER} ne "rcups") {
+	    #- Poll the queues of the current default spooler
+	    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
+		 "foomatic-configure -P -q -s $printer->{SPOOLER} -r |") or
+		 die "Could not run foomatic-configure";
+	    eval join('', <$F>);
+	    close $F;
+	} else {
+	    my ($_daemonless_cups, $remote_cups_server) =
+		printer::main::read_client_conf();
+	    $printer->{remote_cups_server} = $remote_cups_server;
+	}
     }
     $printer->{configured} = {};
     my $i;
@@ -285,21 +306,24 @@ sub read_configured_queues($) {
 	        }
 		# Read out which PPD file was originally used to set up this
 		# queue
-		local *F;
-		if (open F, "< $::prefix/etc/cups/ppd/$QUEUES[$i]{queuedata}{queue}.ppd") {
-		    while (my $line = <F>) {
+		if (open(my $F, "< $::prefix/etc/cups/ppd/$QUEUES[$i]{queuedata}{queue}.ppd")) {
+		    while (my $line = <$F>) {
 			if ($line =~ /^\*%MDKMODELCHOICE:(.+)$/) {
 			    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{ppd} = $1;
 			}
 		    }
-		    close F;
-		}
-		# Mark that we have a CUPS queue but do not know the name
-		# the PPD file in /usr/share/cups/model
-		if (!$printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{ppd}) {
-		    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{ppd} = '1';
+		    close $F;
+		    # Mark that we have a CUPS queue but do not know the
+		    # name the PPD file in /usr/share/cups/model
+		    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{ppd} ||= '1';
+		    # Mark that our PPD file is not a Foomatic one
+		    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{driver} = "PPD";
+		} else {
+		    # We do not have a PPD file for this queue
+		    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{ppd} = undef;
+		    # No PPD found? Then we have a raw queue
+		    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{driver} = "raw";
 		}
-		$printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{driver} = 'PPD';
 		$printer->{OLD_QUEUE} = "";
 	    }
 	    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{make} ||= "";
@@ -340,6 +364,17 @@ sub make_menuentry {
 	$connection = N(", USB printer #%s", $number);
     } elsif ($connect =~ m!^usb://!) {
 	$connection = N(", USB printer");
+    } elsif ($connect =~ m!^hp:/(.+?)$!) {
+	my $hplipdevice = $1;
+	if ($hplipdevice =~ m!^par/!) {
+	    $connection = N(", HP printer on a parallel port");
+	} elsif ($hplipdevice =~ m!^usb/!) {
+	    $connection = N(", HP printer on USB");
+	} elsif ($hplipdevice =~ m!^net/!) {
+	    $connection = N(", HP printer on HP JetDirect");
+	} else {
+	    $connection = N(", HP printer");
+	}
     } elsif ($connect =~ m!^ptal://?(.+?)$!) {
 	my $ptaldevice = $1;
 	if ($ptaldevice =~ /^mlc:par:(\d+)$/) {
@@ -356,21 +391,27 @@ sub make_menuentry {
 	    $connection = N(", multi-function device");
 	}
     } elsif ($connect =~ m!^file:(.+)$!) {
-	$connection = N(", printing to %s", $1);
+        my $file = $1;
+	$connection = N(", printing to %s", $file);
     } elsif ($connect =~ m!^lpd://([^/]+)/([^/]+)/?$!) {
-	$connection = N(" on LPD server \"%s\", printer \"%s\"", $1, $2);
+        my ($server, $printer) = ($1, $2);
+	$connection = N(" on LPD server \"%s\", printer \"%s\"", $server, $printer);
     } elsif ($connect =~ m!^socket://([^/:]+):([^/:]+)/?$!) {
-	$connection = N(", TCP/IP host \"%s\", port %s", $1, $2);
+        my ($host, $port) = ($1, $2);
+	$connection = N(", TCP/IP host \"%s\", port %s", $host, $port);
     } elsif ($connect =~ m!^smb://([^/\@]+)/([^/\@]+)/?$! ||
 	     $connect =~ m!^smb://.*/([^/\@]+)/([^/\@]+)/?$! ||
 	     $connect =~ m!^smb://.*\@([^/\@]+)/([^/\@]+)/?$!) {
-	$connection = N(" on SMB/Windows server \"%s\", share \"%s\"", $1, $2);
+        my ($server, $share) = ($1, $2);
+	$connection = N(" on SMB/Windows server \"%s\", share \"%s\"", $server, $share);
     } elsif ($connect =~ m!^ncp://([^/\@]+)/([^/\@]+)/?$! ||
 	     $connect =~ m!^ncp://.*/([^/\@]+)/([^/\@]+)/?$! ||
 	     $connect =~ m!^ncp://.*\@([^/\@]+)/([^/\@]+)/?$!) {
-	$connection = N(" on Novell server \"%s\", printer \"%s\"", $1, $2);
+        my ($server, $printer) = ($1, $2);
+	$connection = N(" on Novell server \"%s\", printer \"%s\"", $server, $printer);
     } elsif ($connect =~ m!^postpipe:(.+)$!) {
-	$connection = N(", using command %s", $1);
+        my $command = $1;
+	$connection = N(", using command %s", $command);
     } else {
 	$connection = ($printer->{expert} ? ", URI: $connect" : "");
     }
@@ -391,6 +432,17 @@ sub connectionstr {
 	$connection = N("USB printer #%s", $number);
     } elsif ($connect =~ m!^usb://!) {
 	$connection = N("USB printer");
+    } elsif ($connect =~ m!^hp:/(.+?)$!) {
+	my $hplipdevice = $1;
+	if ($hplipdevice =~ m!^par/!) {
+	    $connection = N("HP printer on a parallel port");
+	} elsif ($hplipdevice =~ m!^usb/!) {
+	    $connection = N("HP printer on USB");
+	} elsif ($hplipdevice =~ m!^net/!) {
+	    $connection = N("HP printer on HP JetDirect");
+	} else {
+	    $connection = N("HP printer");
+	}
     } elsif ($connect =~ m!^ptal://?(.+?)$!) {
 	my $ptaldevice = $1;
 	if ($ptaldevice =~ /^mlc:par:(\d+)$/) {
@@ -407,21 +459,27 @@ sub connectionstr {
 	    $connection = N("Multi-function device");
 	}
     } elsif ($connect =~ m!^file:(.+)$!) {
-	$connection = N("Prints into %s", $1);
+        my $file = $1;
+	$connection = N("Prints into %s", $file);
     } elsif ($connect =~ m!^lpd://([^/]+)/([^/]+)/?$!) {
-	$connection = N("LPD server \"%s\", printer \"%s\"", $1, $2);
+        my ($server, $port) = ($1, $2);
+	$connection = N("LPD server \"%s\", printer \"%s\"", $server, $port);
     } elsif ($connect =~ m!^socket://([^/:]+):([^/:]+)/?$!) {
-	$connection = N("TCP/IP host \"%s\", port %s", $1, $2);
+        my ($host, $port) = ($1, $2);
+        $connection = N("TCP/IP host \"%s\", port %s", $host, $port);
     } elsif ($connect =~ m!^smb://([^/\@]+)/([^/\@]+)/?$! ||
 	     $connect =~ m!^smb://.*/([^/\@]+)/([^/\@]+)/?$! ||
 	     $connect =~ m!^smb://.*\@([^/\@]+)/([^/\@]+)/?$!) {
-	$connection = N("SMB/Windows server \"%s\", share \"%s\"", $1, $2);
+        my ($server, $share) = ($1, $2);
+	$connection = N("SMB/Windows server \"%s\", share \"%s\"", $server, $share);
     } elsif ($connect =~ m!^ncp://([^/\@]+)/([^/\@]+)/?$! ||
 	     $connect =~ m!^ncp://.*/([^/\@]+)/([^/\@]+)/?$! ||
 	     $connect =~ m!^ncp://.*\@([^/\@]+)/([^/\@]+)/?$!) {
-	$connection = N("Novell server \"%s\", printer \"%s\"", $1, $2);
+        my ($server, $share) = ($1, $2);
+	$connection = N("Novell server \"%s\", printer \"%s\"", $server, $share);
     } elsif ($connect =~ m!^postpipe:(.+)$!) {
-	$connection = N("Uses command %s", $1);
+        my $command = $1;
+	$connection = N("Uses command %s", $command);
     } else {
 	$connection = N("URI: %s", $connect);
     }
@@ -430,22 +488,36 @@ sub connectionstr {
 
 sub read_printer_db {
 
-    my ($printer, $spooler) = @_;
+    my ($printer, $spooler, $newppd) = @_;
+
+    # If a $newppd is supplied, we return the key of the DB entry which
+    # is for this file. This way we can pre-select a freshly added PPD in
+    # the model/driver list.
 
-    local *DBPATH; #- don't have to do close ... and don't modify globals at least
-    # Generate the Foomatic printer/driver overview, read it from the
-    # appropriate file when it is already generated
-    open DBPATH, ($::testing ? $::prefix : "chroot $::prefix/ ") . #-#
-	"foomatic-configure -O -q |" or
+    # No local queues available in daemon-less CUPS mode
+    return 1 if $spooler eq "rcups";
+
+    my $DBPATH; #- do not have to do close ... and do not modify globals at least
+    # Generate the Foomatic printer/driver overview
+    open($DBPATH, ($::testing ? $::prefix : "chroot $::prefix/ ") . #-#
+	"foomatic-configure -O -q |") or
 	die "Could not run foomatic-configure";
 
+    %linkedppds = ();
     my $entry = {};
+    @{$entry->{drivers}} = (); 
     my $inentry = 0;
     my $indrivers = 0;
+    my $inppds = 0;
+    my $inppd = 0;
     my $inautodetect = 0;
     my $autodetecttype = "";
+    my $ppds = {};
+    my $ppddriver = "";
+    my $ppdfile = "";
+    my $ppdentry = "";
     local $_;
-    while (<DBPATH>) {
+    while (<$DBPATH>) {
 	chomp;
 	if ($inentry) {
 	    # We are inside a printer entry
@@ -457,6 +529,31 @@ sub read_printer_db {
 		} elsif (m!^\s*<driver>(.+)</driver>\s*$!) {
 		    push @{$entry->{drivers}}, $1;
 		}
+	    } elsif ($inppds) {
+		# We are inside the ppds block of a printers entry
+		if ($inppd) {
+		    # We are inside a PPD entry in the ppds block
+		    if (m!^\s*</ppd>\s*$!) {
+			# End of ppds block
+			$inppd = 0;
+			if ($ppddriver && $ppdfile) {
+			    $ppds->{$ppddriver} = $ppdfile;
+			}
+			$ppddriver = "";
+			$ppdfile = "";
+		    } elsif (m!^\s*<driver>(.+)</driver>\s*$!) {
+			$ppddriver = $1;
+		    } elsif (m!^\s*<ppdfile>(.+)</ppdfile>\s*$!) {
+			$ppdfile = $1;
+		    }
+		} else {
+		    if (m!^\s*</ppds>\s*$!) {
+			# End of ppds block
+			$inppds = 0;
+		    } elsif (m!^\s*<ppd>\s*$!) {
+			$inppd = 1;
+		    }
+		}
 	    } elsif ($inautodetect) {
 		# We are inside the autodetect block of a printers entry
 		# All entries inside this block will be ignored
@@ -513,13 +610,20 @@ sub read_printer_db {
 				$driverstr = "GhostScript + $driver";
 			    }
 			    if ($driver eq $entry->{defaultdriver}) {
-				$driverstr .= " (recommended)";
+				$driverstr .= " $precstr";
 			    }
 			    $entry->{ENTRY} = "$entry->{make}|$entry->{model}|$driverstr";
 			    $entry->{ENTRY} =~ s/^CITOH/C.ITOH/i;
 			    $entry->{ENTRY} =~ 
 				s/^KYOCERA[\s\-]*MITA/KYOCERA/i;
 			    $entry->{driver} = $driver;
+			    if (defined($ppds->{$driver})) {
+				$entry->{ppd} = $ppds->{$driver};
+				$ppds->{$driver} =~ m!([^/]+)$!;
+				push(@{$linkedppds{$1}}, $entry->{ENTRY});
+			    } else {
+				undef $entry->{ppd};
+			    }
 			    # Duplicate contents of $entry because it is multiply entered to the database
 			    map { $thedb{$entry->{ENTRY}}{$_} = $entry->{$_} } keys %$entry;
 			}
@@ -532,11 +636,21 @@ sub read_printer_db {
 			$entry->{ENTRY} =~ 
 			    s/^KYOCERA[\s\-]*MITA/KYOCERA/i;
 			if ($entry->{defaultdriver}) {
-			    $entry->{driver} = $entry->{defaultdriver};
+			    my $driver = $entry->{defaultdriver};
+			    $entry->{driver} = $driver;
+			    if (defined($ppds->{$driver})) {
+				$entry->{ppd} = $ppds->{$driver};
+				$ppds->{$driver} =~ m!([^/]+)$!;
+				push(@{$linkedppds{$1}}, $entry->{ENTRY});
+			    } else {
+				undef $entry->{ppd};
+			    }
 			    map { $thedb{$entry->{ENTRY}}{$_} = $entry->{$_} } keys %$entry;
 			}
 		    }
 		    $entry = {};
+		    @{$entry->{drivers}} = (); 
+		    $ppds = {};
 		} elsif (m!^\s*<id>\s*([^\s<>]+)\s*</id>\s*$!) {
 		    # Foomatic printer ID
 		    $entry->{printer} = $1;
@@ -552,7 +666,9 @@ sub read_printer_db {
 		} elsif (m!^\s*<drivers>\s*$!) {
 		    # Drivers block
 		    $indrivers = 1;
-		    @{$entry->{drivers}} = (); 
+		} elsif (m!^\s*<ppds>\s*$!) {
+		    # PPDs block
+		    $inppds = 1;
 		} elsif (m!^\s*<autodetect>\s*$!) {
 		    # Autodetect block
 		    $inautodetect = 1;
@@ -565,7 +681,7 @@ sub read_printer_db {
 	    }
 	}
     }
-    close DBPATH;
+    close $DBPATH;
 
     # Add raw queue
     $entry->{ENTRY} = N("Raw printer (No driver)");
@@ -576,7 +692,7 @@ sub read_printer_db {
 
     #- Load CUPS driver database if CUPS is used as spooler
     if ($spooler && $spooler eq "cups") {
-        poll_ppd_base($printer);
+        $ppdentry = poll_ppd_base($printer, $newppd);
     }
 
     #my @entries_db_short     = sort keys %printer::thedb;
@@ -585,24 +701,25 @@ sub read_printer_db {
     #@entry_db_description = keys %descr_to_db;
     #db_to_descr          = reverse %descr_to_db;
 
+    return $ppdentry if $newppd;
+
 }
 
 sub read_foomatic_options ($) {
     my ($printer) = @_;
     # Generate the option data for the chosen printer/driver combo
     my $COMBODATA;
-    local *F;
-    open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
+    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
 	"foomatic-configure -P -q -p $printer->{currentqueue}{printer}" .
 	" -d $printer->{currentqueue}{driver}" . 
 	($printer->{OLD_QUEUE} ?
 	 " -s $printer->{SPOOLER} -n $printer->{OLD_QUEUE}" : "") .
 	 ($printer->{SPECIAL_OPTIONS} ?
 	  " $printer->{SPECIAL_OPTIONS}" : "") 
-	 . " |" or
+	 . " |") or
 	 die "Could not run foomatic-configure";
-    eval join('', (<F>)); 
-    close F;
+    eval join('', (<$F>)); 
+    close $F;
     # Return the arguments field
     return $COMBODATA->{args};
 }
@@ -611,47 +728,77 @@ sub read_ppd_options ($) {
     my ($printer) = @_;
     # Generate the option data for a given PPD file
     my $COMBODATA;
-    local *F;
-    open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
+    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
 	"foomatic-configure -P -q" .
-	" --ppd /usr/share/cups/model/$printer->{currentqueue}{ppd}" .
+	 if_($printer->{currentqueue}{ppd} &&
+	     ($printer->{currentqueue}{ppd} ne '1'),
+	     " --ppd \'" . ($printer->{currentqueue}{ppd} !~ m!^/! ?
+			    "/usr/share/cups/model/" : "") .
+			   $printer->{currentqueue}{ppd} . "\'") .
 	($printer->{OLD_QUEUE} ?
 	 " -s $printer->{SPOOLER} -n $printer->{OLD_QUEUE}" : "") .
 	 ($printer->{SPECIAL_OPTIONS} ?
 	  " $printer->{SPECIAL_OPTIONS}" : "") 
-		    . " |" or
+		    . " |") or
 	    die "Could not run foomatic-configure";
-    eval join('', (<F>)); 
-    close F;
+    eval join('', (<$F>));
+    close $F;
     # Return the arguments field
     return $COMBODATA->{args};
 }
 
-my %sysconfig = getVarsFromSh("$::prefix/etc/sysconfig/printing");
-
 sub set_cups_special_options {
-    my ($queue) = $_[0];
+    my ($printer, $queue) = @_;
     # Set some special CUPS options
-    my @lpoptions = chomp_(cat_("$::prefix/etc/cups/lpoptions"));
-    # If nothing is already configured, set text file borders of half an inch
-    # and decrease the font size a little bit, so nothing of the text gets
-    # cut off by unprintable borders.
-    if (!any { /$queue.*\s(page-(top|bottom|left|right)|lpi|cpi)=/ } @lpoptions) {
-	run_program::rooted($::prefix, "lpoptions",
-			    "-p", $queue,
-			    "-o", "page-top=36", "-o", "page-bottom=36",
-			    "-o", "page-left=36", "-o page-right=36",
-			    "-o", "cpi=12", "-o", "lpi=7", "-o", "wrap");
+    my @lpoptions = cat_("$::prefix/etc/cups/lpoptions");
+    # If nothing is already configured, set text file borders of half
+    # an inch so nothing of the text gets cut off by unprintable
+    # borders. Do this only when the driver is not Gutenprint or HPIJS, as 
+    # both drivers decent border settings are already done and with
+    # Gutenprint this will even break PostScript printing
+    if ((($queue eq $printer->{currentqueue}{$queue}) &&
+	 (($printer->{currentqueue}{driver} =~
+	   /(guten.*print|hpijs|hplip)/i) ||
+	  ($printer->{currentqueue}{ppd} =~
+	   /(guten.*print|hpijs|hplip)/i))) ||
+	((defined($printer->{configured}{$queue})) &&
+	 (($printer->{configured}{$queue}{queuedata}{driver} =~
+	   /(guten.*print|hpijs|hplip)/i) ||
+	  ($printer->{configured}{$queue}{queuedata}{ppd} =~
+	   /(guten.*print|hpijs|hplip)/i))) ||
+	(($printer->{SPOOLER} eq "cups") &&
+	 (-r "$::prefix/etc/cups/ppd/$queue.ppd") &&
+	 (`egrep -ic '(gutenprint|hpijs|hplip)' $::prefix/etc/cups/ppd/$queue.ppd` > 2))) {
+	# Remove page margin settings
+	foreach (@lpoptions) {
+	    s/\s*page-(top|bottom|left|right)=\S+//g if /$queue/;
+	}
+	output("$::prefix/etc/cups/lpoptions", @lpoptions);
+    } else {
+	if (!any { /$queue.*\spage-(top|bottom|left|right)=/ } @lpoptions) {
+	    run_program::rooted($::prefix, "lpoptions",
+				"-p", $queue,
+				"-o", "page-top=36", "-o", "page-bottom=36",
+				"-o", "page-left=36", "-o page-right=36");
+	}
     }
-    # Let images fill the whole page by default
+    # Let images fill the whole page by default and let text be word-wrapped
+    # and printed in a slightly smaller font
     if (!any { /$queue.*\s(scaling|natural-scaling|ppi)=/ } @lpoptions) {
 	run_program::rooted($::prefix, "lpoptions",
 			    "-p", $queue,
 			    "-o", "scaling=100");
     }
+    if (!any { /$queue.*\s(cpi|lpi)=/ } @lpoptions) {
+	run_program::rooted($::prefix, "lpoptions",
+			    "-p", $queue,
+			    "-o", "cpi=12", "-o", "lpi=7", "-o", "wrap");
+    }
     return 1;
 }
 
+my %sysconfig = getVarsFromSh("$::prefix/etc/sysconfig/printing");
+
 sub set_cups_autoconf {
     my ($autoconf) = @_;
     $sysconfig{CUPS_CONFIG} = $autoconf ? "automatic" : "manual";
@@ -672,10 +819,54 @@ sub set_usermode {
 
 sub get_usermode() { $sysconfig{USER_MODE} eq 'expert' ? 1 : 0 }
 
+sub set_auto_admin {
+    my ($printer) = @_;
+    $sysconfig{ENABLE_QUEUES_ON_PRINTER_CONNECTED} = 
+	$printer->{enablequeuesonnewprinter} ? "yes" : "no";
+    $sysconfig{AUTO_SETUP_QUEUES_ON_PRINTER_CONNECTED} = 
+	$printer->{autoqueuesetuponnewprinter} ? "yes" : "no";
+    $sysconfig{ENABLE_QUEUES_ON_SPOOLER_START} = 
+	$printer->{enablequeuesonspoolerstart} ? "yes" : "no";
+    $sysconfig{AUTO_SETUP_QUEUES_ON_PRINTERDRAKE_START} = 
+	$printer->{autoqueuesetuponstart} ? "yes" : "no";
+    $sysconfig{AUTO_SETUP_QUEUES_MODE} = 
+	$printer->{autoqueuesetupgui} ? "waitforgui" : "nogui";
+    setVarsInSh("$::prefix/etc/sysconfig/printing", \%sysconfig);
+    return 1;
+}
+
+sub get_auto_admin {
+    my ($printer) = @_;
+    $printer->{enablequeuesonnewprinter} = 
+	(!defined($sysconfig{ENABLE_QUEUES_ON_PRINTER_CONNECTED}) ||
+	 ($sysconfig{ENABLE_QUEUES_ON_PRINTER_CONNECTED} =~ /no/i) ?
+	 0 : 1);
+    $printer->{autoqueuesetuponnewprinter} = 
+	(!defined($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTER_CONNECTED}) ||
+	 ($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTER_CONNECTED} =~ /yes/i) ?
+	 1 : 0);
+    $printer->{enablequeuesonspoolerstart} = 
+	(!defined($sysconfig{ENABLE_QUEUES_ON_SPOOLER_START}) ||
+	 ($sysconfig{ENABLE_QUEUES_ON_SPOOLER_START} =~ /no/i) ?
+	 0 : 1);
+    $printer->{autoqueuesetuponstart} = 
+	(!defined($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTERDRAKE_START}) ||
+	 ($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTERDRAKE_START} =~ /yes/i) ?
+	 1 : 0);
+    $printer->{autoqueuesetupgui} = 
+	(!defined($sysconfig{AUTO_SETUP_QUEUES_MODE}) ||
+	 ($sysconfig{AUTO_SETUP_QUEUES_MODE} =~ /waitforgui/i) ?
+	 1 : 0);
+}
+
 sub set_jap_textmode {
     my $textmode = ($_[0] ? 'cjk' : '');
+    # Do not write mime.convs if the file does not exist, as then
+    # CUPS is not installed and the created mime.convs will be broken.
+    # When installing CUPS later it will not work.
+    return 1 if (! -r "$::prefix/etc/cups/mime.convs");
     substInFile {
-        s!^(\s*text/plain\s+\S+\s+\d+\s+)\S+(\s*$)!$1${textmode}texttops$2!        
+        s!^(\s*text/plain\s+\S+\s+\d+\s+)\S+(\s*$)!$1${textmode}texttops$2!;
     } "$::prefix/etc/cups/mime.convs";
     return 1;
 }
@@ -691,15 +882,46 @@ sub get_jap_textmode() {
 # Handling of /etc/cups/cupsd.conf
 
 sub read_cupsd_conf() {
-    cat_("$::prefix/etc/cups/cupsd.conf");
+    # If /etc/cups/cupsd.conf does not exist a default cupsd.conf will be 
+    # put out to avoid writing of a broken cupsd.conf file when we write 
+    # it back later.
+    my @cupsd_conf = cat_("$::prefix/etc/cups/cupsd.conf");
+    if (!@cupsd_conf) {
+	@cupsd_conf = map { /\n$/s or "$_\n" } split('\n',
+'LogLevel info
+TempDir /var/spool/cups/tmp
+Port 631
+Browsing On
+BrowseAddress @LOCAL
+BrowseDeny All
+BrowseAllow 127.0.0.1
+BrowseAllow @LOCAL
+BrowseOrder deny,allow
+<Location />
+Order Deny,Allow
+Deny From All
+Allow From 127.0.0.1
+Allow From @LOCAL
+</Location>
+<Location /admin>
+AuthType Basic
+AuthClass System
+Order Deny,Allow
+Deny From All
+Allow From 127.0.0.1
+</Location>
+');
+    }
+    return @cupsd_conf;
 }
+
 sub write_cupsd_conf {
     my (@cupsd_conf) = @_;
-
+    # Do not write cupsd.conf if the file does not exist, as then
+    # CUPS is not installed and the created cupsd.conf will be broken.
+    # When installing CUPS later it will not start.
+    return 1 if (! -r "$::prefix/etc/cups/cupsd.conf");
     output("$::prefix/etc/cups/cupsd.conf", @cupsd_conf);
-
-    #- restart cups after updating configuration.
-    printer::services::restart("cups");
 }
 
 sub read_location {
@@ -718,7 +940,7 @@ sub read_location {
 	my $location_end = -1;
 	# Go through all the lines, bail out when start and end line found
 	for (my $i = 0; 
-	     $i <= $#{$cupsd_conf_ptr} and $location_end == -1;
+	     $i <= $#{$cupsd_conf_ptr} && $location_end == -1;
 	     $i++) {
 	    if ($cupsd_conf_ptr->[$i] =~ m!^\s*<\s*Location\s+$path\s*>!) {
 		# Start line of block
@@ -739,7 +961,7 @@ sub read_location {
 	# "undef"
 	@result = undef;
     }
-    return (@result);
+    return @result;
 }
 
 sub rip_location {
@@ -761,7 +983,7 @@ sub rip_location {
     if (any { m!^\s*<Location\s+$path\s*>! } @$cupsd_conf_ptr) {
 	# Go through all the lines, bail out when start and end line found
 	for (my $i = 0; 
-	     $i <= $#{$cupsd_conf_ptr} and $location_end == -1;
+	     $i <= $#{$cupsd_conf_ptr} && $location_end == -1;
 	     $i++) {
 	    if ($cupsd_conf_ptr->[$i] =~ m!^\s*<\s*Location\s+$path\s*>!) {
 		# Start line of block
@@ -784,7 +1006,7 @@ sub rip_location {
 	@location = ("<Location $path>\n", "</Location>\n");
     }
 
-    return ($location_start, @location);
+    return $location_start, @location;
 }
 
 sub insert_location {
@@ -912,7 +1134,7 @@ sub networkaddress {
     my ($address) = @_;
 
     if ($address =~ /\.255$/) {
-	while ($address =~ s/\.255$//) {};
+	while ($address =~ s/\.255$//) {}
 	$address .= ".*";
     }
  
@@ -1068,7 +1290,7 @@ sub clientnetworks {
 			     $haveallowedhostwithoutbrowseallow ||
 			     $havebrowseallowwithoutallowedhost);
 
-    return ($configunsupported, @sharehosts);
+    return $configunsupported, @sharehosts;
 }
 
 sub makesharehostlist {
@@ -1199,7 +1421,7 @@ sub read_cups_config {
     my @localips = printer::detect::getIPsOfLocalMachine();
     @{$printer->{cupsconfig}{root}{AllowFrom}} =
 	grep {
-	    !member($_, @localips)
+	    !member($_, @localips);
 	} @{$printer->{cupsconfig}{root}{AllowFrom}};
 
     # Keyword "Deny from" 
@@ -1297,7 +1519,7 @@ sub write_cups_config {
 	     "Allow From " .
 	     join("\nAllow From ", 
 		  grep {
-		      !member($_, @localips)
+		      !member($_, @localips);
 		  } @{$printer->{cupsconfig}{clientnetworks}}) .
 	     "\n" : "") .
 	    "</Location>\n";
@@ -1314,7 +1536,7 @@ sub write_cups_config {
 						@{$printer->{cupsconfig}{clientnetworks}}));
 	} else {
 	    handle_configs::comment_directive($printer->{cupsconfig}{cupsd_conf},
-					      'BrowseAddress')
+					      'BrowseAddress');
 	}
 	# Set "BrowseAllow" lines
 	if ($#{$printer->{cupsconfig}{clientnetworks}} >= 0) {
@@ -1357,6 +1579,35 @@ sub clean_cups_config {
     delete $printer->{cupsconfig}{rootlocation};
 }
 
+#----------------------------------------------------------------------
+# Handling of /etc/cups/client.conf
+
+sub read_client_conf() {
+    return (0, undef) if (! -r "$::prefix/etc/cups/client.conf");
+    my @client_conf = cat_("$::prefix/etc/cups/client.conf");
+    my @servers = handle_configs::read_directives(\@client_conf, 
+						  "ServerName");
+    return (@servers > 0, 
+	    $servers[0]); # If there is more than one entry in client.conf,
+                          # the first one counts.
+}
+
+sub write_client_conf {
+    my ($daemonless_cups, $remote_cups_server) = @_;
+    # Create the directory for client.conf if needed
+    (-d "$::prefix/etc/cups/") || mkdir("$::prefix/etc/cups/") || return 1;
+    my (@client_conf) = cat_("$::prefix/etc/cups/client.conf");
+    if ($daemonless_cups) {
+	handle_configs::set_directive(\@client_conf, 
+				      "ServerName $remote_cups_server");
+    } else {
+	handle_configs::comment_directive(\@client_conf, "ServerName");
+    }
+    output("$::prefix/etc/cups/client.conf", @client_conf);
+}
+
+
+
 #----------------------------------------------------------------------
 sub read_printers_conf {
     my ($printer) = @_;
@@ -1369,9 +1620,9 @@ sub read_printers_conf {
     #-    Location  > Location Text
     #-    State     > Idle|Stopped
     #-    Accepting > Yes|No
-    local *PRINTERS; open PRINTERS, "$::prefix/etc/cups/printers.conf" or return;
+    open(my $PRINTERS, "$::prefix/etc/cups/printers.conf") or return;
     local $_;
-    while (<PRINTERS>) {
+    while (<$PRINTERS>) {
 	chomp;
 	/^\s*#/ and next;
 	if (/^\s*<(?:DefaultPrinter|Printer)\s+([^>]*)>/) { $current = { mode => 'cups', QUEUE => $1, } }
@@ -1379,7 +1630,7 @@ sub read_printers_conf {
 				   add2hash($printer->{configured}{$current->{QUEUE}} ||= {}, $current); $current = undef }
 	elsif (/\s*(\S*)\s+(.*)/) { $current->{$1} = $2 }
     }
-    close PRINTERS;
+    close $PRINTERS;
 
     #- assume this printing system.
     $printer->{SPOOLER} ||= 'cups';
@@ -1388,12 +1639,12 @@ sub read_printers_conf {
 sub get_direct_uri() {
     #- get the local printer to access via a Device URI.
     my @direct_uri;
-    local *F; open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . "/usr/sbin/lpinfo -v |";
+    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") . "/usr/sbin/lpinfo -v |");
     local $_;
-    while (<F>) {
+    while (<$F>) {
 	/^(direct|usb|serial)\s+(\S*)/ and push @direct_uri, $2;
     }
-    close F;
+    close $F;
     @direct_uri;
 }
 
@@ -1413,7 +1664,7 @@ sub installppd {
     mkdir_p("$::prefix/usr/share/cups/model/printerdrake");
     # "cp_f()" is broken, it hangs infinitely
     # cp_f($ppdfile, "$::prefix/usr/share/cups/model/printerdrake");
-    run_program::rooted($::prefix, "cp", "-f", "$ppdfile",
+    run_program::rooted($::prefix, "cp", "-f", $ppdfile,
 			"$::prefix/usr/share/cups/model/printerdrake");
     $ppdfile =~ s!^(.*)(/[^/]+)$!/usr/share/cups/model/printerdrake$2!;
     chmod 0644, "$::prefix$ppdfile";
@@ -1421,10 +1672,9 @@ sub installppd {
     printer::services::restart("cups") if $printer->{SPOOLER} eq "cups";
     # Re-read printer database
     %thedb = ();
-    read_printer_db($printer, $printer->{SPOOLER});
-    # Return description string of the PPD file
-    my $ppdentry = get_descr_from_ppdfile($printer, $ppdfile);
-    return $ppdentry;
+    # Supplying $ppdfile returns us the key for this PPD file in the
+    # so that we can point to it in the printer/driver list
+    return read_printer_db($printer, $printer->{SPOOLER}, $ppdfile);
 }
 
 sub clean_manufacturer_name {
@@ -1462,11 +1712,11 @@ sub ppd_entry_str {
 	    $descr =~ s/Foomatic \+ Postscript/PostScript/;
 	} elsif ($descr =~ /Foomatic/i) {
 	    $descr =~ s/Foomatic/GhostScript/i;
-	} elsif ($descr =~ /CUPS\+GIMP-print/i) {
-	    $descr =~ s/CUPS\+GIMP-print/CUPS + GIMP-Print/i;
+	} elsif ($descr =~ /CUPS\+Gimp-Print/i) {
+	    $descr =~ s/CUPS\+Gimp-Print/CUPS + Gimp-Print/i;
 	} elsif ($descr =~ /Series CUPS/i) {
 	    $descr =~ s/Series CUPS/Series, CUPS/i;
-	} elsif ($descr !~ /(PostScript|GhostScript|CUPS|Foomatic)/i) {
+	} elsif ($descr !~ /(PostScript|GhostScript|CUPS|Foomatic|PCL|PXL)/i) {
 	    $descr .= ", PostScript";
 	}
 	# Split model and driver
@@ -1476,20 +1726,26 @@ sub ppd_entry_str {
 	     /^\s*(Generic\s*PostScript\s*Printer)\s*,?\s*(.*)$/i ||
 	    $descr =~
 	     /^\s*(PostScript\s*Printer)\s*,?\s*(.*)$/i ||
-	    $descr =~ /^([^,]+[^,\s])\s*,?\s*(Foomatic.*)$/i ||
-	    $descr =~ /^([^,]+[^,\s])\s*,?\s*(GhostScript.*)$/i ||
-	    $descr =~ /^([^,]+[^,\s])\s*,?\s*(CUPS.*)$/i ||
-	    $descr =~ /^([^,]+[^,\s])\s*,?\s+(PS.*)$/i ||
+	    $descr =~ /^([^,]+?)\s*,?\s*(Foomatic.*)$/i ||
+	    $descr =~ /^([^,]+?)\s*,?\s*(GhostScript.*)$/i ||
+	    $descr =~ /^([^,]+?)\s*,?\s*(CUPS.*)$/i ||
+	    $descr =~ /^([^,]+?)\s*,\s+(PS.*)$/i ||
+	    $descr =~ /^([^,]+?)\s*,\s+(PXL.*)$/i ||
+	    $descr =~ /^([^,]+?)\s*,\s+(PCL.*)$/i ||
 	    $descr =~
-	     /^([^,]+[^,\s])\s*,?\s*(\(v?\.?\s*\d\d\d\d\.\d\d\d\).*)$/i ||
-	    $descr =~ /^([^,]+[^,\s])\s*,?\s*(v\d+\.\d+.*)$/i ||
-	    $descr =~ /^([^,]+[^,\s])\s*,?\s*(PostScript.*)$/i ||
-	    $descr =~ /^([^,]+)\s*,?\s*(.+)$/) {
+	     /^([^,]+?)\s*,?\s*(\(v?\.?\s*\d\d\d\d\.\d\d\d\).*)$/i ||
+	    $descr =~ /^([^,]+?)\s*,?\s*(v?\.?\s*\d+\.\d+.*)$/i ||
+	    $descr =~ /^([^,]+?)\s*,?\s*(PostScript.*)$/i ||
+	    $descr =~ /^([^,]+?)\s*,\s*(.+?)$/) {
 	    $model = $1;
 	    $driver = $2;
 	    $model =~ s/[\-\s,]+$//;
 	    $driver =~ s/\b(PS|PostScript\b)/PostScript/gi;
 	    $driver =~ s/(PostScript)(.*)(PostScript)/$1$2/i;
+	    $driver =~ s/\b(PXL|PCL[\s\-]*(6|XL)\b)/PCL-XL/gi;
+	    $driver =~ s/(PCL-XL)(.*)(PCL-XL)/$1$2/i;
+	    $driver =~ s/\b(PCL[\s\-]*(|4|5|5c|5e)\b)/PCL/gi;
+	    $driver =~ s/(PCL)(.*)(PCL)/$1$2/i;
 	    $driver =~ 
 	      s/^\s*(\(?v?\.?\s*\d\d\d\d\.\d\d\d\)?|v\d+\.\d+)([,\s]*)(.*?)\s*$/$3$2$1/i;
 	    $driver =~ s/,\s*\(/ (/g;
@@ -1503,7 +1759,13 @@ sub ppd_entry_str {
 	} else {
 	    # Some PPDs do not have the ", <driver>" part.
 	    $model = $descr;
-	    $driver = "PostScript";
+	    if ($model =~ /\b(PXL|PCL[\s\-]*(6|XL))\b/i) {
+		$driver = "PCL-XL";
+	    } elsif ($model =~ /\b(PCL[\s\-]*(|4|5|5c|5e)\b)/i) {
+		$driver = "PCL";
+	    } else {
+		$driver = "PostScript";
+	    }
 	}
     }
     # Remove manufacturer's name from the beginning of the model
@@ -1519,7 +1781,7 @@ sub ppd_entry_str {
 	$model =~ s/BJC\s+/BJC-/;
     }
     # New MF devices from Epson have mis-spelled name in PPD files for
-    # native CUPS drivers of GIMP-Print
+    # native CUPS drivers of Gimp-Print
     if ($mf eq "EPSON") {
 	$model =~ s/Stylus CX\-/Stylus CX/;
     }
@@ -1529,9 +1791,11 @@ sub ppd_entry_str {
 	$model =~ s/Oki\s+//i;
     }
     # Try again to remove manufacturer's name from the beginning of the 
-    # model name, this with the cleaned manufacturer name
+    # model name, this time with the cleaned manufacturer name
     $model =~ s/^$mf[\s\-]+//i 
 	if $mf && $mf !~ m![\\/\(\)\[\]\|\.\$\@\%\*\?]!;
+    # Translate "(recommended)" in the driver string
+    $driver =~ s/\(recommended\)/$precstr/gi;
     # Put out the resulting description string
     uc($mf) . '|' . $model . '|' . $driver .
       ($lang && " (" . lc(substr($lang, 0, 2)) . ")");
@@ -1557,9 +1821,9 @@ sub get_descr_from_ppdfile {
 	local $_;
 	foreach (catMaybeCompressed("$::prefix$ppdfile")) {
 	    # "OTHERS|Generic PostScript printer|PostScript (en)";
-	    /^\*([^\s:]*)\s*:\s*\"([^\"]*)\"/ and
+	    /^\*([^\s:]*)\s*:\s*"([^"]*)"/ and
 		do { $ppd{$1} = $2; next };
-	    /^\*([^\s:]*)\s*:\s*([^\s\"]*)/   and
+	    /^\*([^\s:]*)\s*:\s*([^\s"]*)/   and
 		do { $ppd{$1} = $2; next };
 	}
     };
@@ -1579,34 +1843,40 @@ sub ppd_devid_data {
     $ppd = "$::prefix/usr/share/cups/model/$ppd";
     my @content;
     if ($ppd =~ /\.gz$/i) {
-	@content = cat_("$::prefix/bin/zcat $ppd |") or return ("", "");
+	@content = cat_("$::prefix/bin/zcat $ppd |") or return "", "";
     } else {
-	@content = cat_($ppd) or return ("", "");
+	@content = cat_($ppd) or return "", "";
     }
     my ($devidmake, $devidmodel);
-    /^\*Manufacturer:\s*\"(.*)\"\s*$/ and $devidmake = $1
+    /^\*Manufacturer:\s*"(.*)"\s*$/ and $devidmake = $1
 	foreach @content;
-    /^\*Product:\s*\"\(?(.*?)\)?\"\s*$/ and $devidmodel = $1 
+    /^\*Product:\s*"\(?(.*?)\)?"\s*$/ and $devidmodel = $1 
 	foreach @content;
-    return ($devidmake, $devidmodel);
+    return $devidmake, $devidmodel;
 }
 
-sub poll_ppd_base() {
-    my ($printer) = @_;
+sub poll_ppd_base {
+    my ($printer, $ppdfile) = @_;
+
+    # If a $ppdfile is supplied, we return the key of the DB entry which
+    # is for this file. This way we can pre-select a freshly added PPD in
+    # the model/driver list.
+
     #- Before trying to poll the ppd database available to cups, we have 
     #- to make sure the file /etc/cups/ppds.dat is no more modified.
     #- If cups continue to modify it (because it reads the ppd files 
     #- available), the poll_ppd_base program simply cores :-)
-    # else cups will not be happy! and ifup lo don't run ?
+    # else cups will not be happy! and ifup lo do not run ?
     run_program::rooted($::prefix, 'ifconfig', 'lo', '127.0.0.1');
     printer::services::start_not_running_service("cups");
     my $driversthere = scalar(keys %thedb);
+    my $ppdentry = "";
     foreach (1..60) {
-	local *PPDS; open PPDS, ($::testing ? $::prefix :
-				 "chroot $::prefix/ ") . 
-				 "/usr/bin/poll_ppd_base -a |";
+	open(my $PPDS, ($::testing ? $::prefix :
+				 "chroot $::prefix/ ") .
+				 "/usr/bin/poll_ppd_base -a |");
 	local $_;
-	while (<PPDS>) {
+	while (<$PPDS>) {
 	    chomp;
 	    my ($ppd, $mf, $descr, $lang) = split /\|/;
 	    if ($ppd eq "raw") { next }
@@ -1619,20 +1889,20 @@ sub poll_ppd_base() {
 		$driver =~ s/\s*\([a-z]{2}(|_[A-Z]{2})\)\s*$//;
 		# Recommended Foomatic PPD? Extract "(recommended)"
 		my $isrecommended = 
-		    $driver =~ s/\s+\(recommended\)\s*$//i;
+		    $driver =~ s/\s+$sprecstr\s*$//i;
 		# Remove trailing white space
 		$driver =~ s/\s+$//;
 		# For Foomatic: Driver with "GhostScript + "
 		my $fullfoomaticdriver = $driver;
 		# Foomatic PPD? Extract driver name
 		my $isfoomatic = 
-		    $driver =~ s/^\s*(GhostScript|Foomatic)\s*\+\s*//i;
+		    $driver =~ s!^\s*(GhostScript|Foomatic)(\s*\+\s*|/)!!i;
 		# Foomatic PostScript driver?
 		$isfoomatic ||= $descr =~ /Foomatic/i;
 		# Native CUPS?
 		my $isnativecups = $driver =~ /CUPS/i;
 		# Native PostScript
-		my $isnativeps = (!$isfoomatic and !$isnativecups);
+		my $isnativeps = !$isfoomatic && !$isnativecups;
 		# Key without language tag (key as it was produced for the
 		# entries from the Foomatic XML database)
 		my $keynolang = $key;
@@ -1645,10 +1915,75 @@ sub poll_ppd_base() {
 		    # Foomatic
 		    $key = $keynolang;
 		}
-		if (!$printer->{expert}) {
+	        my ($devidmake, $devidmodel, $deviddesc, $devidcmdset);
+		# Replace an existing printer entry if it has linked
+		# to the current PPD file.
+		my ($filename, $ppdkey);
+		$ppd =~ m!([^/]+\.ppd)(\.gz|\.bz2|)$!;
+		if (($filename = $1) && 
+		    ($#{$linkedppds{$filename}} >= 0)) {
+		    foreach $ppdkey (@{$linkedppds{$filename}}) {
+			next if !defined($thedb{$ppdkey});
+			# Save the autodetection data
+			$devidmake = $thedb{$ppdkey}{devidmake};
+			$devidmodel = $thedb{$ppdkey}{devidmodel};
+			$deviddesc = $thedb{$ppdkey}{deviddesc};
+			$devidcmdset = $thedb{$ppdkey}{devidcmdset};
+			# We must preserve make and model if we have one
+			# PPD for multiple printers
+			my $oldmake = $thedb{$ppdkey}{make};
+			my $oldmodel = $thedb{$ppdkey}{model};
+			# Remove the old entry
+			delete $thedb{$ppdkey};
+			my $newkey = $key;
+			if (!$printer->{expert}) {
+			    # Remove driver part in recommended mode
+			    $newkey =~ s/^([^\|]+\|[^\|]+)\|.*$/$1/;
+			} else {
+			    # If the Foomatic entry is "recommended" let
+			    # the new PPD entry be "recommended"
+			    $newkey =~ s/\s*$sprecstr//g;
+			    $newkey .= " $precstr" 
+				if $ppdkey =~ m!$precstr!;
+			    # Remove duplicate "recommended" tags and have 
+			    # the "recommended" tag at the end
+			    $newkey =~
+				s/(\s*$sprecstr)(.*?)(\s*$sprecstr)/$2$3/;
+			    $newkey =~ s/(\s*$sprecstr)(.+)$/$2$1/;
+			}
+			# If the PPD serves for multiple printers, conserve
+			# the make and model of the original entry
+			if (($#{$linkedppds{$filename}} > 0)) {
+			    $newkey =~
+				s/^([^\|]+)(\|[^\|]+)(\|.*|)$/$oldmake$2$3/;
+			    $newkey =~
+				s/^([^\|]+\|)([^\|]+)(\|.*|)$/$1$oldmodel$3/;
+			}
+			# Create the new entry
+			$thedb{$newkey}{ppd} = $ppd;
+			$thedb{$newkey}{make} = $mf;
+			$thedb{$newkey}{model} = $model;
+			$thedb{$newkey}{driver} = $driver;
+			# Recover saved autodetection data
+			$thedb{$newkey}{devidmake} = $devidmake
+			    if $devidmake;
+			$thedb{$newkey}{devidmodel} = $devidmodel
+			    if $devidmodel;
+			$thedb{$newkey}{deviddesc} = $deviddesc
+			    if $deviddesc;
+			$thedb{$newkey}{devidcmdset} = $devidcmdset
+			    if $devidcmdset;
+			# Rememeber which entry is the freshly added 
+			# PPD file
+			$ppdentry = $newkey if
+			    $ppdfile eq "/usr/share/cups/model/$ppd";
+		    }
+		    next;
+		} elsif (!$printer->{expert}) {
 		    # Remove driver from printer list entry when in
 		    # recommended mode
 		    $key =~ s/^([^\|]+\|[^\|]+)\|.*$/$1/;
+
 		    # Only replace an existing printer entry if
 		    #  - its driver is not the same as the driver of the
 		    #    new one
@@ -1663,18 +1998,25 @@ sub poll_ppd_base() {
 		    if (defined($thedb{$key})) {
 			next if lc($thedb{$key}{driver}) eq
 				     lc($driver);
-			next unless $isnativeps &&
-				      $thedb{$key}{driver} =~ /^PostScript$/i ||
-                          $thedb{$key}{driver} ne "PPD" && $isrecommended ||
-                          $thedb{$key}{driver} eq "PPD" && $isrecommended && $driver ne "PostScript";
-				      
-			# Remove the old entry
-			delete $thedb{$key};
+			if ($isnativeps &&
+                            $thedb{$key}{driver} =~ /^PostScript$/i ||
+                            $thedb{$key}{driver} ne "PPD" && $isrecommended ||
+                            $thedb{$key}{driver} eq "PPD" && $isrecommended && $driver ne "PostScript") {
+			    # Save the autodetection data
+			    $devidmake = $thedb{$key}{devidmake};
+			    $devidmodel = $thedb{$key}{devidmodel};
+			    $deviddesc = $thedb{$key}{deviddesc};
+			    $devidcmdset = $thedb{$key}{devidcmdset};
+                            # Remove the old entry
+                            delete $thedb{$key};
+                        } else {
+                            next;
+                        }
 		    }
 		} elsif ((defined 
 			   $thedb{"$mf|$model|$fullfoomaticdriver"} ||
 			  defined 
-			   $thedb{"$mf|$model|$fullfoomaticdriver (recommended)"}) && 
+			   $thedb{"$mf|$model|$fullfoomaticdriver $precstr"}) && 
 			 $isfoomatic) {
 		    # Expert mode: There is already an entry for the
 		    # same printer/driver combo produced by the
@@ -1682,72 +2024,86 @@ sub poll_ppd_base() {
 		    # entry
 		    next;
 		} elsif (defined
-			 $thedb{"$mf|$model|PostScript (recommended)"} &&
+			 $thedb{"$mf|$model|PostScript $precstr"} &&
 			 $isnativeps) {
 		    # Expert mode: "Foomatic + Postscript" driver is
 		    # recommended and this is a PostScript PPD? Make
 		    # this PPD the recommended one
 		    foreach (keys 
-		         %{$thedb{"$mf|$model|PostScript (recommended)"}}) {
+		         %{$thedb{"$mf|$model|PostScript $precstr"}}) {
 			$thedb{"$mf|$model|PostScript"}{$_} =
-			  $thedb{"$mf|$model|PostScript (recommended)"}{$_};
+			  $thedb{"$mf|$model|PostScript $precstr"}{$_};
 		    }
 		    delete
-			$thedb{"$mf|$model|PostScript (recommended)"};
+			$thedb{"$mf|$model|PostScript $precstr"};
 		    if (!$isrecommended) {
-			$key .= " (recommended)";
+			$key .= " $precstr";
 		    }
 		} elsif ($driver =~ /PostScript/i &&
 			 $isrecommended && $isfoomatic &&
 			 (my @foundkeys = grep {
 			     /^$mf\|$model\|/ && !/CUPS/i &&
-			     $thedb{$_}{driver} eq "PPD" 
+			     $thedb{$_}{driver} eq "PPD";
 			 } keys %thedb)) {
 		    # Expert mode: "Foomatic + Postscript" driver is
 		    # recommended and there was a PostScript PPD? Make
 		    # the PostScript PPD the recommended one
 		    my $firstfound = $foundkeys[0];
-		    if (!(any { /\(recommended\)/ } @foundkeys)) {
+		    if (!(any { /$sprecstr/ } @foundkeys)) {
 			# Do it only if none of the native PostScript
 			# PPDs for this printer is already "recommended"
 			foreach (keys %{$thedb{$firstfound}}) {
-			    $thedb{"$firstfound (recommended)"}{$_} =
+			    $thedb{"$firstfound $precstr"}{$_} =
 				$thedb{$firstfound}{$_};
 			}
 			delete $thedb{$firstfound};
 		    }
-		    $key =~ s/\s*\(recommended\)//;
+		    $key =~ s/\s*$sprecstr//;
 		} elsif ($driver !~ /PostScript/i &&
 			 $isrecommended && $isfoomatic &&
 			 (@foundkeys = grep {
-			     /^$mf\|$model\|.*\(recommended\)/ && 
-			     !/CUPS/i && $thedb{$_}{driver} eq "PPD" 
+			     /^$mf\|$model\|.*$sprecstr/ && 
+			     !/CUPS/i && $thedb{$_}{driver} eq "PPD";
 			 } keys %thedb)) {
 		    # Expert mode: Foomatic driver other than "Foomatic +
 		    # Postscript" is recommended and there was a PostScript 
-		    # PPD which was recommended? Make The Foomatic driver
+		    # PPD which was recommended? Make the Foomatic driver
 		    # the recommended one
 		    foreach my $sourcekey (@foundkeys) {
 			# Remove the "recommended" tag
 			my $destkey = $sourcekey;
-			$destkey =~ s/\s+\(recommended\)\s*$//i;
+			$destkey =~ s/\s+$sprecstr\s*$//i;
 			foreach (keys %{$thedb{$sourcekey}}) {
 			    $thedb{$destkey}{$_} = $thedb{$sourcekey}{$_};
 			}
 			delete $thedb{$sourcekey};
 		    }
 		}
+		
+		# Remove duplicate "recommended" tags and have the
+		# "recommended" tag at the end
+		$key =~ s/(\s*$sprecstr)(.*?)(\s*$sprecstr)/$2$3/;
+		$key =~ s/(\s*$sprecstr)(.+)$/$2$1/;
+		# Create the new entry
 	        $thedb{$key}{ppd} = $ppd;
 		$thedb{$key}{make} = $mf;
 		$thedb{$key}{model} = $model;
 		$thedb{$key}{driver} = $driver;
-		# Get auto-detection data
+		# Recover saved autodetection data
+		$thedb{$key}{devidmake} = $devidmake if $devidmake;
+		$thedb{$key}{devidmodel} = $devidmodel if $devidmodel;
+		$thedb{$key}{deviddesc} = $deviddesc if $deviddesc;
+		$thedb{$key}{devidcmdset} = $devidcmdset if $devidcmdset;
+		# Get autodetection data
 		#my ($devidmake, $devidmodel) = ppd_devid_data($ppd);
 		#$thedb{$key}{devidmake} = $devidmake;
 		#$thedb{$key}{devidmodel} = $devidmodel;
-	    }
+		# Rememeber which entry is the freshly added PPD file
+		$ppdentry = $key if
+		    $ppdfile eq "/usr/share/cups/model/$ppd";
+	    };
 	}
-	close PPDS;
+	close $PPDS;
 	scalar(keys %thedb) - $driversthere > 5 and last;
 	#- we have to try again running the program, wait here a little 
 	#- before.
@@ -1756,6 +2112,7 @@ sub poll_ppd_base() {
     #scalar(keys %descr_to_ppd) > 5 or 
     #  die "unable to connect to cups server";
 
+    return $ppdentry;
 }
 
 
@@ -1783,16 +2140,25 @@ sub configure_queue($) {
 			 ("-p", $printer->{currentqueue}{printer},
 			  "-d", $printer->{currentqueue}{driver}) :
 			 ($printer->{currentqueue}{ppd} ?
-			  ("--ppd",
-			   ($printer->{currentqueue}{ppd} !~ m!^/! ?
-			    "/usr/share/cups/model/" : "") .
-			   $printer->{currentqueue}{ppd}) :
+			  ($printer->{currentqueue}{ppd} ne '1' ?
+			   ("--ppd",
+			    ($printer->{currentqueue}{ppd} !~ m!^/! ?
+			     "/usr/share/cups/model/" : "") .
+			    $printer->{currentqueue}{ppd}) : ()) :
 			  ("-d", "raw"))),
 			"-N", $printer->{currentqueue}{desc},
 			"-L", $printer->{currentqueue}{loc},
+			if_($printer->{SPOOLER} eq "cups",
+			    "--backend-dont-disable=" . 
+			    $printer->{currentqueue}{dd},
+			    "--backend-attempts=" . 
+			    $printer->{currentqueue}{att},
+			    "--backend-delay=" . 
+			    $printer->{currentqueue}{delay}),
 			@{$printer->{currentqueue}{options}}
-			) or return 0;;
-    if ($printer->{currentqueue}{ppd}) {
+			) or return 0;
+    if ($printer->{currentqueue}{ppd} &&
+	($printer->{currentqueue}{ppd} ne '1')) {
 	# Add a comment line containing the path of the used PPD file to the
 	# end of the PPD file
 	if ($printer->{currentqueue}{ppd} ne '1') {
@@ -1801,18 +2167,12 @@ sub configure_queue($) {
     }	  
 
     # Make sure that queue is active
-    if ($printer->{SPOOLER} ne "pdq") {
+    if ($printer->{NEW} && ($printer->{SPOOLER} ne "pdq")) {
         run_program::rooted($::prefix, "foomatic-printjob",
 			    "-s", $printer->{currentqueue}{spooler},
 			    "-C", "up", $printer->{currentqueue}{queue});
     }
 
-    # In case of CUPS set some more useful defaults for text and image 
-    # printing
-    if ($printer->{SPOOLER} eq "cups") {
-	set_cups_special_options($printer->{currentqueue}{queue});
-    }
-
     # Check whether a USB printer is configured and activate USB printing if so
     my $useUSB = 0;
     foreach (values %{$printer->{configured}}) {
@@ -1849,6 +2209,14 @@ sub configure_queue($) {
     $printer->{configured}{$printer->{currentqueue}{queue}}{args} = {};
     $printer->{configured}{$printer->{currentqueue}{queue}}{args} =
 	$printer->{ARGS};
+
+    # In case of CUPS set some more useful defaults for text and image 
+    # printing
+    if ($printer->{SPOOLER} eq "cups") {
+	set_cups_special_options($printer,
+				 $printer->{currentqueue}{queue});
+    }
+
     # Clean up
     delete($printer->{ARGS});
     $printer->{OLD_CHOICE} = "";
@@ -1859,9 +2227,19 @@ sub configure_queue($) {
     return 1;
 }
 
+sub enable_disable_queue {
+    my ($printer, $queue, $state) = @_;
+    
+    if (($printer->{SPOOLER} ne "pdq") &&
+	($printer->{SPOOLER} ne "rcups")) {
+        run_program::rooted($::prefix, "foomatic-printjob",
+			    "-s", $printer->{SPOOLER},
+			    "-C", ($state ? "start" : "stop"), $queue);
+    }
+}
+
 sub remove_queue($$) {
-    my ($printer) = $_[0];
-    my ($queue) = $_[1];
+    my ($printer, $queue) = @_;
     run_program::rooted($::prefix, "foomatic-configure", "-R", "-q",
 			"-s", $printer->{SPOOLER},
 			"-n", $queue);
@@ -1873,7 +2251,6 @@ sub remove_queue($$) {
     $printer->{ARGS} = {};
     $printer->{DBENTRY} = "";
     $printer->{currentqueue} = {};
-    removeprinterfromapplications($printer, $queue);
 }
 
 sub restart_queue($) {
@@ -1908,38 +2285,39 @@ sub print_pages($@) {
     my $queue = $printer->{QUEUE};
     my $lpr = "/usr/bin/foomatic-printjob";
     my $lpq = "$lpr -Q";
+    my $spooler = $printer->{SPOOLER};
+    $spooler = "cups" if $spooler eq "rcups";
 
     # Print the pages
     foreach (@pages) {
 	my $page = $_;
-	# Only text and PostScript can be printed directly with all spoolers,
-	# images must be treated seperately
+	# Only text and PostScript can be printed directly with all
+	# spoolers, images must be treated seperately
 	if ($page =~ /\.jpg$/) {
-	    if ($printer->{SPOOLER} ne "cups") {
+	    if ($spooler ne "cups") {
 		# Use "convert" from ImageMagick for non-CUPS spoolers
 		system(($::testing ? $::prefix : "chroot $::prefix/ ") .
 		       "/usr/bin/convert $page -page 427x654+100+65 PS:- | " .
 		       ($::testing ? $::prefix : "chroot $::prefix/ ") .
-		       "$lpr -s $printer->{SPOOLER} -P $queue");
+		       "$lpr -s $spooler -P $queue");
 	    } else {
 		# Use CUPS's internal image converter with CUPS, tell it
 		# to let the image occupy 90% of the page size (so nothing
 		# gets cut off by unprintable borders)
-		run_program::rooted($::prefix, $lpr, "-s", $printer->{SPOOLER},
+		run_program::rooted($::prefix, $lpr, "-s", $spooler,
 				    "-P", $queue, "-o", "scaling=90", $page);
 	    }		
 	} else {
-	    run_program::rooted($::prefix, $lpr, "-s", $printer->{SPOOLER},
+	    run_program::rooted($::prefix, $lpr, "-s", $spooler,
 				"-P", $queue, $page);
 	}
     }
     sleep 5; #- allow lpr to send pages.
     # Check whether the job is queued
-    local *F; 
-    open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . "$lpq -s $printer->{SPOOLER} -P $queue |";
+    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") . "$lpq -s $spooler -P $queue |");
     my @lpq_output =
-	grep { !/^no entries/ && !(/^Rank\s+Owner/ .. /^\s*$/) } <F>;
-    close F;
+	grep { !/^no entries/ && !(/^Rank\s+Owner/ .. /^\s*$/) } <$F>;
+    close $F;
     @lpq_output;
 }
 
@@ -1947,10 +2325,9 @@ sub help_output {
     my ($printer, $spooler) = @_;
     my $queue = $printer->{QUEUE};
 
-    local *F; 
-    open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . sprintf($spoolers{$spooler}{help}, $queue);
-    my $helptext = join("", <F>);
-    close F;
+    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") . sprintf($spoolers{$spooler}{help}, $queue));
+    my $helptext = join("", <$F>);
+    close $F;
     $helptext ||= "Option list not available!\n";
     return $helptext;
 }
@@ -1982,17 +2359,19 @@ sub print_optionlist {
 sub get_copiable_queues {
     my ($oldspooler, $newspooler) = @_;
 
+    # No local queues available in daemon-less CUPS mode
+    return () if ($oldspooler eq "rcups") or ($newspooler eq "rcups");
+
     my @queuelist;      #- here we will list all Foomatic-generated queues
     # Get queue list with foomatic-configure
-    local *QUEUEOUTPUT;
-    open QUEUEOUTPUT, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
-	    "foomatic-configure -Q -q -s $oldspooler |" or
+    open(my $QUEUEOUTPUT, ($::testing ? $::prefix : "chroot $::prefix/ ") .
+	    "foomatic-configure -Q -q -s $oldspooler |") or
 		die "Could not run foomatic-configure";
 
     my $entry = {};
     my $inentry = 0;
     local $_;
-    while (<QUEUEOUTPUT>) {
+    while (<$QUEUEOUTPUT>) {
 	chomp;
 	if ($inentry) {
 	    # We are inside a queue entry
@@ -2002,7 +2381,7 @@ sub get_copiable_queues {
 		if ($entry->{foomatic} && $entry->{spooler} eq $oldspooler) {
 		    # Is the connection type supported by the new
 		    # spooler?
-		    if ($newspooler eq "cups" && $entry->{connect} =~ /^(file|ptal|lpd|socket|smb|ipp):/ ||
+		    if ($newspooler eq "cups" && $entry->{connect} =~ /^(file|hp|ptal|lpd|socket|smb|ipp):/ ||
                   $newspooler =~ /^(lpd|lprng)$/ && $entry->{connect} =~ /^(file|ptal|lpd|socket|smb|ncp|postpipe):/ ||
                   $newspooler eq "pdq" && $entry->{connect} =~ /^(file|ptal|lpd|socket):/) {
                   push(@queuelist, $entry->{name});
@@ -2017,7 +2396,7 @@ sub get_copiable_queues {
 		    $entry->{connect} = $1;
 	    }
 	} else {
-	    if (m!^\s*<queue\s+foomatic\s*=\s*\"?(\d+)\"?\s*spooler\s*=\s*\"?(\w+)\"?\s*>\s*$!) {
+	    if (m!^\s*<queue\s+foomatic\s*=\s*"?(\d+)"?\s*spooler\s*=\s*"?(\w+)"?\s*>\s*$!) {
 		# new entry
 		$inentry = 1;
 		$entry->{foomatic} = $1;
@@ -2025,8 +2404,8 @@ sub get_copiable_queues {
 	    }
 	}
     }
-    close QUEUEOUTPUT;
-    
+    close $QUEUEOUTPUT;
+
     return @queuelist;
 }
 
@@ -2038,7 +2417,7 @@ sub copy_foomatic_queue {
 			"-C", $oldspooler, $oldqueue);
     # In case of CUPS set some more useful defaults for text and image printing
     if ($printer->{SPOOLER} eq "cups") {
-	set_cups_special_options($newqueue);
+	set_cups_special_options($printer, $newqueue);
     }
 }
 
@@ -2054,7 +2433,7 @@ sub copy_foomatic_queue {
 sub autodetectionentry_for_uri {
     my ($uri, @autodetected) = @_;
 
-    if ($uri =~ m!^usb://([^/]+)/([^/\?]+)(|\?serial=(\S+))$!) {
+    if ($uri =~ m!^usb://([^/]+)/([^\?]+)(|\?serial=(\S+))$!) {
 	# USB device with URI referring to printer model
 	my $make = $1;
 	my $model = $2;
@@ -2083,6 +2462,49 @@ sub autodetectionentry_for_uri {
 		return $p;
 	    }
 	}
+    } elsif ($uri =~ m!^hp:/(usb|par|net)/!) {
+	# HP printer (controlled by HPLIP)
+	my $hplipdevice = $uri;
+	$hplipdevice =~ m!^hp:/(usb|par|net)/(\S+?)(\?(serial|device)=(\S+)|)$!;
+	my $bus = $1;
+	my $model = $2;
+	my $serial = undef;
+	my $device = undef;
+	if ($4 eq 'serial') {
+	    $serial = $5;
+	} elsif ($4 eq 'device') {
+	    $device = $5;
+	}
+	$model =~ s/_/ /g;
+	foreach my $p (@autodetected) {
+	    next if (!$p->{port}) ||
+		(($p->{port} =~ m!/usb!) && ($bus ne "usb")) ||
+		(($p->{port} =~ m!/dev/(lp|par.*|printer.*)\d+!) &&
+		 ($bus ne "par"));
+	    next if !$p->{val}{MODEL};
+	    if (uc($p->{val}{MODEL}) ne uc($model)) {
+		my $entry = hplip_device_entry($p->{port}, @autodetected);
+		next if !$entry;
+		my $m = $entry->{model};
+		$m =~ s/_/ /g;
+		next if uc($m) ne uc($model);
+	    }
+	    next if ($serial && !$p->{val}{SERIALNUMBER}) ||
+		(!$serial && $p->{val}{SERIALNUMBER}) ||
+		(uc($serial) ne uc($p->{val}{SERIALNUMBER}));
+	    if ($device) {
+		if ($bus eq "par") {
+		    $device =~ m!/dev/(lp|parport|printer/)(\d+)!;
+		    my $parporthplip = $1;
+		    $p->{port} =~ m!/dev/(lp|parport|printer/)(\d+)!;
+		    my $parportauto = $1;
+		    next if $parporthplip != $parportauto;
+		} else {
+		    next if $device ne $p->{port};
+		}
+	    }
+	    return $p;
+	}
     } elsif ($uri =~ m!^ptal://?mlc:!) {
 	# HP multi-function device (controlled by HPOJ)
 	my $ptaldevice = $uri;
@@ -2119,424 +2541,392 @@ sub autodetectionentry_for_uri {
 
 # ------------------------------------------------------------------
 #
-# Configuration of HP multi-function devices
+# Configuration of HP printers and multi-function devices with HPLIP
 #
 # ------------------------------------------------------------------
 
-sub configure_hpoj {
-    my ($device, @autodetected) = @_;
+sub read_hplip_db {
 
-    # Make the subroutines of /usr/sbin/ptal-init available
-    # It's only necessary to read it at the first call of this subroutine,
-    # the subroutine definitions stay valid after leaving this subroutine.
-    if (!$ptalinitread) {
-	local *PTALINIT;
-	open PTALINIT, "$::prefix/usr/sbin/ptal-init" or do {
-	    die "unable to open $::prefix/usr/sbin/ptal-init";
-	};
-	my @ptalinitfunctions; # subroutine definitions in /usr/sbin/ptal-init
-	local $_;
-	while (<PTALINIT>) {
-	    if (m!sub main!) {
-		last;
-	    } elsif ((m!^[^\#]!) && !(m!^\s*exec\b!)){
-		# Comment lines and the "exec" line (probably obsolete
-		# Red Hat workaround) are skipped.
-
-		# Make the subroutines also working during installation
-		if ($::isInstall) {
-		    s!\$::prefix!\$hpoj_prefix!g;
-		    s!prefix="/usr"!prefix="$::prefix/usr"!g;
-		    s!etcPtal="/etc/ptal"!etcPtal="$::prefix/etc/ptal"!g;
-		    s!varLock="/var/lock"!varLock="$::prefix/var/lock"!g;
-		    s!varRunPrefix="/var/run"!varRunPrefix="$::prefix/var/run"!g;
-		    s!/sbin/lsmod!/usr/bin/lsmod!g;
-		    s!/sbin/modprobe!/usr/bin/modprobe!g;
-		    s!/sbin/rmmod!/usr/bin/rmmod!g;
-		    s!(my\s*\$osPlatform\s*=\s*).*?$!$1"Linux";!g;
-		    s!chomp\s*\$osPlatform\s*;\s*$!!g;
-		    s!(my\s*\$linuxVersion\s*=\s*).*?$!$1"$kernelversion";!g;
-		    s!^\s*\$linuxVersion\s*=~\s*s.*$!!g;
-		    s!chomp\s*\$linuxVersion\s*;\s*$!!g;
-		    s!(my\s*\$usbprintermodule\s*=\s*).*?$!$1"$usbprintermodule";!g;
-		}
-		push @ptalinitfunctions, $_;
-	    }
-	}
-	close PTALINIT;
+    # Read the device database XML file which comes with the HPLIP
+    # package
+    open(my $F, "< $::prefix/usr/share/hplip/data/xml/models.xml") or
+	warn "Could not read /usr/share/hplip/data/xml/models.xml\n";
 
-	eval "package printer::hpoj;
-        @ptalinitfunctions
-        sub getDevnames {
-	    return (%devnames)
-	}
-        sub getConfigInfo {
-            return (%configInfo)
-        }";
-
-	if ($::isInstall) {
-	    # Needed for photo card reader detection during installation
-	    system("ln -s $::prefix/var/run/ptal-mlcd /var/run/ptal-mlcd");
-	    system("ln -s $::prefix/etc/ptal /etc/ptal");
-	}
-	$ptalinitread = 1;
-    }
-
-    # Read the HPOJ config file and check whether this device is already
-    # configured
-    printer::hpoj::setupVariables();
-    printer::hpoj::readDeviceInfo();
-
-    $device =~ m!^/dev/\S*lp(\d+)$! or
-	$device =~ m!^/dev/printers/(\d+)$! or
-	$device =~ m!^socket://([^:]+)$! or
-	$device =~ m!^socket://([^:]+):(\d+)$!;
-    my $model = $1;
-    my ($model_long, $serialnumber, $serialnumber_long) = ("", "", "");
-    my $cardreader = 0;
-    my $device_ok = 1;
-    my $bus;
-    my $address_arg = "";
-    my $base_address = "";
-    my $hostname = "";
-    my $port = $2;
-    if ($device =~ /usb/) {
-	$bus = "usb";
-    } elsif ($device =~ /par/ ||
-	     $device =~ m!/dev/lp! ||
-	     $device =~ /printers/) {
-	$bus = "par";
-	$address_arg = printer::detect::parport_addr($device);
-	eval "$base_address = $1" if $address_arg =~ /^\s*-base\s+(\S+)/;
-    } elsif ($device =~ /socket/) {
-	$bus = "hpjd";
-	$hostname = $model;
-	return "" if $port && ($port < 9100 || $port > 9103);
-	if ($port && $port != 9100) {
-	    $port -= 9100;
-	    $hostname .= ":$port";
-	}
-    } else {
-	return "";
-    }
-    if ($#autodetected < 0) {
-	# Make a pseudo structure for the auto-detected data if there is
-	# no auto-detected data (for example when configuring manually)
-	$autodetected[0] = {
-	    'port' => $device,
-	    'val' => {
-		'MODEL' => N("Unknown model")
+    my $entry = {};
+    my $inentry = 0;
+    my $inrX = 0;
+    my $incomment = 0;
+    my %hplipdevices;
+    local $_;
+    while (<$F>) {
+	chomp;
+	if ($incomment) {
+	    # In a comment block, skip all except the end of the comment
+	    if (m!^(.*?)-->(.*)$!) {
+		# End of comment, keep rest of line
+		$_ = $2;
+		$incomment = 0;
+	    } else {
+		# Skip line
+		$_ = '';
 	    }
-	};
-    }
-    my $devdata;
-    foreach (@autodetected) {
-	$device eq $_->{port} or next;
-	$devdata = $_;
-	# $model is for the PTAL device name, so make sure that it is unique
-	# so in the case of the model name auto-detection having failed leave
-	# the port number or the host name as model name.
-	my $searchunknown = N("Unknown model");
-	if ($_->{val}{MODEL} &&
-	    $_->{val}{MODEL} !~ /$searchunknown/i &&
-	    $_->{val}{MODEL} !~ /^\s*$/) {
-	    $model = $_->{val}{MODEL};
-	}
-	$serialnumber = $_->{val}{SERIALNUMBER};
-	services::stop("hpoj") if ($bus ne "hpjd");
-	# Check if the device is really an HP multi-function device
-	#my $libusb = 0;
-	foreach my $libusb (0, 1) {
-	    # Do access via libusb/user mode only if we have a USB device
-	    next if ($libusb && ($bus ne "usb"));
-	    # Preliminary workaround to make the user-mode USB devices
-	    # (LIDIL devices) installable as verification of the HPOJ
-	    # settings of these devices does not work yet. The workaround
-	    # will probably removed after version 9.2 of this distribution.
-	    # Note: This workaround leaves out the checking for a photo
-	    # memory card reader, but to my knowledge there are no LIDIL
-	    # devices with card reader yet.
-	    if ($libusb) {
-		$device_ok = 1;
-		next;
+	} else {
+	    while (m/^(.*?)<!--(.*?)-->(.*)$/) {
+		# Remove one-line comments
+		$_ = $1 . $3;
 	    }
-	    my $printermoduleunloaded = 0;
-	    if ($bus ne "hpjd") {
-		if (!$libusb) {
-		    # Start ptal-mlcd daemon for locally connected devices
-		    # (kernel mode with "printer"/"usblp" module for USB).
-		    run_program::rooted($::prefix, 
-					"ptal-mlcd", "$bus:probe",
-					"-device", 
-					$device, split(' ',$address_arg));
-		} else {
-		    # Start ptal-mlcd daemon for user-mode USB devices
-		    # (all LIDIL MF devices as HP PSC 1xxx and OfficeJet 
-		    #  4xxx)
-		    my $usbdev = usbdevice($_->{val});
-		    if (defined($usbdev)) {
-			# Unload kernel module "printer"/"usblp"
-			if (modules::get_probeall("usb-interface")) {
-			    eval(modules::unload($usbprintermodule));
-			    $printermoduleunloaded = 1;
-			}
-			# Start ptal-mlcd
-			run_program::rooted($::prefix, 
-					    "ptal-mlcd", "$bus:probe",
-					    "-device", $usbdev);
-		    } else {
-			# We could not determine the USB device number,
-			# so we cannot check this device in user mode
-			next;
-		    }
-		}
+	    if (m/^(.*?)<!--(.*)$/) {
+		# Start of comment, keep the beginning of the line
+		$_ = $1;
+		$incomment = 1;
 	    }
-	    $device_ok = 0;
-	    my $ptalprobedevice = $bus eq "hpjd" ? "hpjd:$hostname" : "mlc:$bus:probe";
-	    local *F;
-	    if (open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . "/usr/bin/ptal-devid $ptalprobedevice |") {
-		my $devid = join("", <F>);
-		close F;
-		if ($devid) {
-		    $device_ok = 1;
-		    local *F;
-		    if (open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . "/usr/bin/ptal-devid $ptalprobedevice -long -mdl 2>/dev/null |") {
-			$model_long = join("", <F>);
-			close F;
-			chomp $model_long;
-			# If SNMP or local port auto-detection failed but 
-			# HPOJ auto-detection succeeded, fill in model name 
-			# here.
-			if (!$_->{val}{MODEL} ||
-			    $_->{val}{MODEL} =~ /$searchunknown/i ||
-			    $_->{val}{MODEL} =~ /^\s*$/) {
-			    if ($model_long =~ /:([^:;]+);/) {
-				$_->{val}{MODEL} = $1;
-				$model = $_->{val}{MODEL};
-				$model =~ s/ /_/g;
-			    }
-			}
+	}
+	# Is there some non-comment part left in the line
+	if (m!\S!) {
+	    if ($inentry) {
+		# We are inside a device entry
+		if ($inrX) {
+		    # We are in one of the the device's <rX> sections,
+		    # skip the section
+		    if (m!^\s*</r\d+>\s*$!) {
+			# End of <rX> section
+			$inrX = 0;
 		    }
-		    if (open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . "/usr/bin/ptal-devid $ptalprobedevice -long -sern 2>/dev/null |") { #-#
-			$serialnumber_long = join("", <F>);
-			close F;
-			chomp $serialnumber_long;
+		} else {
+		    if (m!^\s*<r\d+>\s*$!) {
+			# Start of <rX> section
+			$inrX = 1;
+		    } elsif (m!^\s*</model>\s*$!) {
+			# End of device entry
+			$inentry = 0;
+			my $devidmodel;
+			if ($entry->{$devidmodel}) {
+			    $devidmodel = $entry->{devidmodel};
+			    $devidmodel =~ s/ /_/g;
+			} else {
+			    $devidmodel = $entry->{model};
+			}
+			$hplipdevices{$devidmodel} = $entry;
+			$entry = {};
+		    } elsif (m!^\s*<id>\s*([^<>]+)\s*</id>\s*$!) {
+			# Full ID string
+			my $idstr = $1;
+			$idstr =~ m!(MFG|MANUFACTURER):([^;]+);!i
+			    and $entry->{devidmake} = $2;
+			$idstr =~ m!(MDL|MODEL):([^;]+);!i
+			    and $entry->{devidmodel} = $2;
+			$idstr =~ m!(DES|DESCRIPTION):([^;]+);!i
+			    and $entry->{deviddesc} = $2;
+			$idstr =~ m!(CMD|COMMAND\s*SET):([^;]+);!i
+			    and $entry->{devidcmdset} = $2;
+		    } elsif (m!^\s*<io support="(\d+)".*/>\s*$!) {
+			# Input/Output ports explicitly supported by HPLIP
+			my $ports = $1;
+			$entry->{bus}{par} = 1 if ($ports & 1); 
+			$entry->{bus}{usb} = 1 if ($ports & 2); 
+			$entry->{bus}{net} = 1 if ($ports & 4); 
+		    } elsif (m!^\s*<tech type="(\d+)"/>\s*$!) {
+			# Printing technology
+			$entry->{tech} = $1;
+		    } elsif (m!^\s*<align type="(\d+)"/>\s*$!) {
+			# Head alignment type
+			$entry->{align} = $1;
+		    } elsif (m!^\s*<clean type="(\d+)"/>\s*$!) {
+			# Head cleaning type
+			$entry->{clean} = $1;
+		    } elsif (m!^\s*<color-cal type="(\d+)"/>\s*$!) {
+			# Color calibration type
+			$entry->{colorcal} = $1;
+		    } elsif (m!^\s*<status type="(\d+)"/>\s*$!) {
+			# Status request type
+			$entry->{status} = $1;
+		    } elsif (m!^\s*<scan type="(\d+)"/>\s*$!) {
+			# Scanner access type
+			$entry->{scan} = $1;
+		    } elsif (m!^\s*<fax type="(\d+)"/>\s*$!) {
+			# Fax access type
+			$entry->{fax} = $1;
+		    } elsif (m!^\s*<pcard type="(\d+)"/>\s*$!) {
+			# Memory card access type
+			$entry->{card} = $1;
+		    } elsif (m!^\s*<copy type="(\d+)"/>\s*$!) {
+			# Copier access type
+			$entry->{copy} = $1;
 		    }
-		    $cardreader = 1 if printer::hpoj::cardReaderDetected($ptalprobedevice);
 		}
-	    }
-	    if ($bus ne "hpjd") {
-		# Stop ptal-mlcd daemon for locally connected devices
-		local *F;
-		if (open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . qq(ps auxwww | grep "ptal-mlcd $bus:probe" | grep -v grep | )) {
-		    my $line = <F>;
-		    if ($line =~ /^\s*\S+\s+(\d+)\s+/) {
-			my $pid = $1;
-			kill 15, $pid;
-		    }
-		    close F;
+	    } else {
+		# We are not in a printer entry
+		if (m!^\s*<\s*model\s+name=\"(\S+)\"\a*>\s*$!) {
+		    $inentry = 1;
+		    # HPLIP model ID
+		    $entry->{model} = $1;
 		}
-		$printermoduleunloaded &&
-		    eval(modules::load($usbprintermodule));
 	    }
-	    last if $device_ok;
 	}
-	printer::services::start("hpoj") if ($bus ne "hpjd");
-	last;
     }
-    # No, it is not an HP multi-function device.
-    return "" if !$device_ok;
-	
-    # If $model_long and $serialnumber_long stay empty, fill them with
-    # $model and $serialnumber
-    $model_long ||= $model;
-    $serialnumber_long ||= $serialnumber;
-
-    # Determine the ptal device name from already existing config files
-    my $ptalprefix =
-	($bus eq "hpjd" ? "hpjd:" : "mlc:$bus:");
-    my $ptaldevice = printer::hpoj::lookupDevname($ptalprefix, $model_long, 
-				    $serialnumber_long, $base_address);
-
-    # It's all done for us, the device is already configured
-    return $ptaldevice if defined($ptaldevice);
-
-    # Determine the ptal name for a new device
-    if ($bus eq "hpjd") {
-	$ptaldevice = "hpjd:$hostname";
-    } else {
-	$ptaldevice = $model;
-	$ptaldevice =~ s![\s/]+!_!g;
-	$ptaldevice = "mlc:$bus:$ptaldevice";
-    }
-
-    # Delete any old/conflicting devices
-    printer::hpoj::deleteDevice($ptaldevice);
-    if ($bus eq "par") {
-	while (1) {
-	    my $oldDevname = printer::hpoj::lookupDevname("mlc:par:",undef,undef,$base_address);
-	    last unless defined($oldDevname);
-	    printer::hpoj::deleteDevice($oldDevname);
+    close $F;
+    return \%hplipdevices;
+}
+
+sub hplip_simple_model {
+    my ($model) = @_;
+    my $simplemodel = $model;
+    $simplemodel =~ s/[^A-Za-z0-9]//g;
+    $simplemodel =~ s/HewlettPackard/HP/gi;
+    $simplemodel =~ s/HP//gi;
+    $simplemodel =~ s/(DeskJet\d+C?)([a-z]*?)/$1/gi;
+    $simplemodel =~ s/((LaserJet|OfficeJet|PhotoSmart|PSC)\d+)([a-z]*?)/$1/gi;
+    $simplemodel =~ s/DeskJet/DJ/gi;
+    $simplemodel =~ s/PhotoSmartP/PhotoSmart/gi;
+    $simplemodel =~ s/LaserJet/LJ/gi;
+    $simplemodel =~ s/OfficeJet/OJ/gi;
+    $simplemodel =~ s/Series//gi;
+    $simplemodel = uc($simplemodel);
+    return $simplemodel;
+}
+
+sub hplip_device_entry {
+    my ($device, @autodetected) = @_;
+
+    # Currently, only local or TCP/Socket device work
+    return undef if ($device !~ /usb/i) && 
+	($device !~ m!/dev/(lp|par.*|printer.*)\d+!) &&
+	($device !~ m!^socket://!i);
+
+    if (!$hplipdevicesdb) {
+	# Read the HPLIP device database if not done already
+	$hplipdevicesdb = read_hplip_db();
+    }
+
+    my $entry;
+    foreach my $a (@autodetected) {
+	$device eq $a->{port} or next;
+	# Only HP devices supported
+	return undef if $a->{val}{MANUFACTURER} !~ /^\s*HP\s*$/i;
+	my $modelstr = $a->{val}{MODEL};
+	$modelstr =~ s/ /_/g;
+	if ($entry = $hplipdevicesdb->{$modelstr}) {
+	    # Exact match
+	    return $entry;
 	}
+	my $hpmodelstr = "HP_" . $modelstr;
+	if ($entry = $hplipdevicesdb->{$hpmodelstr}) {
+	    # Exact match
+	    return $entry;
+	}
+	my $hpmodelstr = "hp_" . $modelstr;
+	if ($entry = $hplipdevicesdb->{$hpmodelstr}) {
+	    # Exact match
+	    return $entry;
+	}
+	# More 'fuzzy' matching
+	my $simplemodel = hplip_simple_model($modelstr);
+	foreach my $key (keys %{$hplipdevicesdb}) {
+	    my $simplekey = hplip_simple_model($key);
+	    return $hplipdevicesdb->{$key} if $simplemodel eq $simplekey;
+	}
+	foreach my $key (keys %{$hplipdevicesdb}) {
+	    my $simplekey = hplip_simple_model($key);
+	    $simplekey =~ s/(\d\d)00(C?)$/$1\\d\\d$2/;
+	    $simplekey =~ s/(\d\d\d)0(C?)$/$1\\d$2/;
+	    $simplekey =~ s/(\d\d)0(\dC?)$/$1\\d$2/;
+	    return $hplipdevicesdb->{$key} if 
+		$simplemodel =~ m/^$simplekey$/i;
+	}
+	# Device not supported
+	return undef;
     }
+    # $device not in @autodetected
+    return undef;
+}
 
-    # Configure the device
+sub hplip_device_entry_from_uri {
+    my ($deviceuri) = @_;
 
-    # Open configuration file
-    local *CONFIG;
-    open(CONFIG, "> $::prefix/etc/ptal/$ptaldevice") or
-	die "Could not open /etc/ptal/$ptaldevice for writing!\n";
+    return undef if $deviceuri !~ m!^hp:/!;
+    
+    if (!$hplipdevicesdb) {
+	# Read the HPLIP device database if not done already
+	$hplipdevicesdb = read_hplip_db();
+    }
 
-    # Write file header.
-    my $date = chomp_(`date`);
-    print CONFIG
-qq(
-# Added $date by "printerdrake"
+    $deviceuri =~ m!^hp:/(usb|par|net)/(\S+?)(\?\S+|)$!;
+    my $model = $2;
+    return undef if !$model;
 
-# The basic format for this file is "key[+]=value".
-# If you say "+=" instead of "=", then the value is appended to any
-# value already defined for this key, rather than replacing it.
+    my $entry;
+    if ($entry = $hplipdevicesdb->{$model}) {
+	return $entry;
+    }
+    return undef;
+}
 
-# Comments must start at the beginning of the line.  Otherwise, they may
-# be interpreted as being part of the value.
+sub start_hplip {
+    my ($device, $hplipentry, @autodetected) = @_;
 
-# If you have multiple devices and want to define options that apply to
-# all of them, then put them in the file /etc/ptal/defaults, which is read
-# in before this file.
+    # Determine connection type
+    my $bus;
+    if ($device =~ /usb/) {
+	$bus = "usb";
+    } elsif ($device =~ m!/dev/(lp|par.*|printer.*)\d+!) {
+	$bus = "par";
+    } elsif ($device =~ m!^socket://!) {
+	$bus = "net";
+    } else {
+	return undef;
+    }
 
-# The format version of this file:
-#   ptal-init ignores devices with incorrect/missing versions.
-init.version=2
-);
+    # Start HPLIP daemons
+    printer::services::start_not_running_service("hplip");
 
-    # Write model string.
-    if ($model_long !~ /\S/) {
-	print CONFIG
-	    "\n" .
-	    qq(# "printerdrake" couldn't read the model but added this device anyway:\n) .
-	    "# ";
+    # Determine HPLIP device URI for the CUPS queue
+    if ($bus eq "net") {
+	$device =~ m!^socket://([^:]+)(|:\d+)$!;
+	my $host = $1;
+	my $ip;
+	if ($host !~ m!^\d+\.\d+\.\d+\.\d+$!) {
+	    my $addr = gethostbyname("$host");
+	    my ($a,$b,$c,$d) = unpack('C4',$addr);
+	    $ip = sprintf("%d.%d.%d.%d", $a, $b, $c, $d);
+	} else {
+	    $ip = $host;
+	}
+	open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
+	     "/bin/sh -c \"export LC_ALL=C; /usr/bin/hp-makeuri $ip\" |") or
+	     die "Could not run \"/usr/bin/hp-makeuri $ip\"!";
+	while (my $line = <$F>) {
+	    if ($line =~ m!(hp:/net/\S+)!) {
+		my $uri = $1;
+		close $F;
+		return $uri;
+	    }
+	}
+	close $F;
     } else {
-	print CONFIG
-	    "\n" .
-	    "# The device model that was originally detected on this port:\n" .
-	    qq(#   If this ever changes, then you should re-run "printerdrake"\n) .
-	    "#   to delete and re-configure this device.\n";
-	if ($bus eq "par") {
-	    print CONFIG
-		"#   Comment out if you don't care what model is really connected to this\n" .
-		"#   parallel port.\n";
+	foreach my $a (@autodetected) {
+	    $device eq $a->{port} or next;
+	    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
+		 "/bin/sh -c \"export LC_ALL=C; /usr/$lib/cups/backend/hp\" |") or
+		 die "Could not run \"/usr/$lib/cups/backend/hp\"!";
+	    while (my $line = <$F>) {
+		if (($line =~ m!^direct\s+(hp:/$bus/(\S+?)\?serial=(\S+))\s+!) ||
+		    ($line =~ m!^direct\s+(hp:/$bus/(\S+?)\?device=()(\S+))\s+!) ||
+		    ($line =~ m!^direct\s+(hp:/$bus/(\S+))\s+!)) {
+		    my $uri = $1;
+		    my $modelstr = $2;
+		    my $serial = $3;
+		    my $devicestr = $4;
+		    $devicestr =~ m!/dev/(lp|parport|printer/)(\d+)!;
+		    my $parporthplip = $1;
+		    $device =~ m!/dev/(lp|parport|printer/)(\d+)!;
+		    my $parportdevice = $1;
+		    if ((uc($modelstr) eq uc($hplipentry->{model})) &&
+			(!$serial ||
+			 (uc($serial) eq uc($a->{val}{SERIALNUMBER}))) &&
+			(!$devicestr ||
+			 ($devicestr eq $device) ||
+			 (($parporthplip ne "") &&
+			  ($parportdevice ne "") &&
+			  ($parporthplip == $parportdevice)))) {
+			close $F;
+			return $uri;
+		    }
+		}
+	    }
+	    close $F;
+	    last;
 	}
     }
-    print CONFIG
-	qq(init.mlcd.append+=-devidmatch "$model_long"\n);
+    # HPLIP URI not found
+    return undef;
+}
 
-    # Write serial-number string.
-    if ($serialnumber_long !~ /\S/) {
-	print CONFIG
-	    "\n" .
-	    "# The device's serial number is unknown.\n" .
-	    "# ";
-    } else {
-	print CONFIG
-	    "\n" .
-	    "# The serial number of the device that was originally detected on this port:\n";
-	if ($bus =~ /^[pu]/) {
-	    print CONFIG
-		"#   Comment out if you want to disable serial-number matching.\n";
-	}
+sub start_hplip_manual {
+
+    # Start HPLIP daemons
+    printer::services::start_not_running_service("hplip");
+
+    # Return all possible device URIs
+    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
+	 "/bin/sh -c \"export LC_ALL=C; /usr/$lib/cups/backend/hp\" |") or
+	 die "Could not run \"/usr/$lib/cups/backend/hp\"!";
+    my @uris;
+    while (<$F>) {
+        m!^direct\s+(hp:\S+)\s+!;
+	push(@uris, $1);
     }
-    print CONFIG
-	qq(init.mlcd.append+=-devidmatch "$serialnumber_long"\n);
-
-    if ($bus =~ /^[pu]/) {
-	print CONFIG
-	    "\n" .
-	    "# Standard options passed to ptal-mlcd:\n" .
-	    "init.mlcd.append+=";
-	if ($bus eq "usb") {
-	    # Important: don't put more quotes around /dev/usb/lp[0-9]*,
-	    # because ptal-mlcd currently does no globbing:
-	    print CONFIG "-device /dev/usb/lp0 /dev/usb/lp1 /dev/usb/lp2 /dev/usb/lp3 /dev/usb/lp4 /dev/usb/lp5 /dev/usb/lp6 /dev/usb/lp7 /dev/usb/lp8 /dev/usb/lp9 /dev/usb/lp10 /dev/usb/lp11 /dev/usb/lp12 /dev/usb/lp13 /dev/usb/lp14 /dev/usb/lp15";
-	} elsif ($bus eq "par") {
-	    print CONFIG "$address_arg -device $device";
+    return @uris;
+}
+
+sub remove_hpoj_config {
+    my ($device, @autodetected) = @_;
+
+    for my $d (@autodetected) {
+	$device eq $d->{port} or next;
+	my $bus;
+	if ($device =~ /usb/) {
+	    $bus = "usb";
+	} elsif ($device =~ m!/dev/(lp|par.*|printer.*)\d+!) {
+	    $bus = "par";
+	} elsif ($device =~ /socket/) {
+	    $bus = "hpjd";
 	}
-	print CONFIG "\n" .
-	    "\n" .
-	    "# ptal-mlcd's remote console can be useful for debugging, but may be a\n" .
-	    "# security/DoS risk otherwise.  In any case, it's accessible with the\n" .
-	    qq(# command "ptal-connect mlc:<XXX>:<YYY> -service PTAL-MLCD-CONSOLE".\n) .
-	    "# Uncomment the following line if you want to enable this feature for\n" .
-	    "# this device:\n" .
-	    "# init.mlcd.append+=-remconsole\n" .
-	    "\n" .
-	    "# If you need to pass any other command-line options to ptal-mlcd, then\n" .
-	    "# add them to the following line and uncomment the line:\n" .
-	    "# init.mlcd.append+=\n" .
-	    "\n" .
-	    "# By default ptal-printd is started for mlc: devices.  If you use CUPS,\n" .
-	    "# then you may not be able to use ptal-printd, and you can uncomment the\n" .
-	    "# following line to disable ptal-printd for this device:\n" .
-	    "# init.printd.start=0\n";
-    } else {
-	print CONFIG
-	    "\n" .
-	    "# By default ptal-printd isn't started for hpjd: devices.\n" .
-	    "# If for some reason you want to start it for this device, then\n" .
-	    "# uncomment the following line:\n" .
-	    "init.printd.start=1\n";
-    }
-
-    print CONFIG
-	"\n" .
-	"# If you need to pass any additional command-line options to ptal-printd,\n" .
-	"# then add them to the following line and uncomment the line:\n" .
-	"# init.printd.append+=\n";
-    if ($cardreader) {
-	print CONFIG
-	    "\n" .
-	    "# Uncomment the following line to enable ptal-photod for this device:\n" .
-	    "init.photod.start=1\n" .
-	    "\n" .
-	    "# If you have more than one photo-card-capable peripheral and you want to\n" .
-	    "# assign particular TCP port numbers and mtools drive letters to each one,\n" .
-	    qq(# then change the line below to use the "-portoffset <n>" option.\n) .
-	    "init.photod.append+=-maxaltports 26\n";
-    }
-    close(CONFIG);
-    printer::hpoj::readOneDevice($ptaldevice);
-
-    # Restart HPOJ
-    printer::services::restart("hpoj");
-
-    # Return HPOJ device name to form the URI
-    return $ptaldevice;
+	my $path = "$::prefix/etc/ptal";
+	opendir PTALDIR, "$path";
+	while (my $file = readdir(PTALDIR)) {
+	    next if $file !~ /^(mlc:|)$bus:/;
+	    $file = "$path/$file";
+	    if ($bus eq "hpjd") {
+		$device =~ m!^socket://(\S+?)(:\d+|)$!;
+		my $host = $1;
+		if ($file =~ /$host/) {
+		    closedir PTALDIR;
+		    unlink($file) or return $file;
+		    printer::services::restart("hpoj");
+		    return undef;
+		} 
+	    } else {
+		if ((grep { /$d->{val}{MODEL}/ } chomp_(cat_($file))) &&
+		    ((!$d->{val}{SERIALNUMBER}) ||
+		     (grep { /$d->{val}{SERIALNUMBER}/ } 
+		      chomp_(cat_($file))))) {
+		    closedir PTALDIR;
+		    unlink($file) or return $file;
+		    printer::services::restart("hpoj");
+		    return undef;
+		}
+	    }
+	}
+	last;
+    }
+    closedir PTALDIR;
+    return undef;
 }
 
 sub devicefound {
     my ($usbid, $model, $serial) = @_;
     # Compare the output of "lsusb -vv" with the elements of the device 
     # ID string
-    if ($serial && ($usbid->{'SERIALNUMBER'} eq $serial)) {
+    if ($serial && $usbid->{SERIALNUMBER} eq $serial) {
 	# Match of serial number has absolute priority
 	return 1;
-    } elsif ($model && ($usbid->{'MODEL'} eq $model)) {
+    } elsif ($model && $usbid->{MODEL} eq $model) {
 	# Try to match the model name otherwise
 	return 1;
     }
     return 0;
 }
 
-sub usbdevice() {
+sub usbdevice {
     my ($usbid) = @_;
-    # Run "lsusb -vv¨ and search the given device to get its USB bus and
+    # Run "lsusb -vv" and search the given device to get its USB bus and
     # device numbers
-    local *F;
-    open F, ($::testing ? "" : "chroot $::prefix/ ") .
-	'/bin/sh -c "export LC_ALL=C; lsusb -vv 2> /dev/null" |'
+    open(my $F, ($::testing ? "" : "chroot $::prefix/ ") .
+	'/bin/sh -c "export LC_ALL=C; lsusb -vv 2> /dev/null" |')
 	or return undef;
     my ($bus, $device, $model, $serial) = ("", "", "", "");
     my $found = 0;
-    while (my $line = <F>) {
+    while (my $line = <$F>) {
 	chomp $line;
 	if ($line =~ m/^\s*Bus\s+(\d+)\s+Device\s+(\d+)\s*:/i) {
 	    # head line of a new device
@@ -2554,7 +2944,7 @@ sub usbdevice() {
 	    $serial = $1;
 	}
     }
-    close F;
+    close $F;
     # Check last entry
     $found = devicefound($usbid, $model, $serial);
 
@@ -2562,102 +2952,20 @@ sub usbdevice() {
     return sprintf("%%%03d%%%03d", $bus, $device);
 }
 
-sub config_sane() {
-    # Add HPOJ backend to /etc/sane.d/dll.conf if needed (no individual
-    # config file /etc/sane.d/hpoj.conf necessary, the HPOJ driver finds the
-    # scanner automatically)
-    return if member("hpoj", chomp_(cat_("$::prefix/etc/sane.d/dll.conf")));
-    eval { append_to_file("$::prefix/etc/sane.d/dll.conf", "hpoj\n") } or
-	   die "can't write SANE config in /etc/sane.d/dll.conf: $!";
-}
-
-sub config_photocard() {
-
-    # Add definitions for the drives p:. q:, r:, and s: to /etc/mtools.conf
-    cat_("$::prefix/etc/mtools.conf") !~ m/^\s*drive\s+p:/m or return;
-
-    append_to_file("$::prefix/etc/mtools.conf", <<'EOF');
-# Drive definitions added for the photo card readers in HP multi-function
-# devices driven by HPOJ
-drive p: file=":0" remote
-drive q: file=":1" remote
-drive r: file=":2" remote
-drive s: file=":3" remote
-# This turns off some file system integrity checks of mtools, it is needed
-# for some photo cards.
-mtools_skip_check=1
-EOF
-
-    # Generate a config file for the graphical mtools frontend MToolsFM or
-    # modify the existing one
-    my $mtoolsfmconf;
-    if (-f "$::prefix/etc/mtoolsfm.conf") {
-	$mtoolsfmconf = cat_("$::prefix/etc/mtoolsfm.conf") or die "can't read MToolsFM config in $::prefix/etc/mtoolsfm.conf: $!";
-	my $alloweddrives = lc($1) if $mtoolsfmconf =~ m/^\s*DRIVES\s*=\s*\"([A-Za-z ]*)\"/m;
-	foreach my $letter ("p", "q", "r", "s") {
-         $alloweddrives .= $letter if $alloweddrives !~ /$letter/;
-	}
-	$mtoolsfmconf =~ s/^\s*DRIVES\s*=\s*"[A-Za-z ]*"/DRIVES="$alloweddrives"/m;
-	$mtoolsfmconf =~ s/^\s*LEFTDRIVE\s*=\s*"[^"]*"/LEFTDRIVE="p"/m;
-        #"# Fix emacs syntax highlighting
-    } else {
-	$mtoolsfmconf = <<'EOF';
-# MToolsFM config file. comments start with a hash sign.
-#
-# This variable sets the allowed driveletters (all lowercase). Example:
-# DRIVES="ab"
-DRIVES="apqrs"
-#
-# This variable sets the driveletter upon startup in the left window.
-# An empty string or space is for the hardisk. Example:
-# LEFTDRIVE="a"
-LEFTDRIVE="p"
-#
-# This variable sets the driveletter upon startup in the right window.
-# An empty string or space is for the hardisk. Example:
-# RIGHTDRIVE="a"
-RIGHTDRIVE=" "
-EOF
-    }
-    output("$::prefix/etc/mtoolsfm.conf", $mtoolsfmconf);
-}
+sub config_sane {
+    my ($backend) = @_;
 
-# ------------------------------------------------------------------
-#
-# Configuration of printers in applications
-#
-# ------------------------------------------------------------------
-
-sub configureapplications {
-    my ($printer) = @_;
-    setcupslink($printer);
-    printer::office::configureoffice('Star Office', $printer);
-    printer::office::configureoffice('OpenOffice.Org', $printer);
-    printer::gimp::configure($printer);
-}
+    # Add HPOJ/HPLIP backend to /etc/sane.d/dll.conf if needed (no
+    # individual config file /etc/sane.d/hplip.conf or
+    # /etc/sane.d/hpoj.conf necessary, the HPLIP and HPOJ drivers find
+    # the scanner automatically)
 
-sub addcupsremotetoapplications {
-    my ($printer, $queue) = @_;
-    setcupslink($printer);
-    return printer::office::add_cups_remote_to_office('Star Office', $printer, $queue) &&
-	   printer::office::add_cups_remote_to_office('OpenOffice.Org', $printer, $queue) &&
-	   printer::gimp::addcupsremoteto($printer, $queue);
-}
-
-sub removeprinterfromapplications {
-    my ($printer, $queue) = @_;
-    setcupslink($printer);
-    return printer::office::remove_printer_from_office('Star Office', $printer, $queue) &&
-	   printer::office::remove_printer_from_office('OpenOffice.Org', $printer, $queue) &&
-	   printer::gimp::removeprinterfrom($printer, $queue);
-}
-
-sub removelocalprintersfromapplications {
-    my ($printer) = @_;
-    setcupslink($printer);
-    printer::office::remove_local_printers_from_office('Star Office', $printer);
-    printer::office::remove_local_printers_from_office('OpenOffice.Org', $printer);
-    printer::gimp::removelocalprintersfrom($printer);
+    return if (! -f "$::prefix/etc/sane.d/dll.conf");
+    return if member($backend,
+		     chomp_(cat_("$::prefix/etc/sane.d/dll.conf")));
+    eval { append_to_file("$::prefix/etc/sane.d/dll.conf",
+			  "$backend\n") } or
+	   die "can not write SANE config in /etc/sane.d/dll.conf: $!";
 }
 
 sub setcupslink {
diff --git a/perl-install/printer/office.pm b/perl-install/printer/office.pm
deleted file mode 100644
index 4a6ae02b5..000000000
--- a/perl-install/printer/office.pm
+++ /dev/null
@@ -1,375 +0,0 @@
-package printer::office;
-
-use strict;
-use common;
-use run_program;
-use printer::data;
-use printer::common;
-use printer::cups;
-
-# ------------------------------------------------------------------
-#   Star Office/OpenOffice.org
-# ------------------------------------------------------------------
-
-# OpenOffice.org stuff applies only for Star Office 6.x now, as our
-# OpenOffice.org is patched for native CUPS support
-
-our $suites = {
-    'OpenOffice.Org' => {
-	'make' => \&makeopenofficeprinterentry,
-	'remove' => \&removeopenofficeprinterentry,
-	'file_name' => '^(.*)/share/psprint/psprint.conf$',
-	'param' => ["Generic Printer", "Command="],
-	'perl' => '/usr/bin/perl -p -e "s=/euro /unused=/Euro /unused=" | /usr/bin/',
-	'files' => ["/usr/lib/office6*/share/psprint/psprint.conf",
-		    "/usr/local/lib/office6*/share/psprint/psprint.conf",
-		    "/usr/local/office6*/share/psprint/psprint.conf",
-		    "/opt/office6*/share/psprint/psprint.conf"],
-    },
-    'Star Office' => {
-	'make' => \&makestarofficeprinterentry,
-	'remove' => \&removestarofficeprinterentry,
-	'file_name' => '^(.*)/share/xp3/Xpdefaults$',
-	'param' => ["ports", "default_queue="],
-	'perl' => '/usr/bin/perl -p -e "s=16#80 /euro=16#80 /Euro=" | /usr/bin/',
-	'files' => ["/usr/lib/*/share/xp3/Xpdefaults",
-		    "/usr/local/lib/*/share/xp3/Xpdefaults",
-		    "/usr/local/*/share/xp3/Xpdefaults",
-		    "/opt/*/share/xp3/Xpdefaults"],
-    }
-};
-
-sub configureoffice {
-    my ($suite, $printer) = @_;
-    # Do we have Star Office installed?
-    my $configfilename = find_config_file($suite);
-    return 1 unless $configfilename;
-    my $configprefix = $1 if $configfilename =~ m!$suites->{$suite}{file_name}!;
-    # Load Star Office printer config file
-    my $configfilecontent = cat_("$::prefix$configfilename");
-    # Update remote CUPS queues
-    if (0 && $printer->{SPOOLER} eq "cups" && 
-	(-x "$::prefix/usr/bin/curl" || -x "$::prefix/usr/bin/wget")) {
-	my @printerlist = printer::cups::get_remote_queues();
-	foreach my $listentry (@printerlist) {
-	    next unless $listentry =~ /^([^\|]+)\|([^\|]+)$/;
-	    my $queue = $1;
-	    my $server = $2;
-	    if (-x "$::prefix/usr/bin/wget") {
-		eval(run_program::rooted(
-		      $::prefix, "/usr/bin/wget", "-O",
-		      "/etc/foomatic/$queue.ppd",
-		      "http://$server:631/printers/$queue.ppd"));
-	    } else {
-		eval(run_program::rooted(
-		      $::prefix, "/usr/bin/curl", "-o",
-		      "/etc/foomatic/$queue.ppd",
-		      "http://$server:631/printers/$queue.ppd"));
-	    }
-	    if (-r "$::prefix/etc/foomatic/$queue.ppd") {
-		$configfilecontent =
-		    $suites->{$suite}{make}($printer, $queue, 
-					    $configprefix,
-					    $configfilecontent);
-	    }
-	}
-    }
-    # Update local printer queues
-    foreach my $queue (keys(%{$printer->{configured}})) {
-	# Check if we have a PPD file
-	if (! -r "$::prefix/etc/foomatic/$queue.ppd") {
-	    if (-r "$::prefix/etc/cups/ppd/$queue.ppd") {
-		# If we have a PPD file in the CUPS config dir, link to it
-		run_program::rooted($::prefix, 
-				    "ln", "-sf",
-				    "/etc/cups/ppd/$queue.ppd",
-				    "/etc/foomatic/$queue.ppd");
-	    } elsif (-r "$::prefix/usr/share/postscript/ppd/$queue.ppd") {
-		# Check PPD directory of GPR, too
-		run_program::rooted($::prefix, 
-				    "ln", "-sf",
-				    "/usr/share/postscript/ppd/$queue.ppd",
-				    "/etc/foomatic/$queue.ppd");
-	    } else {
-		# No PPD file at all? We cannot set up this printer
-		next;
-	    }
-	}
-	$configfilecontent = 
-	    $suites->{$suite}{make}($printer, $queue, $configprefix,
-				    $configfilecontent);
-    }
-    # Patch PostScript output to print Euro symbol correctly also for
-    # the "Generic Printer"
-    my @parameters = @{$suites->{$suite}{param}};
-    $configfilecontent = removeentry($parameters[0], $parameters[1],
-				     $configfilecontent);
-    $configfilecontent =
-	addentry($parameters[0],
-		 $parameters[1] . $suites->{$suite}{perl} . 
-		 $spoolers{$printer->{SPOOLER}}{print_gui},
-		 $configfilecontent);
-    # Write back Star Office configuration file
-    return eval { output("$::prefix$configfilename", $configfilecontent) };
-}
-
-sub add_cups_remote_to_office {
-    my ($suite, $printer, $queue) = @_;
-    # Do we have Star Office installed?
-    my $configfilename = find_config_file($suite);
-    return 1 unless $configfilename;
-    my $configprefix = $1 if $configfilename =~ m!$suites->{$suite}{file_name}!;
-    # Load Star Office printer config file
-    my $configfilecontent = cat_("$::prefix$configfilename");
-    # Update remote CUPS queues
-    if ($printer->{SPOOLER} eq "cups" && 
-	(-x "$::prefix/usr/bin/curl" || -x "$::prefix/usr/bin/wget")) {
-	my @printerlist = printer::cups::get_remote_queues();
-	foreach my $listentry (@printerlist) {
-	    next unless $listentry =~ /^([^\|]+)\|([^\|]+)$/;
-	    my $q = $1;
-	    next if $q ne $queue;
-	    my $server = $2;
-	    # Remove server name from queue name
-	    $q =~ s/^([^@]*)@.*$/$1/;
-	    if (-x "$::prefix/usr/bin/wget") {
-		eval(run_program::rooted(
-		      $::prefix, "/usr/bin/wget", "-O",
-		      "/etc/foomatic/$queue.ppd",
-		      "http://$server:631/printers/$q.ppd"));
-	    } else {
-		eval(run_program::rooted(
-		      $::prefix, "/usr/bin/curl", "-o",
-		      "/etc/foomatic/$queue.ppd",
-		      "http://$server:631/printers/$q.ppd"));
-	    }
-	    # Does the file exist and is it not an error message?
-	    if (-r "$::prefix/etc/foomatic/$queue.ppd" &&
-		cat_("$::prefix/etc/foomatic/$queue.ppd") =~
-		/^\*PPD-Adobe/) {
-		$configfilecontent = 
-		    $suites->{$suite}{make}($printer, $queue,
-					    $configprefix,
-					    $configfilecontent);
-	    } else {
-		unlink "$::prefix/etc/foomatic/$queue.ppd";
-		return 0;
-	    }
-	    last if $suite eq 'Star Office';
-	}
-    }
-    # Write back Star Office configuration file
-    return eval { output("$::prefix$configfilename", $configfilecontent) };
-}
-
-sub remove_printer_from_office {
-    my ($suite, $printer, $queue) = @_;
-    # Do we have Star Office installed?
-    my $configfilename = find_config_file($suite);
-    return 1 unless $configfilename;
-    my $configprefix = $1 if $configfilename =~ m!$suites->{$suite}{file_name}!;
-    # Load Star Office printer config file
-    my $configfilecontent = cat_("$::prefix$configfilename");
-    # Remove the printer entry
-    $configfilecontent =
-	$suites->{$suite}{remove}($printer, $queue, $configprefix,
-				  $configfilecontent);
-    # Write back Star Office configuration file
-    return eval { output("$::prefix$configfilename", $configfilecontent) };
-}
-
-sub remove_local_printers_from_office {
-    my ($suite, $printer) = @_;
-    # Do we have Star Office installed?
-    my $configfilename = find_config_file($suite);
-    return 1 unless $configfilename;
-    my $configprefix = $1 if $configfilename =~ m!$suites->{$suite}{file_name}!;
-    # Load Star Office printer config file
-    my $configfilecontent = cat_("$::prefix$configfilename");
-    # Remove the printer entries
-    foreach my $queue (keys(%{$printer->{configured}})) {
-	$configfilecontent = 
-	    $suites->{$suite}{remove}($printer, $queue, $configprefix,
-				      $configfilecontent);
-    }
-    # Write back Star Office configuration file
-    return eval { output("$::prefix$configfilename", $configfilecontent) };
-}
-
-
-sub makestarofficeprinterentry {
-    my ($printer, $queue, $configprefix, $configfile) = @_;
-    # Set default printer
-    if ($queue eq $printer->{DEFAULT}) {
-	$configfile = removeentry("windows", "device=", $configfile);
-	$configfile = addentry("windows", 
-			       "device=$queue,$queue PostScript,$queue",
-			       $configfile);
-    }
-    # Make an entry in the "[devices]" section
-    $configfile = removeentry("devices", "$queue=", $configfile);
-    $configfile = addentry("devices", 
-			   "$queue=$queue PostScript,$queue",
-			   $configfile);
-    # Make an entry in the "[ports]" section
-    # The "perl" command patches the PostScript output to print the Euro
-    # symbol correctly.
-    $configfile = removeentry("ports", "$queue=", $configfile);
-    $configfile = addentry("ports", 
-			   qq($queue=/usr/bin/perl -p -e "s=16#80 /euro=16#80 /Euro=" | /usr/bin/) . $spoolers{$printer->{SPOOLER}}{print_command} . " -P $queue",
-			   $configfile);
-    # Make printer's section
-    $configfile = addsection("$queue,PostScript,$queue", $configfile);
-    # Load PPD file
-    my $ppd = cat_("$::prefix/etc/foomatic/$queue.ppd");
-    # Set the PostScript level
-    my $pslevel;
-    if ($ppd =~ /^\s*\*LanguageLevel:\s*\"?([^\s\"]+)\"?\s*$/m) {
-	$pslevel = $1;
-	$pslevel = "2" if $pslevel eq "3";
-    } else { $pslevel = "2" }
-    $configfile = removeentry("$queue.PostScript.$queue",
-			      "Level=", $configfile);
-    $configfile = addentry("$queue.PostScript.$queue", 
-			   "Level=$pslevel", $configfile);
-    # Set Color/BW
-    my $color = $ppd =~ /^\s*\*ColorDevice:\s*\"?([Tt]rue)\"?\s*$/m ? "1" : "0";
-    $configfile = removeentry("$queue.PostScript.$queue", "BitmapColor=", $configfile);
-    $configfile = addentry("$queue.PostScript.$queue", "BitmapColor=$color", $configfile);
-    # Set the default paper size
-    if ($ppd =~ /^\s*\*DefaultPageSize:\s*(\S+)\s*$/m) {
-	my $papersize = $1;
-	$configfile = removeentry("$queue.PostScript.$queue", "PageSize=", $configfile);
-	$configfile = removeentry("$queue.PostScript.$queue", "PPD_PageSize=", $configfile);
-	$configfile = addentry("$queue.PostScript.$queue", "PageSize=$papersize", $configfile);
-	$configfile = addentry("$queue.PostScript.$queue", "PPD_PageSize=$papersize", $configfile);
-    }
-    # Link the PPD file
-    run_program::rooted($::prefix, 
-			"ln", "-sf", "/etc/foomatic/$queue.ppd", 
-			"$configprefix/share/xp3/ppds/$queue.PS");
-    return $configfile;
-}
-
-sub makeopenofficeprinterentry {
-    my ($printer, $queue, $configprefix, $configfile) = @_;
-    # Make printer's section
-    $configfile = addsection($queue, $configfile);
-    # Load PPD file
-    my $ppd = cat_("$::prefix/etc/foomatic/$queue.ppd");
-    # "PPD_PageSize" line
-    if ($ppd =~ /^\s*\*DefaultPageSize:\s*(\S+)\s*$/m) {
-	my $papersize = $1;
-	$configfile = removeentry($queue,
-				  "PPD_PageSize=", $configfile);
-	$configfile = addentry($queue, 
-			       "PPD_PageSize=$papersize", $configfile);
-    }
-    # "Command" line
-    # The "perl" command patches the PostScript output to print the Euro
-    # symbol correctly.
-    $configfile = removeentry($queue, "Command=", $configfile);
-    $configfile = addentry($queue, 
-			   qq(Command=/usr/bin/perl -p -e "s=/euro /unused=/Euro /unused=" | /usr/bin/) . $spoolers{$printer->{SPOOLER}}{print_command} . " -P $queue",
-			   $configfile);
-    # "Comment" line 
-    $configfile = removeentry($queue, "Comment=", $configfile);
-    if ($printer->{configured}{$queue} &&
-	$printer->{configured}{$queue}{queuedata}{desc}) {
-	$configfile = addentry(
-	     $queue, 
-	     "Comment=$printer->{configured}{$queue}{queuedata}{desc}",
-	     $configfile);
-    } else {
-	$configfile = addentry($queue, 
-			       "Comment=",
-			       $configfile);
-    }
-    # "Location" line 
-    $configfile = removeentry($queue, "Location=", $configfile);
-    if ($printer->{configured}{$queue} &&
-	$printer->{configured}{$queue}{queuedata}{loc}) {
-	$configfile = addentry(
-	     $queue, 
-	     "Location=$printer->{configured}{$queue}{queuedata}{loc}",
-	     $configfile);
-    } else {
-	$configfile = addentry($queue, "Location=", $configfile);
-    }
-    # "DefaultPrinter" line
-    $configfile = removeentry($queue, "DefaultPrinter=", $configfile);
-    my $default = "0";
-    if ($queue eq $printer->{DEFAULT}) {
-	$default = "1";
-	# "DefaultPrinter=0" for the "Generic Printer"
-	$configfile = removeentry("Generic Printer", "DefaultPrinter=",
-				  $configfile);
-	$configfile = addentry("Generic Printer", 
-			       "DefaultPrinter=0",
-			       $configfile);	
-    }
-    $configfile = addentry($queue, "DefaultPrinter=$default", $configfile);
-    # "Printer" line 
-    $configfile = removeentry($queue, "Printer=", $configfile);
-    $configfile = addentry($queue, "Printer=$queue/$queue", $configfile);
-    # Link the PPD file
-    run_program::rooted($::prefix, 
-			"ln", "-sf", "/etc/foomatic/$queue.ppd", 
-			"$configprefix/share/psprint/driver/$queue.PS");
-    return $configfile;
-}
-
-sub removestarofficeprinterentry {
-    my ($_printer, $queue, $configprefix, $configfile) = @_;
-    # Remove default printer entry
-    $configfile = removeentry("windows", "device=$queue,", $configfile);
-    # Remove entry in the "[devices]" section
-    $configfile = removeentry("devices", "$queue=", $configfile);
-    # Remove entry in the "[ports]" section
-    $configfile = removeentry("ports", "$queue=", $configfile);
-    # Remove "[$queue,PostScript,$queue]" section
-    $configfile = removesection("$queue,PostScript,$queue", $configfile);
-    # Remove Link of PPD file
-    run_program::rooted($::prefix, 
-			"rm", "-f", 
-			"$configprefix/share/xp3/ppds/$queue.PS");
-    return $configfile;
-}
-
-sub removeopenofficeprinterentry {
-    my ($_printer, $queue, $configprefix, $configfile) = @_;
-    # Remove printer's section
-    $configfile = removesection($queue, $configfile);
-    # Remove Link of PPD file
-    run_program::rooted($::prefix, 
-			"rm", "-f", 
-			"$configprefix/share/psprint/driver/$queue.PS");
-    return $configfile;
-}
-
-sub find_config_file {
-    my ($suite) = @_;
-    my $configfilenames = $suites->{$suite}{files};
-    foreach my $configfilename (@$configfilenames) {
-	local *F;
-	if (open F, "ls -r $::prefix$configfilename 2> /dev/null |") {
-	    my $filename = <F>;
-	    close F;
-	    if ($filename) {
-		$filename =~ s/^$::prefix// if $::prefix;
-		# Work around a bug in the "ls" of "busybox". During
-		# installation it outputs the mask given on the command line
-		# instead of nothing when the mask does not match any file
-		next if $filename =~ /\*/;
-		return $filename;
-	    }
-	}
-    }
-    return "";
-}
-
-sub writesofficeconfigfile {
-    my ($file, $filecontent) = @_;
-    eval { output("$::prefix$file", $filecontent) };
-}
-
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 0eb075250..117f74140 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -14,23 +14,26 @@ use printer::detect;
 use printer::default;
 use printer::data;
 
-my $companyname = "Mandrakesoft";
-my $distroname = "Mandrakelinux";
-my $shortdistroname = "Mandrakelinux";
-my $domainname = "mandrakesoft.com";
+# Overtake translation for "(recommended)" from printer/main.pm
+my $recstr = $printer::main::recstr;
+my $precstr = $printer::main::precstr;
+my $sprecstr = $printer::main::sprecstr;
 
-my $hp1000fwtext = N("The HP LaserJet 1000 needs its firmware to be uploaded after being turned on. Download the Windows driver package from the HP web site (the firmware on the printer's CD does not work) and extract the firmware file from it by uncompresing the self-extracting '.exe' file with the 'unzip' utility and searching for the 'sihp1000.img' file. Copy this file into the '/etc/printer' directory. There it will be found by the automatic uploader script and uploaded whenever the printer is connected and turned on.
+my $shortdistroname = "Mandriva Linux";
+
+my $hp1000fwtext = N("The HP LaserJet 1000 needs its firmware to be uploaded after being turned on. Download the Windows driver package from the HP web site (the firmware on the printer's CD does not work) and extract the firmware file from it by decompressing the self-extracting '.exe' file with the 'unzip' utility and searching for the 'sihp1000.img' file. Copy this file into the '/etc/printer' directory. There it will be found by the automatic uploader script and uploaded whenever the printer is connected and turned on.
 ");
 
 1;
 
 sub config_cups {
-    my ($printer, $in, $upNetwork) = @_;
+    my ($printer, $security, $in, $upNetwork) = @_;
 
     local $::isWizard = 0;
+    local $::isEmbedded = 0;
     # Check whether the network functionality is configured and
     # running
-    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };
+    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 }
 
     #$in->set_help('configureRemoteCUPSServer') if $::isInstall;
     #- hack to handle cups remote server printing,
@@ -42,6 +45,9 @@ sub config_cups {
     @{$printer->{cupsconfig}{cupsd_conf}} =
 	printer::main::read_cupsd_conf();
     printer::main::read_cups_config($printer);
+    # Read client.conf file
+    my ($daemonless_cups, $remote_cups_server) =
+	printer::main::read_client_conf();
     # Read state of japanese text printing mode
     my $jap_textmode = printer::main::get_jap_textmode();
     # Read state for auto-correction of cupsd.conf
@@ -56,8 +62,7 @@ sub config_cups {
 	my $browsepoll = printer::main::makebrowsepolllist($printer);
 	my $buttonclicked;
 	#- Show dialog
-	if ($in->ask_from_
-	    (
+	if ($in->ask_from_(
 	     { 
 		 title => N("CUPS printer configuration"),
 		 messages => N("Here you can choose whether the printers connected to this machine should be accessible by remote machines and by which remote machines.") .
@@ -65,9 +70,15 @@ sub config_cups {
 	     },
 	     [
 	      { text => N("The printers on this machine are available to other computers"), type => 'bool',
-		val => \$printer->{cupsconfig}{localprintersshared} },
+		val => \$printer->{cupsconfig}{localprintersshared},
+		disabled => sub {
+		    $daemonless_cups;
+		} },
 	      { text => N("Automatically find available printers on remote machines"), type => 'bool',
-		val => \$printer->{cupsconfig}{remotebroadcastsaccepted} },
+		val => \$printer->{cupsconfig}{remotebroadcastsaccepted},
+		disabled => sub {
+		    $daemonless_cups;
+		} },
 	      { val => N("Printer sharing on hosts/networks: ") .
 		    ($printer->{cupsconfig}{customsharingsetup} ?
 		     N("Custom configuration") :
@@ -82,8 +93,9 @@ sub config_cups {
 		    1;
 		},
 		disabled => sub {
-		    (!$printer->{cupsconfig}{localprintersshared} &&
-		     !$printer->{cupsconfig}{remotebroadcastsaccepted});
+		    $daemonless_cups ||
+		    !$printer->{cupsconfig}{localprintersshared} &&
+		     !$printer->{cupsconfig}{remotebroadcastsaccepted};
 		} },
 	      { val => N("Additional CUPS servers: ") .
 		     ($#{$browsepoll->{list}} >= 0 ?
@@ -96,11 +108,17 @@ sub config_cups {
 		clicked_may_quit => sub {
 		    $buttonclicked = "browsepoll";
 		    1;
+		},
+		disabled => sub {
+		    $daemonless_cups;
 		} },
 	      { text => N("Japanese text printing mode"),
-		help => N("Turning on this allows to print plain text files in japanese language. Only use this function if you really want to print text in japanese, if it is activated you cannot print accentuated characters in latin fonts any more and you will not be able to adjust the margins, the character size, etc. This setting only affects printers defined on this machine. If you want to print japanese text on a printer set up on a remote machine, you have to activate this function on that remote machine."),
+		help => N("Turning on this allows to print plain text files in Japanese language. Only use this function if you really want to print text in Japanese, if it is activated you cannot print accentuated characters in latin fonts any more and you will not be able to adjust the margins, the character size, etc. This setting only affects printers defined on this machine. If you want to print Japanese text on a printer set up on a remote machine, you have to activate this function on that remote machine."),
 		type => 'bool',
-		val => \$jap_textmode },
+		val => \$jap_textmode, 
+		disabled => sub {
+		    $daemonless_cups;
+		} },
 	      if_($printer->{expert},
 		  { text => N("Automatic correction of CUPS configuration"),
 		    type => 'bool',
@@ -113,7 +131,22 @@ sub config_cups {
 - when printer information is broadcasted, it does not contain \"localhost\" as the server name.
 
 If some of these measures lead to problems for you, turn this option off, but then you have to take care of these points."),
-		    val => \$printer->{cupsconfig}{autocorrection} }),
+		    val => \$printer->{cupsconfig}{autocorrection},
+                    disabled => sub {
+			$daemonless_cups;
+		    } }),
+	      { val => N("Remote CUPS server and no local CUPS daemon") .
+		    ": " .
+		    ($daemonless_cups ? 
+		     N("On") . "; " . N("Server") . ": " . 
+		     $remote_cups_server :
+		     N("Off")),
+		help => N("In this mode the local CUPS daemon will be stopped and all printing requests go directly to the server specified below. Note that it is not possible to define local print queues then and if the specified server is down it cannot be printed at all from this machine."),
+		type => 'button',
+		clicked_may_quit => sub {
+		    $buttonclicked = "daemonlesscups";
+		    1;
+		} },
 	      ]
 	     )
 	    ) {
@@ -124,8 +157,7 @@ If some of these measures lead to problems for you, turn this option off, but th
 		while (!$subdone) {
 		    # Entry should be edited when double-clicked
 		    $buttonclicked = "edit";
-		    $in->ask_from_
-			(
+		    $in->ask_from_(
 			 { title => N("Sharing of local printers"),
 			   messages => N("These are the machines and networks on which the locally connected printer(s) should be available:"),
 			   ok => "",
@@ -151,7 +183,7 @@ If some of these measures lead to problems for you, turn this option off, but th
 				 1; 
 			     },
 			     disabled => sub {
-				 return ($#{$sharehosts->{list}} < 0);
+				 return $#{$sharehosts->{list}} < 0;
 			     } },
 			   { val => N("Remove selected host/network"), 
 			     type => 'button',
@@ -160,7 +192,7 @@ If some of these measures lead to problems for you, turn this option off, but th
 				 1; 
 			     },
 			     disabled => sub {
-				 return ($#{$sharehosts->{list}} < 0);
+				 return $#{$sharehosts->{list}} < 0;
 			     } },
 			   { val => N("Done"), 
 			     type => 'button',
@@ -200,8 +232,7 @@ If some of these measures lead to problems for you, turn this option off, but th
 			my $oldaddress = 
 			    ($buttonclicked eq "edit" ?
 			     $sharehosts->{invhash}{$choice} : "");
-			if ($in->ask_from_
-			    (
+			if ($in->ask_from_(
 			     { title => N("Sharing of local printers"),
 			       messages => N("Choose the network or host on which the local printers should be made available:"),
 			       callbacks => {
@@ -211,7 +242,7 @@ If some of these measures lead to problems for you, turn this option off, but th
 					   $ip =~ /^\s*$/) {
 					   
 					   $in->ask_warn(N("Error"), N("Host/network IP address missing."));
-					   return (1,1);
+					   return 1, 1;
 				       }
 				       if ($hostchoice eq 
 					    N("IP address of host/network:") &&
@@ -226,7 +257,7 @@ N("Examples for correct IPs:\n") .
   "192.168.100.0/24\n" .
   "192.168.100.0/255.255.255.0\n"
 );
-					   return (1,1);
+					   return 1, 1;
 				       }
 				       if ($hostchoice eq $menu[0]) {
 					   $address = '@LOCAL';
@@ -246,9 +277,9 @@ N("Examples for correct IPs:\n") .
 							 N("This host/network is already in the list, it cannot be added again.\n"));
 					   if ($hostchoice eq 
 					       N("IP address of host/network:")) {
-					       return (1,1);
+					       return 1, 1;
 					   } else {
-					       return (1,0);
+					       return 1, 0;
 					   }
 				       }
 				       return 0;
@@ -311,8 +342,7 @@ N("Examples for correct IPs:\n") .
 		while (!$subdone) {
 		    # Entry should be edited when double-clicked
 		    $buttonclicked = "edit";
-		    $in->ask_from_
-			(
+		    $in->ask_from_(
 			 { title => N("Accessing printers on remote CUPS servers"),
 			   messages => N("Add here the CUPS servers whose printers you want to use. You only need to do this if the servers do not broadcast their printer information into the local network."),
 			   ok => "",
@@ -338,7 +368,7 @@ N("Examples for correct IPs:\n") .
 				 1; 
 			     },
 			     disabled => sub {
-				 return ($#{$browsepoll->{list}} < 0);
+				 return $#{$browsepoll->{list}} < 0;
 			     } },
 			   { val => N("Remove selected server"), 
 			     type => 'button',
@@ -347,7 +377,7 @@ N("Examples for correct IPs:\n") .
 				 1; 
 			     },
 			     disabled => sub {
-				 return ($#{$browsepoll->{list}} < 0);
+				 return $#{$browsepoll->{list}} < 0;
 			     } },
 			   { val => N("Done"), 
 			     type => 'button',
@@ -382,8 +412,7 @@ N("Examples for correct IPs:\n") .
 			my $oldaddress = 
 			    ($buttonclicked eq "edit" ?
 			     $browsepoll->{invhash}{$choice} : "");
-			if ($in->ask_from_
-			    (
+			if ($in->ask_from_(
 			     { title => N("Accessing printers on remote CUPS servers"),
 			       messages => N("Enter IP address and port of the host whose printers you want to use.") . ' ' .
 				   N("If no port is given, 631 will be taken as default."),
@@ -391,7 +420,7 @@ N("Examples for correct IPs:\n") .
 				   complete => sub {
 				       if ($ip =~ /^\s*$/) {
 					   $in->ask_warn(N("Error"), N("Server IP missing!"));
-					   return (1,0);
+					   return 1, 0;
 				       }
 				       if ($ip !~ 
 					   /^\s*(\d+\.\d+\.\d+\.\d+)\s*$/) {
@@ -401,7 +430,7 @@ N("Examples for correct IPs:\n") .
   "192.168.100.194\n" .
   "10.0.0.2\n"
 );
-					   return (1,0);
+					   return 1, 0;
 				       } else {
 					   $ip = $1;
 				       }
@@ -409,7 +438,7 @@ N("Examples for correct IPs:\n") .
 					   $port = '631';
 				       } elsif ($port !~ /^\s*(\d+)\s*$/) {
 					   $in->ask_warn(N("Error"), N("The port number should be an integer!"));
-					   return (1,1);
+					   return 1, 1;
 				       } else {
 					   $port = $1;
 				       }
@@ -420,7 +449,7 @@ N("Examples for correct IPs:\n") .
 						  @{$printer->{cupsconfig}{BrowsePoll}})) {
 					   $in->ask_warn(N("Error"), 
 							 N("This server is already in the list, it cannot be added again.\n"));
-					   return (1,0);
+					   return 1, 0;
 				       }
 				       return 0;
 				   },
@@ -460,6 +489,53 @@ N("Examples for correct IPs:\n") .
 			    printer::main::makebrowsepolllist($printer);
 		    }
 		}
+	    } elsif ($buttonclicked eq "daemonlesscups") {
+		my ($modechoice, $rserver);
+		if ($daemonless_cups) {
+		    $modechoice = N("On, Name or IP of remote server:");
+		    $rserver = $remote_cups_server;
+		} else {
+		    $modechoice = N("Off");
+		}
+		# Show the dialog
+		#my $address;
+		#my $oldaddress = 
+		#    ($buttonclicked eq "edit" ?
+		#     $sharehosts->{invhash}{$choice} : "");
+		if ($in->ask_from_
+		    ({ title => N("Remote CUPS server and no local CUPS daemon"),
+		       messages => N("In this mode the local CUPS daemon will be stopped and all printing requests go directly to the server specified below. Note that it is not possible to define local print queues then and if the specified server is down it cannot be printed at all from this machine."),
+		       callbacks => {
+			   complete => sub {
+			       if ($modechoice eq 
+				   N("On, Name or IP of remote server:") &&
+				   $rserver =~ /^\s*$/) {
+				   
+				   $in->ask_warn(N("Error"), N("CUPS server name or IP address missing."));
+				   return 1, 1;
+			       }
+			       return 0;
+			   },
+		       },
+		   },
+		     # Show the widgets
+		     [ { val => \$modechoice, format => \&translate,
+			 type => 'list',
+			 sort => 0,
+			 list => [ N("Off"),
+				   N("On, Name or IP of remote server:") ] },
+		       { val => \$rserver, 
+			 disabled => sub {
+			     $modechoice ne 
+				 N("On, Name or IP of remote server:");
+			 } },
+		       ],
+		     )) {
+		    # OK was clicked, update the data
+		    $daemonless_cups = 
+			$modechoice eq N("On, Name or IP of remote server:");
+		    $remote_cups_server = $rserver;
+		}
 	    } else {
 		# We have clicked "OK"
 		$retvalue = 1;
@@ -467,18 +543,52 @@ N("Examples for correct IPs:\n") .
 		# Write state for auto-correction of cupsd.conf
 		if ($oldautocorr != 
 		    $printer->{cupsconfig}{autocorrection}) {
-		    printer::main::set_cups_autoconf
-			($printer->{cupsconfig}{autocorrection});
+		    printer::main::set_cups_autoconf(
+			$printer->{cupsconfig}{autocorrection});
 		}
 		# Write state of japanese text printing mode
 		printer::main::set_jap_textmode($jap_textmode);
+		# Switch state of daemon-less CUPS mode and write
+		# client.conf
+		if ($daemonless_cups && $printer->{SPOOLER} ne "rcups" ||
+		    !$daemonless_cups && $printer->{SPOOLER} eq "rcups") {
+		    my $oldspooler = $printer->{SPOOLER};
+		    $printer->{SPOOLER} = ($daemonless_cups ? 
+					  "rcups" : "cups");
+		    if (install_spooler($printer, $security, $in->do_pkgs, $in, $upNetwork, 1)) {
+			printer::default::set_spooler($printer);
+			printer::main::write_client_conf
+			    ($daemonless_cups, $remote_cups_server);
+			$printer->{remote_cups_server} =
+			    $remote_cups_server;
+			# Get the queues of this spooler
+			my $w = $in->wait_message
+			    (N("Printerdrake"),
+			     N("Reading printer data..."));
+			printer::main::read_configured_queues($printer);
+			undef $w;
+			# Re-read the printer database next time
+			%printer::main::thedb = ();
+			assure_default_printer_is_set($printer, $in);
+		    } else {
+			$printer->{SPOOLER} = $oldspooler;
+		    }
+		} elsif ($daemonless_cups) {
+		    printer::main::write_client_conf($daemonless_cups,
+						     $remote_cups_server);
+		    $printer->{remote_cups_server} = $remote_cups_server;
+		} else {
+		    undef $printer->{remote_cups_server};
+		}
 		# Write cupsd.conf
 		printer::main::write_cups_config($printer);
 		my $w = 
 		    $in->wait_message(N("Printerdrake"),
 				      N("Restarting CUPS..."));
-		printer::main::write_cupsd_conf
-		    (@{$printer->{cupsconfig}{cupsd_conf}});
+		printer::main::write_cupsd_conf(
+		    @{$printer->{cupsconfig}{cupsd_conf}});
+		#- restart cups after updating configuration.
+		printer::main::SIGHUP_daemon($printer->{SPOOLER});
 		undef $w;
 	    }
 	} else {
@@ -490,6 +600,137 @@ N("Examples for correct IPs:\n") .
     return $retvalue;
 }
 
+sub config_auto_admin {
+    my ($printer, $in) = @_;
+
+    local $::isWizard = 0;
+    local $::isEmbedded = 0;
+
+    # Read current configuration
+    printer::main::get_auto_admin($printer);
+
+    # Configuration dialog
+    my $waitforgui =
+	N("Allow pop-up windows, printer setup and package installation may be canceled");
+    my $nogui =
+	N("No pop-up windows, printer setup and package installation cannot be canceled");
+    my $autoqueuesetupmode =
+	($printer->{autoqueuesetupgui} && -x "$::prefix/usr/X11R6/bin/X") ? 
+	$waitforgui : $nogui;
+    if ($in->ask_from_
+	({ 
+	    title => N("Printer auto administration"),
+	    messages => N("Here you can configure printer administration tasks which should be done automatically."),
+	     },
+	     [
+	      { val => N("Do automatic configuration of new printers") },
+#	      { text => N("when a USB printer is connected and turned on"), 
+#		type => 'bool',
+#		val => \$printer->{autoqueuesetuponnewprinter} },
+	      { text => N("when Printerdrake is started"), 
+		type => 'bool',
+		val => \$printer->{autoqueuesetuponstart} },
+	      if_(-x "$::prefix/usr/X11R6/bin/X", 
+		  { val => N("Mode for automatic printer setup:") }),
+	      { val => \$autoqueuesetupmode,
+		list => [ if_(-x "$::prefix/usr/X11R6/bin/X", $waitforgui), 
+			  $nogui ], 
+		not_edit => 1, sort => 0,
+		type => 'list' },
+#	      { val => N("Re-enable disabled printers") },
+#	      { text => N("when a USB printer is connected and turned on"), 
+#		type => 'bool',
+#		val => \$printer->{enablequeuesonnewprinter} },
+#	      { text => N("when the printing system is started"), 
+#		type => 'bool',
+#		val => \$printer->{enablequeuesonspoolerstart} },
+	      ]
+	     )
+	    ) {
+	# Auto queue setup mode
+	$printer->{autoqueuesetupgui} =
+	    ($autoqueuesetupmode eq $waitforgui ? 1 : 0);
+	# Save new settings
+	printer::main::set_auto_admin($printer);
+	return 1;
+    } else {
+	# Reset original settings
+	printer::main::get_auto_admin($printer);
+	return 0;
+    }
+}
+
+sub config_backend_error_handling {
+    my ($printer, $in) = @_;
+
+    local $::isEmbedded = 0;
+
+    # Get currentconfiguration
+    my $dontdisable = $printer->{currentqueue}{dd};
+    my $infiniteretries = ($printer->{currentqueue}{att} == 0);
+    my $retries = ($printer->{currentqueue}{att} != 0 ?
+		   $printer->{currentqueue}{att} : 1);
+    my $delay = $printer->{currentqueue}{delay};
+    my $queue = $printer->{currentqueue}{queue};
+
+    # Configuration dialog
+    if ($in->ask_from_
+	({ 
+	    title =>
+		N("Communication error handling for the printer \"%s\"",
+		  $queue),
+	    messages => N("Here you can configure how errors during the communication between your computer and the printer \"%s\" should be handled (for example if the printer is not turned on).", $queue),
+	    callbacks => {
+		complete => sub {
+		    unless (($retries =~ /^[0-9]+$/) && ($retries > 0)) {
+			$in->ask_warn(N("Error"), N("The number of retries should be an integer number of at least 1!"));
+			return 1, 0;
+		    }
+		    unless ($delay =~ /^[0-9]+$/) {
+			$in->ask_warn(N("Error"), N("The delay between retries should be a positive integer number!"));
+			return 1, 1;
+		    }
+		    return 0;
+		},
+		changed => sub {
+		    return 0;
+		}
+	    }
+	     },
+	     [
+	      { text => N("Do not disable the printer"), 
+		type => 'bool',
+		val => \$dontdisable },
+	      { text => N("Retry infinitely often"), 
+		type => 'bool',
+		val => \$infiniteretries },
+	      { val => N("Number of retries") }, 
+	      { val => \$retries, 
+		disabled => sub {
+		    $infiniteretries;
+		} },
+	      { val => N("Delay between retries (in sec)") }, 
+	      { val => \$delay, 
+		disabled => sub {
+		    ($retries eq 1) && !$infiniteretries;
+		} },
+	      ]
+	     )
+	    ) {
+	# Apply new settings
+	$dontdisable = "0" if $dontdisable eq "";
+	$retries = "0" if $retries eq "";
+	$delay = "0" if $delay eq "";
+	$printer->{currentqueue}{dd} = $dontdisable;
+	$printer->{currentqueue}{att} =
+	    ($infiniteretries ? "0" : $retries);
+	$printer->{currentqueue}{delay} = $delay;
+	return 1;
+    } else {
+	return 0;
+    }
+}
+
 sub choose_printer_type {
     my ($printer, $in, $upNetwork) = @_;
     my $havelocalnetworks = check_network($printer, $in, $upNetwork, 1) &&
@@ -497,15 +738,17 @@ sub choose_printer_type {
     $printer->{str_type} = $printer_type_inv{$printer->{TYPE}};
     my $autodetect = 0;
     $autodetect = 1 if $printer->{AUTODETECT};
+    my $timeout = 4000;
+    $timeout = $printer->{TIMEOUT} if defined($printer->{TIMEOUT});
     my @printertypes = printer::main::printer_type($printer);
     $in->ask_from_(
 		   { title => N("Select Printer Connection"),
 		     messages => N("How is the printer connected?") .
 			 if_($printer->{SPOOLER} eq "cups",
-			  N("
+			     N("
 Printers on remote CUPS servers do not need to be configured here; these printers will be automatically detected.")) .
-			 if_(!$havelocalnetworks,
-			  N("\nWARNING: No local network connection active, remote printers can neither be detected nor tested!")),
+                          if_(!$havelocalnetworks,
+			      N("\nWARNING: No local network connection active, remote printers can neither be detected nor tested!")),
 		     },
 		   [
 		    { val => \$printer->{str_type},
@@ -513,9 +756,31 @@ Printers on remote CUPS servers do not need to be configured here; these printer
 		      not_edit => 1, sort => 0,
 		      type => 'list' },
 		    { text => N("Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"),
-		      type => 'bool', val => \$autodetect }
-		    ]
+		      type => 'bool', val => \$autodetect },
+		    { val => N("Modify timeout for network printer auto-detection") ,
+		      type => 'button',
+		      clicked_may_quit => sub {
+			  local $::isWizard = 0;
+			  $in->ask_from_
+			      ({ title => N("Select Printer Connection"),
+				 messages => N("Enter the timeout for network printer auto-detection (in msec) here. ") .
+				     "\n\n" .
+				     N("The longer you choose the timeout, the more reliable the detections of network printers will be, but the scan can take longer then, especially if there are many machines with local firewalls in the network. "),
+				 callbacks => {
+				     complete => sub {
+					 if ($timeout !~ /^[0-9]+$/) {
+					     $in->ask_warn(N("Error"), N("The timeout must be a positive integer number!"));
+					     return 1, 0;
+					 }
+					 return 0;
+				     }
+				 } },
+			       [ { val => \$timeout } ]);
+			  0; 
+		      } },
+		    ],
 		   ) or return 0;
+    $printer->{TIMEOUT} = $timeout;
     $printer->{AUTODETECT} = $autodetect ? 1 : undef;
     $printer->{TYPE} = $printer_type{$printer->{str_type}};
     1;
@@ -540,18 +805,21 @@ sub setup_printer_connection {
 
 sub first_time_dialog {
     my ($printer, $in, $upNetwork) = @_;
+    local $::isEmbedded = 0;
     return 1 if printer::default::get_spooler() || $::isInstall;
 
     my $w = $in->wait_message(N("Printerdrake"), N("Checking your system..."));
 
-    # Auto-detect local printers   
+    # Auto-detect local printers
     my @autodetected = printer::detect::local_detect();
+    $printer->{AUTODETECTEDLOCALPRINTERSFIRSTTIME} = \@autodetected if @autodetected;
     my $msg = do {
 	if (@autodetected) {
 	    my @printerlist = 
 	      map {
 		  my $entry = $_->{val}{DESCRIPTION};
-		  $entry ||= "$_->{val}{MANUFACTURER} $_->{val}{MODEL}";
+		  $entry = "$_->{val}{MANUFACTURER} $_->{val}{MODEL}"
+		      if (length($entry) < 5) or ($entry !~ /\S+\s+\S+/);
 		  if_($entry, "  -  $entry\n");
 	      } @autodetected;
 	    my $unknown_printers = @autodetected - @printerlist;
@@ -582,11 +850,11 @@ sub first_time_dialog {
 
     # Do we have a local network?
 
-    # If networking is configured, start it, but don't ask the user to
+    # If networking is configured, start it, but do not ask the user to
     # configure networking.
     my $havelocalnetworks = 
 	 check_network($printer, $in, $upNetwork, 1) && 
-	  printer::detect::getIPsInLocalNetworks() != ();
+           printer::detect::getIPsInLocalNetworks() != ();
 
     # Finish building the dialog text
     my $question = ($havelocalnetworks ?
@@ -602,14 +870,46 @@ sub first_time_dialog {
     # Close wait message
     undef $w;
 
-    # Show dialog
-    
-    my $do_it = N("Yes");
-    my $quit = N("Quit");
-    my @choices = ($do_it, $quit);
-    my $choice = $in->ask_from_list(N("Printerdrake"), $dialogtext, 
-				    \@choices, $quit);
-    return ($choice eq $do_it);
+    while (1) {
+	# Show dialog
+	my $donotsetupagain = 0;
+	my $choice;
+	if ($::autoqueue) {
+	    $choice = $in->ask_from_
+		({ 
+		    title => N("Printerdrake"),
+		    messages => $dialogtext,
+		    cancel => N("Quit"),
+		    ok => N("Yes") },
+		 [ { text => N("Do not setup printer automatically now, and never do it again"),
+		     type => 'bool',
+		     val => \$donotsetupagain } ] );
+	    
+	    # Turn off auto queue setup if the user wishes it
+	    turnoffautosetup($printer, $in) if $donotsetupagain;
+
+	    # Now, where the first-time dialog was displayed, all
+	    # subsequent wait messages should be displayed, also if we
+	    # are in GUI auto queue setup mode
+	    undef $::autoqueue;
+
+	    return 0 if !$choice;
+	} else {
+	    my $do_it = N("Yes");
+	    my $quit = N("Quit");
+	    my @choices = ($do_it, $quit);
+	    $choice = $in->ask_from_list(N("Printerdrake"), $dialogtext, 
+					\@choices, $quit);
+	    return 0 if $choice ne $do_it;
+	}
+
+	if ($havelocalnetworks && !@autodetected) {
+	    return set_cups_daemon_mode($printer, $in);
+	} else {
+	    $printer->{SPOOLER} = "cups";
+	    return 1;
+	}
+    }
 }
 
 sub configure_new_printers {
@@ -619,27 +919,17 @@ sub configure_new_printers {
     # there is already a queue for them. If there is no queue for an
     # auto-detected printer, a queue gets set up non-interactively.
 
-    # Experts can have weird things as self-made CUPS backends, so do not
-    # automatically pollute the system with unwished queues in expert
-    # mode
-    return 1 if $printer->{expert};
+    # Stop here if auto queue setup is not selected 
+    return 1 if !($printer->{autoqueuesetuponstart} || $::autoqueue);
     
     # Wait message
-    my $w = $in->wait_message(N("Printerdrake"),
-			       N("Searching for new printers..."));
-
-    # When HPOJ is running, it blocks the printer ports on which it is
-    # configured, so we stop it here. If it is not installed or not 
-    # configured, this command has no effect.
-    require services;
-    services::stop("hpoj");
+    my $w = $::noX || $::autoqueue || 
+	$in->wait_message(N("Printerdrake"),
+			  N("Searching for new printers..."));
 
     # Auto-detect local printers
     my @autodetected = printer::detect::local_detect();
-
-    # We are ready with auto-detection, so we restart HPOJ here. If it 
-    # is not installed or not configured, this command has no effect.
-    services::start("hpoj");
+    $printer->{AUTODETECTEDPRINTERSNONINTERACTIVE} = \@autodetected if @autodetected;
 
     # No printer found? So no need of new queues.
     return 1 if !@autodetected;
@@ -651,20 +941,66 @@ sub configure_new_printers {
 	# Does the URI of this installed queue match one of the autodetected
 	# printers?
 	my $uri = $printer->{configured}{$queue}{queuedata}{connect};
-	my $p = printer::main::autodetectionentry_for_uri
-	    ($uri, @autodetected);
+	my $p = printer::main::autodetectionentry_for_uri(
+	    $uri, @autodetected);
 	if (defined($p)) {
 	    # Blacklist the port
 	    push(@blacklist, $p->{port});
 	}
     }
 
+    my %printerselectedlist;
+    if (!$::noX) {
+	my @widgets;
+	foreach my $p (@autodetected) {
+	    if (!member($p->{port}, @blacklist)) {
+		my $entry = $p->{val}{DESCRIPTION};
+		$entry = "$p->{val}{MANUFACTURER} $p->{val}{MODEL}"
+		    if (length($entry) < 5) or ($entry !~ /\S+\s+\S+/);
+		$entry = N("Unknown model") if $entry !~ /\S/;
+		$entry = N("%s on %s", $entry, $p->{port});
+		$printerselectedlist{$p->{port}} = 1;
+		push (@widgets,
+		      { text => $entry, 
+			type => 'bool',
+			val => \$printerselectedlist{$p->{port}} });
+	    }
+	}
+	# Do not show empty dialog
+	return 1 if $#widgets < 0;
+	my $morethanone = ($#widgets > 0);
+	# Add entry to turn off auto queue setup
+	my $donotsetupagain = 0;
+	push (@widgets, { val => "__________" });
+	push (@widgets, { text =>
+			      N("Do not setup printer automatically again"),
+			  type => 'bool',
+			  val => \$donotsetupagain });
+	undef $w;
+	if ($in->ask_from_
+	    ({ 
+		title => ($morethanone ?
+			  N("New printers found") :
+			  N("New printer found")),
+		messages => ($morethanone ?
+			     N("The following new printers were found and Printerdrake can automatically set them up for you. If you do not want to have all of them set up, unselect the ones which should be skipped, or click \"Cancel\" to set up none of them.\n") :
+			     N("The following new printer was found and printerdrake can automatically set it up for you. If you do not want to have it set up, unselect it, or click \"Cancel\".\n")) .
+			     N("Note that for certain printer models additional packages need to be installed. So keep your installation media handy.\n"),
+	    },
+	     \@widgets )) {
+	    # Turn off auto queue setup if the user wishes it
+	    turnoffautosetup($printer, $in) if $donotsetupagain;
+	} else {
+	    return 1;
+	}
+    }
+
     # Now install queues for all auto-detected printers which have no queue
     # yet
     $printer->{noninteractive} = 1; # Suppress all interactive steps
-    my $configapps = 0;
     foreach my $p (@autodetected) {
-	if (!member($p->{port}, @blacklist)) {
+	if (!member($p->{port}, @blacklist) &&
+	    ($::noX || $printerselectedlist{$p->{port}})) {
 	    # Initialize some variables for queue setup
 	    $printer->{NEW} = 1;
 	    $printer->{TYPE} = "LOCAL";
@@ -677,55 +1013,34 @@ sub configure_new_printers {
 					 printer  => "",
 					 driver   => "",
 					 connect  => "",
+					 dd       => 1,
+					 att      => 0,
+					 delay    => 30,
 					 spooler  => $printer->{SPOOLER},
 				       };
-	    # Generate a queue name from manufacturer and model
-	    my $queue;
-	    my $unknown;
-	    if (!$p->{val}{MANUFACTURER} || !$p->{val}{MODEL} ||
-		$p->{val}{MODEL} eq N("Unknown Model")) {
-		$queue = N("Printer");
-		$unknown = 1;
-	    } else {
-		my $make = $p->{val}{MANUFACTURER};
-		if ($p->{val}{SKU}) {
-		    $queue = $make . $p->{val}{SKU};
-		} else {
-		    $queue = $make . $p->{val}{MODEL};
-		}
-		$queue =~ s/series//gi;
-		$queue =~ s/[\s\(\)\-,]//g;
-		$queue =~ s/^$make$make/$make/;
-	    }
-	    # Append a number if the queue name already exists
-	    if ($printer->{configured}{$queue}) {
-		$queue =~ s/(\d)$/$1_/;
-		my $i = 1;
-		while ($printer->{configured}{"$queue$i"}) {
-		    $i++;
-		}
-		$queue .= $i;
-	    }
-	    $printer->{currentqueue}{queue} = $queue;
 	    undef $w;
-	    $w = $in->wait_message(N("Printerdrake"),
-				    ($unknown ?
-				     N("Configuring printer ...") :
-				     N("Configuring printer \"%s\"...",
-				       $printer->{currentqueue}{queue})));
+	    $w = $::noX || 
+		$in->wait_message(N("Printerdrake"),
+				  N("Configuring printer on %s...",
+				    $p->{port}));
 	    # Do configuration of multi-function devices and look up
 	    # model name in the printer database
 	    setup_common($printer, $in, $p->{val}{DESCRIPTION}, $p->{port},
 			 1, @autodetected) or next;
-	    # Set also OLD_QUEUE field so that the subroutines for the
-	    # configuration work correctly.
-	    $printer->{OLD_QUEUE} = $printer->{QUEUE} =
-		$printer->{currentqueue}{queue};
 	    # Do the steps of queue setup
 	    get_db_entry($printer, $in);
 	    # Let the user choose the model manually if it could not be
 	    # auto-detected.
 	    if (!$printer->{DBENTRY}) {
+		# Skip this printer if we install print queues in a
+		# background without X access.
+		if ($::noX) {
+		    # Delete some variables
+		    foreach (qw(OLD_QUEUE QUEUE TYPE str_type DBENTRY ARGS OLD_CHOICE currentqueue NEW)) {
+			$printer->{$_} = "";
+		    }
+		    next;
+		}
 		# Set the OLD_CHOICE to a non-existing value
 		$printer->{OLD_CHOICE} = "XXX";
 		# Set model selection cursor onto the "Raw Printer" entry.
@@ -745,34 +1060,23 @@ sub configure_new_printers {
 Printerdrake could not determine which model your printer %s is. Please choose the correct model from the list.", $info) . " " .
 					   N("If your printer is not listed, choose a compatible (see printer manual) or a similar one."), '|',
 					   [ keys %printer::main::thedb ], $printer->{DBENTRY}) or next;
-		if ($unknown) {
-		    # Rename the queue according to the chosen model
-		    $queue = $printer->{DBENTRY};
-		    $queue =~ s/\|/ /g;
-		    $printer->{currentqueue}{desc} = $queue;
-		    $queue =~ s/series//gi;
-		    $queue =~ s/[\s\(\)\-,]//g;
-		    # Append a number if the queue name already exists
-		    if ($printer->{configured}{$queue}) {
-			$queue =~ s/(\d)$/$1_/;
-			my $i = 1;
-			while ($printer->{configured}{"$queue$i"}) {
-			    $i++;
-			}
-			$queue .= $i;
-		    }
-		    $printer->{currentqueue}{queue} = $queue;
-		    $printer->{QUEUE} = $printer->{currentqueue}{queue};
-		}
 		# Restore wait message
-		$w = $in->wait_message(N("Printerdrake"),
-					N("Configuring printer \"%s\"...",
-					  $printer->{currentqueue}{queue}));
+		$w = $::noX ||
+		    $in->wait_message(N("Printerdrake"),
+				      N("Configuring printer on %s...",
+					$p->{port}));
 	    }
 	    get_printer_info($printer, $in) or next;
 	    setup_options($printer, $in) or next;
+	    my $_queue = generate_queuename($printer);
+	    # Change wait message
+	    undef $w;
+	    $w = $::noX || 
+		$in->wait_message(N("Printerdrake"),
+				  N("Configuring printer \"%s\"...",
+				    $printer->{currentqueue}{queue}));
+	    # Create the queue
 	    configure_queue($printer, $in) or next;
-	    $configapps = 1;
 	    # If there is no default printer set, let this one get the
 	    # default
 	    if (!$printer->{DEFAULT}) {
@@ -787,25 +1091,146 @@ Printerdrake could not determine which model your printer %s is. Please choose t
 	$printer->{currentqueue} = {};
 	$printer->{complete} = 0;
     }
-    # Configure the current printer queues in applications
-    undef $w;
-    if ($configapps) {
-	$w =
-	    $in->wait_message(N("Printerdrake"),
-			      N("Configuring applications..."));
-	printer::main::configureapplications($printer);
-	undef $w;
-    }
     undef $printer->{noninteractive};
 }
 
+sub turnoffautosetup {
+    # Turn off auto queue setup if the user wishes it
+    my ($printer, $in) = @_;
+    local $::isEmbedded = 0;
+    # Read current configuration
+    printer::main::get_auto_admin($printer);
+    # Turn off automatic print queue setup
+    $printer->{autoqueuesetuponnewprinter} = 0;
+    $printer->{autoqueuesetuponstart} = 0;
+    # Save new settings
+    printer::main::set_auto_admin($printer);
+    # Tell the user what evil thing he has done and
+    # how he can fix it.
+    $in->ask_warn(N("Printerdrake"), 
+		  N("Now you have turned off automatic printer setup.\n\n") . 
+		  N("You can turn it back on again by choosing \"%s\" -> \"%s\" in Printerdrake's main menu. ", N("Options"), N("Configure Auto Administration")) .
+		  N("There you can also choose in which situation automatic printer setup is done (On Printerdrake startup, on printing system startup, when connecting a new USB printer)."));
+}
+
+sub generate_queuename {
+    my ($printer) = @_;
+    my $queue;
+    if ($printer->{currentqueue}{model}) {
+	if ($printer->{currentqueue}{model} eq N("Unknown model")) {
+	    $queue = "P";
+	} else {
+	    $queue = $printer->{currentqueue}{make} . '|' .
+		$printer->{currentqueue}{model};
+	}
+    } else {
+	$queue = $printer->{DBENTRY};
+    }
+    $queue =~ s/\|/ /g;
+    $printer->{currentqueue}{desc} = $queue;
+    $queue =~ s/series//gi;
+    $queue =~ s/[\s\(\)\-,]//g;
+    my $make = $printer->{currentqueue}{make};
+    my $model = $printer->{currentqueue}{model};
+    $queue =~ s/$make$make/$make/gi;
+    # Remove weird characters
+    $queue =~ s/[^A-Za-z0-9_]//g; 
+    $make =~ s/[^A-Za-z0-9_]//g; 
+    $model =~ s/[^A-Za-z0-9_]//g; 
+    # Do not use a queue name longer than 12 characters, as otherwise
+    # Windows clients will not be able to access the printer
+    my $ml = 12;
+    if (length($queue) > $ml) {
+	my %parts;
+	$parts{make} = $make;
+	$parts{model} = $model;
+	# Go through the two components, begin with model name, then
+	# make and then driver
+	foreach my $part (qw(model make)) {
+	    $parts{$part} =~ s/[^a-zA-Z0-9_]/ /g; 
+
+	    # Split the component into words, cutting always at the
+	    # right edge of the word. Cut also at a capital in the
+	    # middle of the word (ex: "S" in "PostScript").
+	    my @words =
+		split(/(?<=[a-zA-Z])(?![a-zA-Z])|(?<=[a-z])(?=[A-Z])/,
+		      $parts{$part});
+	    # Go through all words
+	    foreach (@words) {
+		# Do not abbreviate words of less than 3 letters
+		next if !/[a-zA-Z]{3,}$/;
+	        while (1) {
+		    # Remove the last letter
+		    chop;
+		    # Build the shortened component ...
+		    $parts{$part} = join('', @words);
+		    # ... and the queue name
+		    $queue = "$parts{make} $parts{model}";
+		    $queue =~ s/\s+//g;
+		    # Stop if the queue name has 12 characters or
+		    # less, if there is only one letter left, or if
+		    # the manufacturer name is reduced to three
+		    # characters.
+		    last if ((length($queue) <= $ml) ||
+			     (!/[a-zA-Z]{2,}$/) ||
+			     (($part eq 'make') && 
+			      (length($parts{make}) <= 3)));
+		}
+		$parts{$part} = join('', @words);
+		$queue = "$parts{make} $parts{model}";
+		$queue =~ s/\s+//g;
+		last if (length($queue) <= $ml);
+	    }
+	    last if (length($queue) <= $ml);
+	}
+	while ((length($queue) > $ml) &&
+	       (length($parts{model}) > 3)) {
+	    # Queue name too long? Remove last words from model name.
+	    last if !($parts{model} =~
+		s/[^a-zA-Z0-9]+[a-zA-Z0-9]*$//);
+	    $queue = "$parts{make} $parts{model}";
+	    $queue =~ s/\s+//g;
+	}
+	if (length($queue) > $ml) {
+	    # If nothing else helps ...
+	    $queue = substr($queue, 0, $ml);
+	}
+    }
+
+    # Append a number if the queue name already exists
+    if ($printer->{configured}{$queue}) {
+	my $origname = $queue;
+	my $i = 1;
+	while (1) {
+	    my $ol = length($origname);
+	    my $nl = length($i);
+	    my $us = ($origname =~ m/\d$/ ? 1 : 0);
+	    if ($ol + $nl + $us <= $ml) {
+		$queue = $origname . ($us ? '_' : '') . $i;
+	    } else {
+		$queue = substr($queue, 0, $ml - $nl);
+		$queue =~ s/\d$/_/;
+		$queue .= $i;
+	    }
+	    last if (!$printer->{configured}{$queue});
+	    $i++;
+	}
+    }
+
+    $printer->{currentqueue}{queue} = $queue;
+    $printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue;
+    return $queue;
+}
+
 sub wizard_welcome {
     my ($printer, $in, $upNetwork) = @_;
+    local $::isEmbedded = 0;
     my $ret;
     my $autodetectlocal = 0;
     my $autodetectnetwork = 0;
     my $autodetectsmb = 0;
-    # If networking is configured, start it, but don't ask the user to
+    my $configlpd = 0;
+    # If networking is configured, start it, but do not ask the user to
     # configure networking.
     my $havelocalnetworks;
     if ($printer->{expert}) {
@@ -822,7 +1247,12 @@ sub wizard_welcome {
 	$autodetectlocal = 1 if $printer->{AUTODETECTLOCAL};
 	$autodetectnetwork = 1 if $printer->{AUTODETECTNETWORK};
 	$autodetectsmb = 1 if $printer->{AUTODETECTSMB};
+	$configlpd = 1 if $printer->{CONFIGLPD};
     }
+    my $oldautodetectlocal = $autodetectlocal;
+    my $oldautodetectnetwork = $autodetectnetwork;
+    my $oldautodetectsmb = $autodetectsmb;
+    my $oldconfiglpd = $configlpd;
     if ($in) {
 	eval {
 	    if ($printer->{expert}) {
@@ -849,7 +1279,7 @@ This wizard will help you to install your printer(s) connected to this computer,
 
 Please plug in and turn on all printers connected to this machine so that it/they can be auto-detected. Also your network printer(s) and your Windows machines must be connected and turned on.
 
-Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you don't need it.
+Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you do not need it.
 
  Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now.") : N("
 Welcome to the Printer Setup Wizard
@@ -866,7 +1296,7 @@ This wizard will help you to install your printer(s) connected to this computer
 
 If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected. Also your network printer(s) must be connected and turned on.
 
-Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you don't need it.
+Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you do not need it.
 
  Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now.") : N("
 Welcome to the Printer Setup Wizard
@@ -875,7 +1305,49 @@ This wizard will help you to install your printer(s) connected to this computer.
 
 If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected.
 
- Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."))) },
+ Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."))),
+                       callbacks => {
+			   changed => sub {
+			       if ($oldautodetectlocal ne
+				   $autodetectlocal) {
+				   if ($autodetectlocal) {
+				       $configlpd = 0;
+				       $oldconfiglpd = 0;
+				   }
+				   $oldautodetectlocal = $autodetectlocal;
+			       }
+			       if ($oldautodetectnetwork ne
+				   $autodetectnetwork) {
+				   if ($autodetectnetwork) {
+				       $configlpd = 0;
+				       $oldconfiglpd = 0;
+				   }
+				   $oldautodetectnetwork =
+				       $autodetectnetwork;
+			       }
+			       if ($oldautodetectsmb ne
+				   $autodetectsmb) {
+				   if ($autodetectsmb) {
+				       $configlpd = 0;
+				       $oldconfiglpd = 0;
+				   }
+				   $oldautodetectsmb = $autodetectsmb;
+			       }
+			       if ($oldconfiglpd ne $configlpd) {
+				   if ($configlpd) {
+				       $autodetectlocal = 0;
+				       $autodetectnetwork = 0;
+				       $autodetectsmb = 0;
+				       $oldautodetectlocal = 0;
+				       $oldautodetectnetwork = 0;
+				       $oldautodetectsmb = 0;
+				   }
+				   $oldconfiglpd = $configlpd;
+			       }
+			       return 0;
+			   }
+		       }
+                      },
 		     [
 		      { text => N("Auto-detect printers connected to this machine"), type => 'bool',
 			val => \$autodetectlocal },
@@ -884,11 +1356,17 @@ If you have printer(s) connected to this machine, Please plug it/them in on this
 			val => \$autodetectnetwork },
 			   if_($printer->{SPOOLER} ne "pdq",
 		      { text => N("Auto-detect printers connected to machines running Microsoft Windows"), type => 'bool',
-			val => \$autodetectsmb })),
+			val => \$autodetectsmb },
+		      { text => N("Printer on remote lpd server")
+			    . " (" . N("No auto-detection") . ")",
+		        type => 'bool',
+			val => \$configlpd })),
 		      ]);
 		$printer->{AUTODETECTLOCAL} = $autodetectlocal ? 1 : undef;
 		$printer->{AUTODETECTNETWORK} = $autodetectnetwork ? 1 : undef;
 		$printer->{AUTODETECTSMB} = $autodetectsmb && $printer->{SPOOLER} ne "pdq" ? 1 : undef;
+		$printer->{CONFIGLPD} = $configlpd ? 1 : undef;
+		$printer->{TIMEOUT} = 4000;
 	    }
 	};
 	return $@ =~ /wizcancel/ ? 0 : $ret;
@@ -897,6 +1375,7 @@ If you have printer(s) connected to this machine, Please plug it/them in on this
 
 sub wizard_congratulations {
     my ($in) = @_;
+    local $::isEmbedded = 0;
     if ($in) {
 	$in->ask_okcancel(N("Add a new printer"),
 			  N("
@@ -904,12 +1383,13 @@ Congratulations, your printer is now installed and configured!
 
 You can print using the \"Print\" command of your application (usually in the \"File\" menu).
 
-If you want to add, remove, or rename a printer, or if you want to change the default option settings (paper input tray, printout quality, ...), select \"Printer\" in the \"Hardware\" section of the %s Control Center.", $shortdistroname))
+If you want to add, remove, or rename a printer, or if you want to change the default option settings (paper input tray, printout quality, ...), select \"Printer\" in the \"Hardware\" section of the %s Control Center.", $shortdistroname));
     }
 }
 
 sub setup_local_autoscan {
     my ($printer, $in, $upNetwork) = @_;
+    local $::isEmbedded = 0;
     my $queue = $printer->{OLD_QUEUE};
     my $expert_or_modify = $printer->{expert} || !$printer->{NEW};
     my $do_auto_detect = 
@@ -938,35 +1418,40 @@ sub setup_local_autoscan {
 				"Samba client") . " " .
 			      N("Skipping Windows/SMB server auto-detection"));
 		$printer->{AUTODETECTSMB} = 0;
-		return 0 if (!$printer->{AUTODETECTLOCAL} && 
-			     !$printer->{AUTODETECTNETWORK});
+		return 0 if !$printer->{AUTODETECTLOCAL} &&
+			     !$printer->{AUTODETECTNETWORK};
 	    };
 	}
 	my $_w = $in->wait_message(N("Printer auto-detection"), N("Detecting devices..."));
-	# When HPOJ is running, it blocks the printer ports on which it is
-	# configured, so we stop it here. If it is not installed or not 
-	# configured, this command has no effect.
-	require services;
-	services::stop("hpoj");
 	@autodetected = (
 	    $expert_or_modify || $printer->{AUTODETECTLOCAL} ? printer::detect::local_detect() : (),
-	    !$expert_or_modify ? printer::detect::whatNetPrinter($printer->{AUTODETECTNETWORK}, $printer->{AUTODETECTSMB}) : (),
+	    !$expert_or_modify ? printer::detect::whatNetPrinter($printer->{AUTODETECTNETWORK}, $printer->{AUTODETECTSMB}, $printer->{TIMEOUT}) : (),
         );
+	$printer->{AUTODETECTEDPRINTERSADDPRINTERSTANDARD} = \@autodetected if @autodetected;
 	# We have more than one printer, so we must ask the user for a queue
 	# name in the fully automatic printer configuration.
 	$printer->{MORETHANONE} = $#autodetected > 0;
 	my @str;
 	foreach my $p (@autodetected) {
-	    if ($p->{val}{DESCRIPTION}) {
-		my $menustr = $p->{val}{DESCRIPTION};
+	    if (($p->{val}{DESCRIPTION}) || ($p->{val}{MODEL})) {
+		my $menustr = (defined($p->{val}{DESCRIPTION}) &&
+			       (length($p->{val}{DESCRIPTION}) > 5) ?
+			       $p->{val}{DESCRIPTION} :
+			       (($p->{val}{MANUFACTURER} ? 
+				 ($p->{val}{MANUFACTURER} . " ") : ()) .
+				$p->{val}{MODEL}));
 		if ($p->{port} =~ m!^/dev/lp(\d+)$!) {
-		    $menustr .= N(" on parallel port #%s", $1);
+                    my $port = $1;
+		    $menustr .= N(" on parallel port #%s", $port);
 		} elsif ($p->{port} =~ m!^/dev/usb/lp(\d+)$!) {
-		    $menustr .= N(", USB printer #%s", $1);
+                    my $printer = $1;
+		    $menustr .= N(", USB printer #%s", $printer);
 		} elsif ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) {
-		    $menustr .= N(", network printer \"%s\", port %s", $1, $2);
+                    my ($printer, $port) = ($1, $2);
+		    $menustr .= N(", network printer \"%s\", port %s", $printer, $port);
 		} elsif ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
-		    $menustr .= N(", printer \"%s\" on SMB/Windows server \"%s\"", $2, $1);
+                    my ($server, $printer) = ($1, $2);
+		    $menustr .= N(", printer \"%s\" on SMB/Windows server \"%s\"", $printer, $server);
 		}
 		$menustr .= " ($p->{port})" if $printer->{expert};
 		$menuentries->{$menustr} = $p->{port};
@@ -974,13 +1459,17 @@ sub setup_local_autoscan {
 	    } else {
 		my $menustr;
 		if ($p->{port} =~ m!^/dev/lp(\d+)$!) {
-		    $menustr = N("Printer on parallel port #%s", $1);
+                    my $port = $1;
+		    $menustr = N("Printer on parallel port #%s", $port);
 		} elsif ($p->{port} =~ m!^/dev/usb/lp(\d+)$!) {
-		    $menustr = N("USB printer #%s", $1);
+                    my $printer = $1;
+		    $menustr = N("USB printer #%s", $printer);
 		} elsif ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) {
-		    $menustr .= N("Network printer \"%s\", port %s", $1, $2);
+                    my ($printer, $port);
+		    $menustr .= N("Network printer \"%s\", port %s", $printer, $port);
 		} elsif ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
-		    $menustr .= N("Printer \"%s\" on SMB/Windows server \"%s\"", $2, $1);
+                    my ($server, $printer) = ($1, $2);
+		    $menustr .= N("Printer \"%s\" on SMB/Windows server \"%s\"", $printer, $server);
 		}
 		$menustr .= " ($p->{port})" if $printer->{expert};
 		$menuentries->{$menustr} = $p->{port};
@@ -997,17 +1486,16 @@ sub setup_local_autoscan {
 		}
 		my $menustr;
 		if ($q =~ m!^/dev/lp(\d+)$!) {
-		    $menustr = N("Printer on parallel port #%s", $1);
+                    my $port = $1;
+		    $menustr = N("Printer on parallel port #%s", $port);
 		} elsif ($q =~ m!^/dev/usb/lp(\d+)$!) {
-		    $menustr = N("USB printer #%s", $1);
+                    my $printer;
+		    $menustr = N("USB printer #%s", $printer);
 		}
 		$menustr .= " ($q)" if $printer->{expert};
 		$menuentries->{$menustr} = $q;
 	    }
 	}
-	# We are ready with auto-detection, so we restart HPOJ here. If it 
-	# is not installed or not configured, this command has no effect.
-	printer::services::start("hpoj");
     } else {
 	# Always ask for queue name in recommended mode when no auto-
 	# detection was done
@@ -1030,8 +1518,8 @@ sub setup_local_autoscan {
 	for (my $i = 0; $i <= $#prefixes; $i++) {
 	    my $firstinlist = $first =~ m!^$prefixes[$i]!;
 	    my $secondinlist = $second =~ m!^$prefixes[$i]!;
-	    if ($firstinlist && !$secondinlist) { return -1 };
-	    if ($secondinlist && !$firstinlist) { return 1 };
+	    if ($firstinlist && !$secondinlist) { return -1 }
+	    if ($secondinlist && !$firstinlist) { return 1 }
 	}
 	return $first cmp $second;
     } keys(%$menuentries);
@@ -1039,8 +1527,8 @@ sub setup_local_autoscan {
     my $oldmenuchoice = "";
     my $device;
     if ($printer->{configured}{$queue}) {
-	my $p = printer::main::autodetectionentry_for_uri
-	    ($printer->{currentqueue}{connect}, @autodetected);
+	my $p = printer::main::autodetectionentry_for_uri(
+	    $printer->{currentqueue}{connect}, @autodetected);
 	if (defined($p)) {
 	    $device = $p->{port};
 	    $menuchoice = { reverse %$menuentries }->{$device};
@@ -1053,7 +1541,7 @@ sub setup_local_autoscan {
     }
     if ($in) {
 #	$printer->{expert} or $in->set_help('configurePrinterDev') if $::isInstall;
-	if ($#menuentrieslist < 0) { # No menu entry
+	if (@menuentrieslist < 1) { # No menu entry
 	    # auto-detection has failed, we must do all manually
 	    $do_auto_detect = 0;
 	    $printer->{MANUAL} = 1;
@@ -1065,13 +1553,14 @@ sub setup_local_autoscan {
 			 complete => sub {
 			     if ($menuchoice eq "") {
 				 $in->ask_warn(N("Error"), N("You must enter a device or file name!"));
-				 return (1,0);
+				 return 1, 0;
 			     }
 			     return 0;
 			 }
 		     });
 		return 0 if $device eq "";
 	    } else {
+		local $::isWizard = 0;
 		$in->ask_warn(N("Printer auto-detection"),
 			      N("No printer found!"));
 		return 0;
@@ -1085,7 +1574,7 @@ sub setup_local_autoscan {
 			     N("Available printers")),
 		   messages => (($do_auto_detect ?
 				 ($printer->{expert} ?
-				  ($#menuentrieslist == 0 ?
+				  (@menuentrieslist == 1 ?
 				   (N("The following printer was auto-detected. ") .
 				    ($printer->{NEW} ?
 				     N("If it is not the one you want to configure, enter a device name/file name in the input line") :
@@ -1094,7 +1583,7 @@ sub setup_local_autoscan {
 				    ($printer->{NEW} ?
 				     N("Please choose the printer you want to set up or enter a device name/file name in the input line") :
 				     N("Please choose the printer to which the print jobs should go or enter a device name/file name in the input line")))) :
-				  ($#menuentrieslist == 0 ?
+				  (@menuentrieslist == 1 ?
 				   (N("The following printer was auto-detected. ") .
 				    ($printer->{NEW} ?
 				     N("The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\".") : 
@@ -1112,7 +1601,7 @@ sub setup_local_autoscan {
 				      complete => sub {
 					  unless ($menuchoice ne "") {
 					      $in->ask_warn(N("Error"), N("You must choose/enter a printer/device!"));
-					      return (1,0);
+					      return 1, 0;
 					  }
 					  return 0;
 				      },
@@ -1167,9 +1656,10 @@ sub setup_local_autoscan {
 sub setup_lpd {
     my ($printer, $in, $upNetwork) = @_;
 
+    local $::isEmbedded = 0;
     # Check whether the network functionality is configured and
     # running
-    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };
+    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 }
 
 #    $in->set_help('setupLPD') if $::isInstall;
     my ($uri, $remotehost, $remotequeue);
@@ -1193,11 +1683,11 @@ N("To use a remote lpd printer, you need to supply the hostname of the printer s
 complete => sub {
     if ($remotehost eq "") {
 	$in->ask_warn(N("Error"), N("Remote host name missing!"));
-	return (1,0);
+	return 1, 0;
     }
     if ($remotequeue eq "") {
 	$in->ask_warn(N("Error"), N("Remote printer name missing!"));
-	return (1,1);
+	return 1, 1;
     }
     return 0;
 }
@@ -1221,22 +1711,23 @@ complete => sub {
     # Auto-detect printer model (works if host is an ethernet-connected
     # printer)
     my $modelinfo = printer::detect::getSNMPModel($remotehost);
-    my $auto_hpoj;
+    my $auto_hplip;
     if (defined($modelinfo) &&
 	$modelinfo->{MANUFACTURER} ne "" &&
 	$modelinfo->{MODEL} ne "") {
+	local $::isWizard = 0;
         $in->ask_warn(N("Information"), N("Detected model: %s %s",
                             $modelinfo->{MANUFACTURER}, $modelinfo->{MODEL}));
-        $auto_hpoj = 1;
+        $auto_hplip = 1;
     } else {
-	$auto_hpoj = 0;
+	$auto_hplip = 0;
     }
 
     # Do configuration of multi-function devices and look up model name
     # in the printer database
     setup_common($printer, $in,
 		  "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
-		  $printer->{currentqueue}{connect}, $auto_hpoj,
+		  $printer->{currentqueue}{connect}, $auto_hplip,
                   ({port => $printer->{currentqueue}{connect},
                     val => $modelinfo }));
 
@@ -1246,9 +1737,10 @@ complete => sub {
 sub setup_smb {
     my ($printer, $in, $upNetwork) = @_;
 
+    local $::isEmbedded = 0;
     # Check whether the network functionality is configured and
     # running
-    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };
+    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 }
 
 #    $in->set_help('setupSMB') if $::isInstall;
     my ($uri, $smbuser, $smbpassword, $workgroup, $smbserver, $smbserverip, $smbshare);
@@ -1256,7 +1748,7 @@ sub setup_smb {
     if ($printer->{configured}{$queue} &&
 	$printer->{currentqueue}{connect} =~ m/^smb:/) {
 	$uri = $printer->{currentqueue}{connect};
-	my $parameters = $1 if $uri =~ m!^\s*smb://(.*)$!;
+	my $parameters = $uri =~ m!^\s*smb://(.*)$! && $1;
 	# Get the user's login and password from the URI
 	if ($parameters =~ m!([^@]*)@([^@]+)!) {
 	    my $login = $1;
@@ -1308,8 +1800,9 @@ sub setup_smb {
 	    };
 	}
 	my $_w = $in->wait_message(N("Printer auto-detection"), N("Scanning network..."));
-	@autodetected = printer::detect::net_smb_detect();
-     my ($server, $share);
+	@autodetected = printer::detect::net_smb_detect($printer->{TIMEOUT});
+	$printer->{AUTODETECTEDPRINTERSADDPRINTEREXPERTSMB} = \@autodetected if @autodetected;
+	my ($server, $share);
 	foreach my $p (@autodetected) {
 	    my $menustr;
 	    if ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
@@ -1349,7 +1842,7 @@ sub setup_smb {
 	    unshift(@menuentrieslist, $menustr);
 	    $menuchoice = $menustr;
 	}
-	if ($#menuentrieslist < 0) {
+	if (@menuentrieslist < 1) {
 	    $autodetect = 0;
 	} elsif ($menuchoice eq "") {
 	    $menuchoice = $menuentrieslist[0];
@@ -1381,15 +1874,15 @@ sub setup_smb {
 	 complete => sub {
 	     if (!is_ip($smbserverip) && $smbserverip ne "") {
 		 $in->ask_warn(N("Error"), N("IP address should be in format 1.2.3.4"));
-		 return (1,1);
+		 return 1, 1;
 	     }
 	     if ($smbserver eq "" && $smbserverip eq "") {
 		 $in->ask_warn(N("Error"), N("Either the server name or the server's IP must be given!"));
-		 return (1,0);
+		 return 1, 0;
 	     }
 	     if ($smbshare eq "") {
 		 $in->ask_warn(N("Error"), N("Samba share name missing!"));
-		 return (1,2);
+		 return 1, 2;
 	     }
 	     if ($smbpassword ne "") {
 		 local $::isWizard = 0;
@@ -1412,7 +1905,7 @@ N("Connect your printer to a Linux server and let your Windows machine(s) connec
 
 Do you really want to continue setting up this printer as you are doing now?"), 0);
 		 return 0 if $yes;
-		 return (1,2);
+		 return 1, 2;
 	     }
 	     return 0;
 	 },
@@ -1451,9 +1944,10 @@ Do you really want to continue setting up this printer as you are doing now?"),
 sub setup_ncp {
     my ($printer, $in, $upNetwork) = @_;
 
+    local $::isEmbedded = 0;
     # Check whether the network functionality is configured and
     # running
-    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };
+    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 }
 
 #    $in->set_help('setupNCP') if $::isInstall;
     my ($uri, $ncpuser, $ncppassword, $ncpserver, $ncpqueue);
@@ -1495,11 +1989,11 @@ N("To print on a NetWare printer, you need to provide the NetWare print server n
 complete => sub {
     unless ($ncpserver ne "") {
 	$in->ask_warn(N("Error"), N("NCP server name missing!"));
-	return (1,0);
+	return 1, 0;
     }
     unless ($ncpqueue ne "") {
 	$in->ask_warn(N("Error"), N("NCP queue name missing!"));
-	return (1,1);
+	return 1, 1;
     }
     return 0;
 }
@@ -1525,18 +2019,24 @@ complete => sub {
 sub setup_socket {
     my ($printer, $in, $upNetwork) = @_;
 
+    local $::isEmbedded = 0;
     # Check whether the network functionality is configured and
     # running
-    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };
+    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 }
 
 #    $in->set_help('setupSocket') if $::isInstall;
 
     my ($uri, $remotehost, $remoteport);
     my $queue = $printer->{OLD_QUEUE};
     if ($printer->{configured}{$queue} &&
-	$printer->{currentqueue}{connect} =~  m!^(socket:|ptal://?hpjd:)!) {
+	$printer->{currentqueue}{connect} =~ 
+	m!^(socket:|ptal://?hpjd:|hp:/net/)!) {
 	$uri = $printer->{currentqueue}{connect};
-	if ($uri =~ m!^ptal:!) {
+	if ($uri =~ m!^hp:!) {
+	    if ($uri =~ m!^hp:/net/[^\?]+\?ip=(\d+\.\d+\.\d+\.\d+)!) {
+		($remotehost, $remoteport) = ($1, 9100);
+	    }
+	} elsif ($uri =~ m!^ptal:!) {
 	    if ($uri =~ m!^ptal://?hpjd:([^/:]+):([0-9]+)/?\s*$!) {
 		my $ptalport = $2 - 9100;
 		($remotehost, $remoteport) = ($1, $ptalport);
@@ -1558,17 +2058,19 @@ sub setup_socket {
     my @menuentrieslist;
     my $menuchoice = "";
     my $oldmenuchoice = "";
+    my $detectedprinterchosen = 0;
     if ($printer->{AUTODETECT}) {
 	$autodetect = 1;
 	my $_w = $in->wait_message(N("Printer auto-detection"), N("Scanning network..."));
-	@autodetected = printer::detect::net_detect();
-     my ($host, $port);
+	@autodetected = printer::detect::net_detect($printer->{TIMEOUT});
+	$printer->{AUTODETECTEDPRINTERSEXPERTSOCKET} = \@autodetected if @autodetected;
+	my ($host, $port);
 	foreach my $p (@autodetected) {
 	    my $menustr;
 	    if ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) {
-             $host = $1;
-             $port = $2;
-         }
+		$host = $1;
+		$port = $2;
+	    }
 	    if ($p->{val}{DESCRIPTION}) {
 		$menustr = $p->{val}{DESCRIPTION};
 		$menustr .= N(", host \"%s\", port %s",
@@ -1580,13 +2082,14 @@ sub setup_socket {
 	    if ($host eq $remotehost &&
 		$host eq $remotehost) {
 		$menuchoice = $menustr;
+		$detectedprinterchosen = 1;
 	    }
 	}
 	@menuentrieslist = sort { 
 	    $menuentries->{$a} cmp $menuentries->{$b};
 	} keys(%$menuentries);
 	if ($printer->{configured}{$queue} &&
-	    $printer->{currentqueue}{connect} =~ m!^(socket:|ptal://?hpjd:)! &&
+	    $printer->{currentqueue}{connect} =~ m!^(socket:|ptal://?hpjd:|hp:/net/)! &&
 	    $menuchoice eq "") {
 	    my $menustr;
 	    if ($printer->{currentqueue}{make}) {
@@ -1601,13 +2104,14 @@ sub setup_socket {
 	    unshift(@menuentrieslist, $menustr);
 	    $menuchoice = $menustr;
 	}
-	if ($#menuentrieslist < 0) {
+	if (@menuentrieslist < 1) {
 	    $autodetect = 0;
 	} elsif ($menuchoice eq "") {
 	    $menuchoice = $menuentrieslist[0];
 	    if ($menuentries->{$menuentrieslist[0]} =~ m!^socket://([^:]+):(\d+)$!) {
              $remotehost = $1;
              $remoteport = $2;
+	     $detectedprinterchosen = 1;
          }
 	}
 	$oldmenuchoice = $menuchoice;
@@ -1623,22 +2127,28 @@ sub setup_socket {
 		 complete => sub {
 		     unless ($remotehost ne "") {
 			 $in->ask_warn(N("Error"), N("Printer host name or IP missing!"));
-			 return (1,0);
+			 return 1, 0;
 		     }
 		     unless ($remoteport =~ /^[0-9]+$/) {
 			 $in->ask_warn(N("Error"), N("The port number should be an integer!"));
-			 return (1,1);
+			 return 1, 1;
 		     }
 		     return 0;
 		 },
 		 changed => sub {
 		     return 0 if !$autodetect;
 		     if ($oldmenuchoice ne $menuchoice) {
-                   if ($menuentries->{$menuchoice} =~ m!^socket://([^:]+):(\d+)$!) {
-                       $remotehost = $1;
-                       $remoteport = $2;
-                   }
-                   $oldmenuchoice = $menuchoice;
+			 if ($menuentries->{$menuchoice} =~
+			     m!^socket://([^:]+):(\d+)$!) {
+			     $remotehost = $1;
+			     $remoteport = $2;
+			     $detectedprinterchosen = 1;
+			 } else {
+			     $detectedprinterchosen = 0;
+			 }
+			 $oldmenuchoice = $menuchoice;
+		     } else {
+			 $detectedprinterchosen = 0;
 		     }
 		     return 0;
 		 }
@@ -1668,7 +2178,7 @@ sub setup_socket {
 		  "nc") . " " .
 		N("Aborting"));
 	    return 0;
-	}
+	};
     }
 
     # Auto-detect printer model
@@ -1676,20 +2186,26 @@ sub setup_socket {
     if ($printer->{AUTODETECT}) {
 	$modelinfo = printer::detect::getSNMPModel($remotehost);
     }
-    my $auto_hpoj;
+    my $auto_hplip;
     if (defined($modelinfo) &&
 	$modelinfo->{MANUFACTURER} ne "" &&
 	$modelinfo->{MODEL} ne "") {
-        $auto_hpoj = 1;
+	if (!$detectedprinterchosen) {
+	    local $::isWizard = 0;
+	    $in->ask_warn(N("Information"), N("Detected model: %s %s",
+					      $modelinfo->{MANUFACTURER},
+					      $modelinfo->{MODEL}));
+	}
+        $auto_hplip = 1;
     } else {
-	$auto_hpoj = 0;
+	$auto_hplip = 0;
     }
 
     # Do configuration of multi-function devices and look up model name
     # in the printer database
     setup_common($printer, $in,
 		  "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
-		  $printer->{currentqueue}{connect}, $auto_hpoj,
+		  $printer->{currentqueue}{connect}, $auto_hplip,
                   ({port => $printer->{currentqueue}{connect},
                     val => $modelinfo }));
     1;
@@ -1698,8 +2214,9 @@ sub setup_socket {
 sub setup_uri {
     my ($printer, $in, $upNetwork) = @_;
 
+    local $::isEmbedded = 0;
 #    $in->set_help('setupURI') if $::isInstall;
-    if ($printer->{AUTODETECT} and ($printer->{SPOOLER} eq 'cups')) {
+    if ($printer->{AUTODETECT} && $printer->{SPOOLER} eq 'cups') {
 	my $_w = $in->wait_message(N("Printerdrake"), 
 				   N("Refreshing Device URI list..."));
 	printer::services::restart("cups");
@@ -1721,22 +2238,23 @@ list => [ if_($printer->{currentqueue}{connect},
 	    "smb://",
 	    "ncp://",
 	    "socket://",
-	    "ptal:/mlc:",
-	    "ptal:/hpjd:",
+	    "hp:/usb/",
+	    "hp:/par/",
+	    "hp:/net/",
 	    "file:/",
 	    'postpipe:""')),
 	  ], not_edit => 0, sort => 0 }, ],
 complete => sub {
     unless ($printer->{currentqueue}{connect} =~ /[^:]+:.+/) {
 	$in->ask_warn(N("Error"), N("A valid URI must be entered!"));
-	return (1,0);
+	return 1, 0;
     }
     return 0;
 }
     );
 
     # Non-local printer, check network and abort if no network available
-    if ($printer->{currentqueue}{connect} !~ m!^(file|parallel|usb|serial|mtink|ptal://?mlc):/! &&
+    if ($printer->{currentqueue}{connect} !~ m!^(file:|parallel:|usb:|serial:|mtink:|ptal://?mlc|hp:/(usb|par))! &&
         !check_network($printer, $in, $upNetwork, 0)) { 
         return 0;
     # If the chosen protocol needs additional software, install it.
@@ -1792,23 +2310,24 @@ complete => sub {
 	# printer)
 	my $remotehost = $1;
 	my $modelinfo = printer::detect::getSNMPModel($remotehost);
-        my $auto_hpoj;
+        my $auto_hplip;
         if (defined($modelinfo) &&
             $modelinfo->{MANUFACTURER} ne "" &&
 	    $modelinfo->{MODEL} ne "") {
+	    local $::isWizard = 0;
             $in->ask_warn(N("Information"), N("Detected model: %s %s",
                                 $modelinfo->{MANUFACTURER},
 				$modelinfo->{MODEL}));
-            $auto_hpoj = 1;
+            $auto_hplip = 1;
         } else {
-	    $auto_hpoj = 0;
+	    $auto_hplip = 0;
         }
 
         # Do configuration of multi-function devices and look up model name
         # in the printer database
         setup_common($printer, $in,
 		      "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
-		      $printer->{currentqueue}{connect}, $auto_hpoj,
+		      $printer->{currentqueue}{connect}, $auto_hplip,
                       ({port => $printer->{currentqueue}{connect},
                         val => $modelinfo }));
     }
@@ -1819,6 +2338,7 @@ complete => sub {
 sub setup_postpipe {
     my ($printer, $in) = @_;
 
+    local $::isEmbedded = 0;
 #    $in->set_help('setupPostpipe') if $::isInstall;
     my $uri;
     my $commandline;
@@ -1838,7 +2358,7 @@ val => \$commandline }, ],
 complete => sub {
     unless ($commandline ne "") {
 	$in->ask_warn(N("Error"), N("A command line must be entered!"));
-	return (1,0);
+	return 1, 0;
     }
     return 0;
 }
@@ -1850,105 +2370,241 @@ complete => sub {
     1;
 }
 
+sub hplip_bus_warning {
+
+    my ($printer, $in, $device, $hplipentry) = @_;
+
+    # Determine connection type
+    my $bus;
+    if ($device =~ /usb/) {
+	$bus = "usb";
+    } elsif ($device =~ m!/dev/(lp|par.*|printer.*)\d+!) {
+	$bus = "par";
+    } elsif ($device =~ m!^socket://!) {
+	$bus = "net";
+    } else {
+	return 0;
+    }
+
+    # HPLIP supports the connection through which the device is currently
+    # accessed
+    return 1 if $hplipentry->{bus}{$bus};
+
+    # Ask user what to do
+    if ($::noX) {
+	return 0;
+    } else {
+	local $::isWizard = 0;
+	my $modelstr = $hplipentry->{model};
+	$modelstr =~ s/_/ /g;
+	my $choice = $in->ask_from_list
+	    (N("Add a new printer"),
+	     N("Your printer %s is currently connected %s.",
+	       $modelstr,
+	       ($bus eq "par" ? N("to a parallel port") :
+		($bus eq "usb" ? N("to the USB") :
+		 N("via the network")))) . " " .
+	     N("This type of connection is currently not fully supported by HPLIP.") .
+	     " " .
+	     N("You get full HPLIP support for your device if you connect it ") .
+	     join(", ",
+		  (if_($hplipentry->{bus}{par}, N("to a parallel port")),
+		   if_($hplipentry->{bus}{usb}, N("to the USB")),
+		   if_($hplipentry->{bus}{net}, N("via the network")))) .
+	     ".\n\n" .
+	     N("You can now set up your device with HPLIP anyway (works in many cases), ") .
+	     N("set it up without HPLIP (print-only), ") . N("or") . " " .
+	     N("cancel the setup (for example to reconnect your device).") .
+	     "\n\n" .
+	     N("You can always revise your choice by clicking your printer's entry in the main window, ") .
+	     N("clicking the \"%s\" button, ", N("Edit")) .
+	     N("and choosing \"%s\".", N("Printer connection type")) .
+	     "\n\n" .
+	     N("What do you want to do?"),
+	     [N("Set up with HPLIP"), 
+	      N("Set up without HPLIP"), 
+	      N("Cancel setup")], N("Cancel setup"));
+	if ($choice eq N("Set up with HPLIP")) {
+	    return 1;
+	} elsif ($choice eq N("Set up without HPLIP")) {
+	    return 2;
+	} else {
+	    return 0;
+	}
+    }
+}
+
 sub setup_common {
 
     my ($printer, $in, $makemodel, $device, $do_auto_detect, @autodetected) = @_;
 
-    #- Check whether the printer is an HP multi-function device and 
-    #- configure HPOJ if it is one
+    local $::isEmbedded = 0;
+    #- Check whether the printer is an HP printer or multi-function device and 
+    #- configure HPLIP if it is one
 
-    my $ptaldevice = "";
-    my $isHPOJ = 0;
+    my $hplipdevice = "";
+    my $isHPLIP = 0;
+    my $searchunknown = N("Unknown model");
     my $w;
     if ($device =~ m!^/dev/! || $device =~ m!^socket://!) {
-	# Ask user whether he has a multi-function device when he didn't
+	# Ask user whether he has a multi-function device when he did not
 	# do auto-detection or when auto-detection failed
-	my $searchunknown = N("Unknown model");
 	if (!$do_auto_detect ||
-	    $makemodel eq $searchunknown ||
+	    $makemodel =~ /$searchunknown/i ||
 	    $makemodel =~ /^\s*$/) {
 	    local $::isWizard = 0;
 	    if (!$printer->{noninteractive}) {
-		$isHPOJ = $in->ask_yesorno(N("Add a new printer"),
-					   N("Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner, DeskJet 450, Sony IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"), 0);
+		if ($printer->{SPOOLER} eq 'cups') {
+		    $isHPLIP = $in->ask_yesorno
+			(N("Add a new printer"),
+			 N("On many HP printers there are special functions available, maintenance (ink level checking, nozzle cleaning. head alignment, ...) on all not too old inkjets, scanning on multi-function devices, and memory card access on printers with card readers. ") .
+			 "\n\n" .
+			 N("To access these extra functions on HP printers they must be set up with HPLIP (HP Linux Imaging and Printing). ") .
+			 "\n\n" .
+			 N("Do you want to use HPLIP (choose \"No\" for non-HP printers)? "), 0);
+		}
 	    }
 	}
-	if ($makemodel =~ /HP\s+(OfficeJet|PSC|PhotoSmart|LaserJet\s+(1200|1220|2200|3200|33.0)|(DeskJet|dj)\s*450)/i ||
-	    $makemodel =~ /Sony\s+IJP[\s\-]+V[\s\-]+100/i ||
-	    $isHPOJ) {
-	    # Install HPOJ package
-	    my $hpojinstallfailed = 0;
+	my $hplipentry;
+	my $hplipaborted = 0;
+	if (($printer->{SPOOLER} eq 'cups') &&
+	    (($hplipentry =
+	      printer::main::hplip_device_entry($device, @autodetected)) ||
+	     $isHPLIP)) {
+	    # Device is supported by HPLIP
+	    if ($hplipentry) {
+		my $buswarning = 
+		    hplip_bus_warning($printer, $in, $device, $hplipentry);
+		return 0 if !$buswarning;
+		$hplipaborted = 1 if $buswarning == 2;
+	    }
+	    # Install HPLIP packages
+	    my $hplipinstallfailed = 0;
 	    if (!$::testing &&
-		!files_exist(qw(/usr/sbin/ptal-mlcd
-				/usr/sbin/ptal-init
-				/usr/bin/xojpanel
-				/usr/sbin/lsusb))) {
-		$w = $in->wait_message(N("Printerdrake"),
-					   N("Installing HPOJ package..."))
-		    if !$printer->{noninteractive};
-		$in->do_pkgs->install('hpoj', 'xojpanel', 'usbutils')
-		    or do {
-			$in->ask_warn(N("Warning"),
-				      N("Could not install the %s packages!",
-					"HPOJ") . " " .
-				      N("Only printing will be possible on the %s.",
-					$makemodel));
-			$hpojinstallfailed = 1;
-		    };
+		!$hplipaborted &&
+		!files_exist(qw(/usr/sbin/hpiod))) {
+		if ($::noX) {
+		    $hplipinstallfailed = 1;
+		} else {
+		    $w = $in->wait_message(N("Printerdrake"),
+					   N("Installing %s package...", N("HPLIP")))
+			if !$printer->{noninteractive};
+		    $in->do_pkgs->install('hplip')
+			or do {
+			    $in->ask_warn(N("Warning"),
+					  N("Could not install the %s packages!",
+					    N("HPLIP")) . " " .
+					  N("Only printing will be possible on the %s.",
+					    $makemodel));
+			    $hplipinstallfailed = 1;
+			};
+		}
 	    }
-	    # Configure and start HPOJ
-	    undef $w;
-	    $w = $in->wait_message
-		(N("Printerdrake"),
-		 N("Checking device and configuring HPOJ..."))
-		if !$printer->{noninteractive};
-	    
-	    eval {$ptaldevice = printer::main::configure_hpoj
-		      ($device, @autodetected) if !$hpojinstallfailed;};
-
-	    if (my $err = $@) {
-		warn qq(HPOJ conf faillure: "$err");
-		log::l(qq(HPOJ conf faillure: "$err"));
+	    # Remove old HPOJ configuration for this device
+	    if (-f "$::prefix/usr/sbin/ptal-mlcd") { # HPOJ installed?
+		if (my $configfile =
+		    printer::main::remove_hpoj_config($device, @autodetected)) {
+		    if (!$printer->{noninteractive} && !$::noX) {
+			undef $w;
+			local $::isWizard = 0;
+			$in->ask_warn
+			    (N("Error"),
+			     N("Could not remove your old HPOJ configuration file %s for your %s! ",
+			       $configfile, $makemodel) .
+			     N("Please remove the file manually and restart HPOJ."));
+		    }
+		}
 	    }
 
-	    if ($ptaldevice) {
-		# HPOJ has determined the device name, make use of it if we
-		# didn't know it before
-		if (!$do_auto_detect ||
-		    !$makemodel ||
-		    $makemodel eq $searchunknown ||
-		    $makemodel =~ /^\s*$/) {
-		    $makemodel = $ptaldevice;
-		    $makemodel =~ s/^.*:([^:]+)$/$1/;
-		    $makemodel =~ s/_/ /g;
-		    if ($makemodel =~ /^\s*IJP/i) {
-			$makemodel = "Sony $makemodel";
+	    if (!$hplipinstallfailed && !$hplipaborted) {
+		# Start HPLIP and get device URI
+		undef $w;
+		$w = $in->wait_message
+		    (N("Printerdrake"),
+		     N("Checking device and configuring %s...", N("HPLIP")))
+		    if !$printer->{noninteractive};
+
+		if ($isHPLIP && ($device !~ m!^socket://!)) {
+		    my @uris = printer::main::start_hplip_manual();
+		    my (@menu, %menuhash);
+		    foreach my $item (@uris) {
+			if ($item =~ m!^hp:/(usb|par|net)/(\S*?)(\?\S*|)$!) {
+			    my $modelname = $2;
+			    $modelname =~ s/_/ /g;
+			    $modelname = "HP " . $modelname 
+				if $modelname !~ m!^HP\s!i;
+			    push(@menu, $modelname);
+			    $menuhash{$modelname} = $item;
+			}
+		    }
+		    undef $w;
+		    local $::isWizard = 0;
+		    my $choice = $in->ask_from_list
+			(N("Add a new printer"),
+			 N("Which printer do you want to set up with HPLIP?"),
+			 \@menu, $menu[0]);
+		    $hplipdevice = $menuhash{$choice};
+		    $hplipentry = 
+			printer::main::hplip_device_entry_from_uri
+			($hplipdevice);
+		    if ($hplipentry) {
+			my $buswarning = 
+			    hplip_bus_warning($printer, $in,
+					      $device, $hplipentry);
+			return 0 if !$buswarning;
+			if ($buswarning == 2) {
+			    $hplipaborted = 1;
+			    $hplipdevice = "";
+			} else {
+			    $makemodel = $choice;
+			}
 		    } else {
-			$makemodel = "HP $makemodel";
+			$hplipaborted = 1;
+			$hplipdevice = "";
+		    }
+		} else {
+		    $hplipdevice = printer::main::start_hplip
+			($device, $hplipentry, @autodetected);
+		    if (!$hplipentry) {
+			$hplipentry = 
+			    printer::main::hplip_device_entry_from_uri
+			    ($hplipdevice);
+		    }
+		    if (($makemodel !~ /\S/) ||
+			($makemodel =~ /$searchunknown/i)) {
+			$makemodel = $hplipentry->{model};
+			$makemodel =~ s/_/ /g;
+			$makemodel = "HP " . $makemodel 
+			    if $makemodel !~ m!^HP\s!i;
 		    }
 		}
-		# Configure scanning with SANE on the MF device
-		if ($makemodel !~ /HP\s+PhotoSmart/i &&
-		    $makemodel !~ /HP\s+LaserJet\s+2200/i &&
-		    $makemodel !~ /HP\s+(DeskJet|dj)\s*450/i) {
+	    }
+
+	    if ($hplipdevice) {
+		# Configure scanning with SANE on HP's MF devices
+		if ($hplipentry->{scan}) {
 		    # Install SANE
 		    if (!$::testing &&
-			(!files_exist(qw(/usr/bin/scanimage
-					/usr/bin/xscanimage
-					/etc/sane.d/dll.conf
-					/usr/lib/libsane-hpoj.so.1)) ||
+			(!files_exist("/usr/bin/scanimage",
+				      #"/usr/bin/xscanimage",
+				      "/etc/sane.d/dll.conf",
+				      "/usr/$lib/sane/libsane-hpaio.so.1") ||
 			 (!files_exist(qw(/usr/bin/xsane)) &&
 			  !files_exist(qw(/usr/bin/kooka)) &&
-			  !$in->do_pkgs->is_installed('scanner-gui')))) {
+			  ($::isInstall ||
+			   !$in->do_pkgs->is_installed('scanner-gui'))))) {
 			undef $w;
-			$w = $in->wait_message
-			    (N("Printerdrake"),
+			$w = $in->wait_message(
+			     N("Printerdrake"),
 			     N("Installing SANE packages..."))
 			    if !$printer->{noninteractive};
-			$in->do_pkgs->install('sane-backends',
-					      'sane-frontends',
-					      'scanner-gui', 
-					      'libsane-hpoj1')
+			$::noX
+			    or $in->do_pkgs->install('sane-backends',
+						     #'sane-frontends',
+						     ($::isInstall ?
+						      'xsane' : 
+						      'scanner-gui'), 
+						     "${lib}sane-hpaio1")
 			    or do {
 				$in->ask_warn(N("Warning"),
 					      N("Could not install the %s packages!",
@@ -1957,76 +2613,33 @@ sub setup_common {
 						$makemodel));
 			    };
 		    }
-		    # Configure the HPOJ SANE backend
-		    printer::main::config_sane();
-		}
-		# Configure photo card access with mtools and MToolsFM
-		if (($makemodel =~ /HP\s+PhotoSmart/i ||
-		     $makemodel =~ /HP\s+PSC\s*9[05]0/i ||
-		     $makemodel =~ /HP\s+PSC\s*135\d/i ||
-		     $makemodel =~ /HP\s+PSC\s*21[57]\d/i ||
-		     $makemodel =~ /HP\s+PSC\s*22\d\d/i ||
-		     $makemodel =~ /HP\s+PSC\s*2[45]\d\d/i ||
-		     $makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i ||
-		     $makemodel =~ /HP\s+OfficeJet\s+71[34]0/i ||
-		     $makemodel =~ /HP\s+(DeskJet|dj)\s*450/i) &&
-		    $makemodel !~ /HP\s+PhotoSmart\s+7150/i) {
-		    # Install mtools and MToolsFM
-		    if (!$::testing &&
-			!files_exist(qw(/usr/bin/mdir
-						  /usr/bin/mcopy
-						  /usr/bin/MToolsFM
-						  ))) {
-			undef $w;
-			$w = $in->wait_message
-			    (N("Printerdrake"),
-			     N("Installing mtools packages..."))
-			    if !$printer->{noninteractive};
-			$in->do_pkgs->install('mtools', 'mtoolsfm')
-			    or do {
-				$in->ask_warn(N("Warning"),
-					      N("Could not install the %s packages!",
-						"Mtools") . " " .
-					      N("Photo memory card access on the %s will not be possible.",
-						$makemodel));
-			    };
-		    }
-		    # Configure mtools/MToolsFM for photo card access
-		    printer::main::config_photocard();
+		    # Configure the HPLIP SANE backend
+		    printer::main::config_sane('hpaio');
 		}
-		
-		if (!$printer->{noninteractive}) {
+		if (!$printer->{noninteractive} && !$::noX) {
 		    my $text = "";
-		    # Inform user about how to scan with his MF device
-		    $text = scanner_help($makemodel, "ptal://$ptaldevice");
+		    # Inform user about how to use HPLIP extra functions
+		    $text = hplip_help($makemodel, $hplipdevice);
 		    if ($text) {
 			undef $w;
+			local $::isWizard = 0;
 			$in->ask_warn
-			    (N("Scanning on your HP multi-function device"),
+			    (N("Using and Maintaining your %s",
+			       $makemodel),
 			     $text);
 		    }
-		    # Inform user about how to access photo cards with his 
-		    # MF device
-		    $text = photocard_help($makemodel, "ptal://$ptaldevice");
-		    if ($text) {
-			undef $w;
-			$in->ask_warn(N("Photo memory card access on your HP multi-function device"),
-				      $text);
-		    }
 		}
-		# make the DeviceURI from $ptaldevice.
-		$printer->{currentqueue}{connect} = "ptal://" . $ptaldevice;
-	    } else {
-		# make the DeviceURI from $device.
-		$printer->{currentqueue}{connect} = $device;
+		# Take the DeviceURI from $hplipdevice.
+		$printer->{currentqueue}{connect} = $hplipdevice;
 	    }
-	    $w = $in->wait_message
-		(N("Printerdrake"),
-		 N("Checking device and configuring HPOJ..."))
-		if !$printer->{noninteractive} && !defined($w);
-	} else {
+	}
+	if (!$hplipdevice) {
 	    # make the DeviceURI from $device.
 	    $printer->{currentqueue}{connect} = $device;
+	    $w = $in->wait_message(
+		 N("Printerdrake"),
+		 N("Configuring device..."))
+		if !$printer->{noninteractive} && !defined($w);
 	}
     } else {
 	# make the DeviceURI from $device.
@@ -2051,30 +2664,44 @@ sub setup_common {
     }
 
     #- if CUPS is the spooler, make sure that CUPS knows the device
-    if ($printer->{SPOOLER} eq "cups" &&
-	$device !~ /^lpd:/ &&
-	$device !~ /^smb:/ &&
-	$device !~ /^socket:/ &&
-	$device !~ /^http:/ &&
-	$device !~ /^ipp:/) {
-	my $_w = $in->wait_message
-	    (N("Printerdrake"),
-	     N("Making printer port available for CUPS..."))
-	    if !$printer->{noninteractive};
-	printer::main::assure_device_is_available_for_cups($ptaldevice ||
-							   $device);
+    if ($printer->{SPOOLER} eq "cups") {
+	my $hplipsocket = undef;
+	$hplipsocket = "hp:/" if $hplipdevice =~ m!/net/!i;
+	if ($hplipsocket || 
+	    ($device !~ /^lpd:/ &&
+	     $device !~ /^smb:/ &&
+	     $device !~ /^socket:/ &&
+	     $device !~ /^http:/ &&
+	     $device !~ /^ipp:/)) {
+	    my $_w = $in->wait_message(
+		N("Printerdrake"),
+		N("Making printer port available for CUPS..."))
+		if !$printer->{noninteractive};
+	    printer::main::assure_device_is_available_for_cups(
+		$hplipsocket || $hplipdevice || $device);
+	}
     }
 
     #- Read the printer driver database if necessary
     if (keys %printer::main::thedb == 0) {
-	my $_w = $in->wait_message
-	    (N("Printerdrake"), N("Reading printer database..."))
+	my $_w = $in->wait_message(
+	    N("Printerdrake"), N("Reading printer database..."))
 	    if !$printer->{noninteractive};
         printer::main::read_printer_db($printer, $printer->{SPOOLER});
     }
 
     #- Search the database entry which matches the detected printer best
     my $descr = "";
+    if ((!$do_auto_detect) &&
+	($makemodel =~ m!^(\S+)\s+(.*?)$!)) {
+	my $mk = $1;
+	my $md = $2;
+	@autodetected = ({ port => $device,
+			   val => { CLASS => 'PRINTER',
+				    MANUFACTURER => $mk,
+				    MODEL => $md,
+				    DESCRIPTION => $makemodel } });
+    }
     foreach (@autodetected) {
 	$device eq $_->{port} or next;
 	my ($automake, $automodel, $autodescr, $autocmdset, $autosku) =
@@ -2087,14 +2714,24 @@ sub setup_common {
 	    $descr = "$descrmake|$autosku";
 	} elsif ($automake && $automodel) {
 	    $descr = "$descrmake|$automodel";
-	} elsif ($autodescr) {
+	} elsif ($autodescr && (length($autodescr) > 5)) {
 	    $descr = $autodescr;
 	    $descr =~ s/ /|/;
 	} elsif ($automodel) {
 	    $descr = $automodel;
-	    $descr =~ s/ /|/;
+	    if ($descr !~ /$searchunknown/i) {
+		$descr =~ s/ /|/;
+	    } else {
+		$descr = "|$searchunknown";
+	    }
 	} elsif ($automake) {
 	    $descr = "$descrmake|";
+	} elsif ($makemodel =~ /\S/) {
+	    $descr = $makemodel;
+	    $descr =~ s/ /|/;
+	} else {
+	    $printer->{DBENTRY} = "";
+	    last;
 	}
 	# Remove manufacturer's name from the beginning of the
 	# description (do not do this with manufacturer names which
@@ -2186,14 +2823,14 @@ sub setup_common {
 	    # exact match or a match to the auto-detection ID string 
 	    next if $matchlength >= 100;
 	    # Try to match the (human-readable) make and model of the
-	    # Foomatic database or of thr PPD file
+	    # Foomatic database or of the PPD file
 	    my $dbmakemodel;
 	    if ($printer->{expert}) {
 		$dbmakemodel = $1 if $entry =~ m/^(.*)\|[^\|]*$/;
 	    } else {
 		$dbmakemodel = $entry;
 	    }
-	    # Don't try to match if the database entry does not provide
+	    # Do not try to match if the database entry does not provide
 	    # make and model
 	    next unless $dbmakemodel;
 	    # If make and model match exactly, we have found the correct
@@ -2254,8 +2891,9 @@ sub setup_common {
 		$descr !~ /$guessedmake/i &&
 		($guessedmake ne "hp" ||
 		 $descr !~ /Hewlett[\s-]+Packard/i))
-            { $printer->{DBENTRY} = "" };
+            { $printer->{DBENTRY} = "" }
 	}
+	last;
     }
 
     #- Pre-fill the "Description" field with the printer's model name
@@ -2274,6 +2912,7 @@ sub setup_common {
 
 sub choose_printer_name {
     my ($printer, $in) = @_;
+    local $::isEmbedded = 0;
     # Name, description, location
 #    $in->set_help('setupPrinterName') if $::isInstall;
     my $default = $printer->{currentqueue}{queue};
@@ -2281,17 +2920,24 @@ sub choose_printer_name {
 	 { title => N("Enter Printer Name and Comments"),
 	   #cancel => !$printer->{configured}{$queue} ? '' : N("Remove queue"),
 	   callbacks => { complete => sub {
-	       unless ($printer->{currentqueue}{queue} =~ /^\w+$/) {
+	       unless ($printer->{currentqueue}{queue} =~ /^[A-Za-z0-9_]+$/) {
 		   $in->ask_warn(N("Error"), N("Name of printer should contain only letters, numbers and the underscore"));
-		   return (1,0);
+		   return 1, 0;
 	       }
 	       local $::isWizard = 0;
 	       if ($printer->{configured}{$printer->{currentqueue}{queue}}
 		   && $printer->{currentqueue}{queue} ne $default && 
 		   !$in->ask_yesorno(N("Warning"), N("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?",
-					    $printer->{currentqueue}{queue}),
-				      0)) {
-		   return (1,0); # Let the user correct the name
+						     $printer->{currentqueue}{queue}),
+				     0)) {
+		   return 1, 0; # Let the user correct the name
+	       }
+	       my $ml = 12;
+	       if ((length($printer->{currentqueue}{queue}) > $ml) && 
+		   !$in->ask_yesorno(N("Warning"), N("The printer name \"%s\" has more than 12 characters which can make the printer unaccessible from Windows clients. Do you really want to use this name?",
+						     $printer->{currentqueue}{queue}),
+				     0)) {
+		   return 1, 0; # Let the user correct the name
 	       }
 	       return 0;
 	   },
@@ -2309,6 +2955,7 @@ N("Every printer needs a name (for example \"printer\"). The Description and Loc
 
 sub get_db_entry {
     my ($printer, $in) = @_;
+    local $::isEmbedded = 0;
     #- Read the printer driver database if necessary
     if (keys %printer::main::thedb == 0) {
 	my $_w = $in->wait_message(N("Printerdrake"),
@@ -2336,27 +2983,30 @@ sub get_db_entry {
 		$printer->{DBENTRY} = "$make|$model|$driverstr";
 		# database key contains the "(recommended)" for the
 		# recommended driver, so add it if necessary
-		if (!member($printer->{DBENTRY}, 
-			    keys(%printer::main::thedb))) {
-		    $printer->{DBENTRY} .= " (recommended)";
+		unless (exists($printer::main::thedb{$printer->{DBENTRY}})) {
+		    $printer->{DBENTRY} .= " $precstr";
 		}
 	    } else {
 		$printer->{DBENTRY} = "$make|$model";
 	    }
 	    $printer->{OLD_CHOICE} = $printer->{DBENTRY};
-	} elsif ($printer->{configured}{$queue}{queuedata}{ppd}) {
-	    # Do we have a native CUPS driver or a PostScript PPD file?
+	}
+	if ($printer->{configured}{$queue}{queuedata}{ppd} ||
+	    ($printer->{DBENTRY} eq "") ||
+	    !exists($printer::main::thedb{$printer->{DBENTRY}})) {
+	    # Do we have a native CUPS driver, a PostScript PPD file,
+	    # or a pre-built Foomatic PPD file?
 	    $printer->{DBENTRY} =
 		printer::main::get_descr_from_ppd($printer) ||
 		$printer->{DBENTRY};
-	    if (!member($printer->{DBENTRY}, 
-			keys(%printer::main::thedb))) {
-		$printer->{DBENTRY} .= " (recommended)";
+	    unless (exists($printer::main::thedb{$printer->{DBENTRY}})) {
+		$printer->{DBENTRY} .= " $precstr";
 	    }
 	    $printer->{OLD_CHOICE} = $printer->{DBENTRY};
 	}
 	my ($make, $model);
-	if ($printer->{DBENTRY} eq "") {
+	if (($printer->{DBENTRY} eq "") ||
+	    !exists($printer::main::thedb{$printer->{DBENTRY}})) {
 	    # Point the list cursor at least to manufacturer and model of 
 	    # the printer
 	    $printer->{DBENTRY} = "";
@@ -2373,26 +3023,29 @@ sub get_db_entry {
 	    }
 	    foreach my $key (keys %printer::main::thedb) {
 		if ($printer->{expert} &&
-		    $key =~ /^$make\|$model\|.*\(recommended\)$/ ||
+		    $key =~ /^$make\|$model\|.*$sprecstr.*$/ ||
 		    !$printer->{expert} && $key =~ /^$make\|$model$/) {
 		    $printer->{DBENTRY} = $key;
 		}
 	    }
 	}
-	if ($printer->{DBENTRY} eq "") {
+	if (($printer->{DBENTRY} eq "") ||
+	    !exists($printer::main::thedb{$printer->{DBENTRY}})) {
 	    # Exact match of make and model did not work, try to clean
 	    # up the model name
 	    $model =~ s/PS//;
 	    $model =~ s/PostScript//i;
 	    $model =~ s/Series//i;
 	    foreach my $key (keys %printer::main::thedb) {
-		if ($printer->{expert} && $key =~ /^$make\|$model\|.*\(recommended\)$/ ||
+		if ($printer->{expert} && $key =~ /^$make\|$model\|.*$sprecstr.*$/ ||
 		    !$printer->{expert} && $key =~ /^$make\|$model$/) {
 		    $printer->{DBENTRY} = $key;
 		}
 	    }
 	}
-	if ($printer->{DBENTRY} eq "" && $make ne "") {
+	if ((($printer->{DBENTRY} eq "") ||
+	     !exists($printer::main::thedb{$printer->{DBENTRY}})) &&
+	    $make ne "") {
 	    # Exact match with cleaned-up model did not work, try a best match
 	    my $matchstr = "$make|$model";
 	    $printer->{DBENTRY} = 
@@ -2403,17 +3056,18 @@ sub get_db_entry {
 	    if ($matchstr !~ /$guessedmake/i &&
 		($guessedmake ne "hp" ||
 		 $matchstr !~ /Hewlett[\s-]+Packard/i))
-	    { $printer->{DBENTRY} = "" };
+	    { $printer->{DBENTRY} = "" }
 	}
-	if ($printer->{DBENTRY} eq "") {
+	if (($printer->{DBENTRY} eq "") ||
+	    !exists($printer::main::thedb{$printer->{DBENTRY}})) {
 	    # Set the OLD_CHOICE to a non-existing value
 	    $printer->{OLD_CHOICE} = "XXX";
 	}
     } else {
-	if ($printer->{expert} && $printer->{DBENTRY} !~ /(recommended)/) {
+	if ($printer->{expert} && $printer->{DBENTRY} !~ /$sprecstr/) {
 	    my ($make, $model) = $printer->{DBENTRY} =~ /^([^\|]+)\|([^\|]+)\|/;
 	    foreach my $key (keys %printer::main::thedb) {
-		if ($key =~ /^$make\|$model\|.*\(recommended\)$/) {
+		if ($key =~ /^$make\|$model\|.*$sprecstr.*$/) {
 		    $printer->{DBENTRY} = $key;
 		}
 	    }
@@ -2425,6 +3079,7 @@ sub get_db_entry {
 
 sub is_model_correct {
     my ($printer, $in) = @_;
+    local $::isEmbedded = 0;
 #    $in->set_help('chooseModel') if $::isInstall;
     my $dbentry = $printer->{DBENTRY};
     if (!$dbentry) {
@@ -2452,6 +3107,7 @@ For your printer Printerdrake has found:
 
 sub choose_model {
     my ($printer, $in) = @_;
+    local $::isEmbedded = 0;
 #    $in->set_help('chooseModel') if $::isInstall;
     #- Read the printer driver database if necessary
     if (keys %printer::main::thedb == 0) {
@@ -2459,7 +3115,7 @@ sub choose_model {
 				  N("Reading printer database..."));
         printer::main::read_printer_db($printer, $printer->{SPOOLER});
     }
-    if (!member($printer->{DBENTRY}, keys(%printer::main::thedb))) {
+    unless (exists($printer::main::thedb{$printer->{DBENTRY}})) {
 	$printer->{DBENTRY} = N("Raw printer (No driver)");
     }
     # Choose the printer/driver from the list
@@ -2508,6 +3164,7 @@ Please check whether Printerdrake did the auto-detection of your printer model c
 sub installppd {
     my ($printer, $in) = @_;
 
+    local $::isEmbedded = 0;
     # Install a manufacturer-supplied PPD file
 
     # The dialogs to choose the PPD file should appear as extra
@@ -2545,7 +3202,7 @@ sub installppd {
 	    return 0;
 	}
 	# Let user select a PPD file from a floppy, hard disk, ...
-        $ppdfile = $in->ask_file(N("Select PPD file"), "$dir");
+        $ppdfile = $in->ask_file(N("Select PPD file"), $dir);
 	last if !$ppdfile;
 	if (! -r $ppdfile) {
 	    $in->ask_warn(N("Error"),
@@ -2565,10 +3222,10 @@ sub installppd {
     return 0 if !$ppdfile;
 
     # Install the PPD file in /usr/share/cups/ppd/printerdrake/
-    my $_w = $in->wait_message(N("Printerdrake"),
+    my $w = $in->wait_message(N("Printerdrake"),
 			       N("Installing PPD file..."));
     my $ppdentry = printer::main::installppd($printer, $ppdfile);
-    undef $_w;
+    undef $w;
     return $ppdentry;
 }
 
@@ -2591,15 +3248,16 @@ my %drv_x125_options = (
                              'usb:/dev/usb/lp0' => " -o Device=usb_lp1",
                              'usb:/dev/usb/lp1' => " -o Device=usb_lp2",
                              'usb:/dev/usb/lp2' => " -o Device=usb_lp3",
-                             'usb:/dev/usb/lp3' => " -o Device=usb_lp3",
+                             'usb:/dev/usb/lp3' => " -o Device=usb_lp4",
                              'file:/dev/usb/lp0' => " -o Device=usb_lp1",
                              'file:/dev/usb/lp1' => " -o Device=usb_lp2",
                              'file:/dev/usb/lp2' => " -o Device=usb_lp3",
-                             'file:/dev/usb/lp3' => " -o Device=usb_lp3",
+                             'file:/dev/usb/lp3' => " -o Device=usb_lp4",
                              );
 
 sub get_printer_info {
     my ($printer, $in) = @_;
+    local $::isEmbedded = 0;
     my $queue = $printer->{OLD_QUEUE};
     my $oldchoice = $printer->{OLD_CHOICE};
     my $newdriver = 0;
@@ -2612,7 +3270,8 @@ sub get_printer_info {
 	delete($printer->{currentqueue}{ppd});
 	$printer->{currentqueue}{foomatic} = 0;
 	# Read info from printer database
-	foreach (qw(printer ppd driver make model)) { #- copy some parameter, shorter that way...
+	foreach (qw(printer ppd driver make model)) {
+	    #- copy some parameters, shorter that way...
 	    $printer->{currentqueue}{$_} = $printer::main::thedb{$printer->{DBENTRY}}{$_};
 	}
 	$newdriver = 1;
@@ -2637,7 +3296,7 @@ sub get_printer_info {
 	    ($printer->{configured}{$queue}{queuedata}{foomatic} ||
 	     $printer->{configured}{$queue}{queuedata}{ppd})) {
 	    if (!$newdriver) {
-		# The user didn't change the printer/driver
+		# The user did not change the printer/driver
 		$printer->{ARGS} = $printer->{configured}{$queue}{args};
 	    } elsif ($printer->{currentqueue}{foomatic}) {
 		# The queue was already configured with Foomatic ...
@@ -2659,14 +3318,14 @@ sub get_printer_info {
 	    if ($printer->{PAPERSIZE}) {
 		$printer->{SPECIAL_OPTIONS} .= 
 		    " -o PageSize=$printer->{PAPERSIZE}";
-	    } elsif (($pagesize = $in->{lang}) ||
+	    } elsif (($pagesize = $in->{locale}{country}) ||
 		     ($pagesize = $ENV{LC_PAPER}) ||
+		     ($pagesize = $in->{locale}{lang}) ||
 		     ($pagesize = $ENV{LANG}) ||
 		     ($pagesize = $ENV{LANGUAGE}) ||
 		     ($pagesize = $ENV{LC_ALL})) {
-		if ($pagesize =~ /^en_CA/ ||
-		    $pagesize =~ /^fr_CA/ || 
-		    $pagesize =~ /^en_US/) {
+		if ($pagesize =~ /US/ ||
+		    $pagesize =~ /CA/) {
 		    $pagesize = "Letter";
 		} else {
 		    $pagesize = "A4";
@@ -2674,13 +3333,17 @@ sub get_printer_info {
 		$printer->{SPECIAL_OPTIONS} .= 
 		    " -o PageSize=$pagesize";
 	    }
-	    # oki4w driver -> OKI winprinter which needs the
+	    # Do not embed the following messages in the add-printer
+	    # wizard.
+	    local $::isWizard = 0;
+	    # oki4drv driver -> OKI winprinter which needs the
 	    # oki4daemon to work
-	    if ($printer->{currentqueue}{driver} eq 'oki4w') {
+	    if ($printer->{currentqueue}{driver} eq 'oki4drv') {
 		if ($printer->{currentqueue}{connect} !~ 
 		    m!^(parallel|file):/dev/lp0$!) {
-		    $in->ask_warn(N("OKI winprinter configuration"),
-				  N("You are configuring an OKI laser winprinter. These printers\nuse a very special communication protocol and therefore they work only when connected to the first parallel port. When your printer is connected to another port or to a print server box please connect the printer to the first parallel port before you print a test page. Otherwise the printer will not work. Your connection type setting will be ignored by the driver."));
+		    $::noX || 
+			$in->ask_warn(N("OKI winprinter configuration"),
+				      N("You are configuring an OKI laser winprinter. These printers\nuse a very special communication protocol and therefore they work only when connected to the first parallel port. When your printer is connected to another port or to a print server box please connect the printer to the first parallel port before you print a test page. Otherwise the printer will not work. Your connection type setting will be ignored by the driver."));
 		}
 		$printer->{currentqueue}{connect} = 'file:/dev/null';
 		# Start the oki4daemon
@@ -2704,20 +3367,21 @@ sub get_printer_info {
 		if ($opt) {
 		    $printer->{SPECIAL_OPTIONS} .= $opt;
 		} else {
-		    $in->ask_warn(N("Lexmark inkjet configuration"),
-				  N("The inkjet printer drivers provided by Lexmark only support local printers, no printers on remote machines or print server boxes. Please connect your printer to a local port or configure it on the machine where it is connected to."));
+		    $::noX || 
+			$in->ask_warn(N("Lexmark inkjet configuration"),
+				      N("The inkjet printer drivers provided by Lexmark only support local printers, no printers on remote machines or print server boxes. Please connect your printer to a local port or configure it on the machine where it is connected to."));
 		    return 0;
 		}
 		# Set device permissions
 		if ($printer->{currentqueue}{connect} =~ 
 		    /^\s*(file|parallel|usb):(\S*)\s*$/) {
-              if ($printer->{SPOOLER} eq 'cups') {
-                  set_permissions($2, '660', 'lp', 'sys');
-              } elsif ($printer->{SPOOLER} eq 'pdq') {
-                  set_permissions($2, '666');
-              } else {
-                  set_permissions($2, '660', 'lp', 'lp');
-              }
+		    if ($printer->{SPOOLER} eq 'cups') {
+			set_permissions($2, '660', 'lp', 'sys');
+		    } elsif ($printer->{SPOOLER} eq 'pdq') {
+			set_permissions($2, '666');
+		    } else {
+			set_permissions($2, '660', 'lp', 'lp');
+		    }
 		}
 		# This is needed to have the device not blocked by the
 		# spooler backend.
@@ -2728,13 +3392,14 @@ sub get_printer_info {
 		if ($drivertype eq 'Z23') { $drivertype = 'Z33' }
 		$drivertype = lc($drivertype);
 		if (!files_exist("/usr/local/lexmark/$drivertype/$drivertype")) {
-		    eval { $in->do_pkgs->install("lexmark-drivers-$drivertype") };
+		    eval { $::noX or $in->do_pkgs->install("lexmark-drivers-$drivertype") };
 		}
 		if (!files_exist("/usr/local/lexmark/$drivertype/$drivertype")) {
 		    # Driver installation failed, probably we do not have
 		    # the commercial CDs
-		    $in->ask_warn(N("Lexmark inkjet configuration"),
-				  N("To be able to print with your Lexmark inkjet and this configuration, you need the inkjet printer drivers provided by Lexmark (http://www.lexmark.com/). Click on the \"Drivers\" link. Then choose your model and afterwards \"Linux\" as operating system. The drivers come as RPM packages or shell scripts with interactive graphical installation. You do not need to do this configuration by the graphical frontends. Cancel directly after the license agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and adjust the head alignment settings with this program."));
+		    $::noX || 
+			$in->ask_warn(N("Lexmark inkjet configuration"),
+				      N("To be able to print with your Lexmark inkjet and this configuration, you need the inkjet printer drivers provided by Lexmark (http://www.lexmark.com/). Click on the \"Drivers\" link. Then choose your model and afterwards \"Linux\" as operating system. The drivers come as RPM packages or shell scripts with interactive graphical installation. You do not need to do this configuration by the graphical frontends. Cancel directly after the license agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and adjust the head alignment settings with this program."));
 		}
 	    } elsif ($printer->{currentqueue}{driver} eq 'drv_x125') {
 		# Set "Device" option
@@ -2743,8 +3408,9 @@ sub get_printer_info {
 		if ($opt) {
 		    $printer->{SPECIAL_OPTIONS} .= $opt;
 		} else {
-		    $in->ask_warn(N("Lexmark X125 configuration"),
-				  N("The driver for this printer only supports printers locally connected via USB, no printers on remote machines or print server boxes. Please connect your printer to a local USB port or configure it on the machine where it is connected to."));
+		    $::noX || 
+			$in->ask_warn(N("Lexmark X125 configuration"),
+				      N("The driver for this printer only supports printers locally connected via USB, no printers on remote machines or print server boxes. Please connect your printer to a local USB port or configure it on the machine where it is connected to."));
 		    return 0;
 		}
 		# Set device permissions
@@ -2761,6 +3427,72 @@ sub get_printer_info {
 		# This is needed to have the device not blocked by the
 		# spooler backend.
 		$printer->{currentqueue}{connect} = 'file:/dev/null';
+	    } elsif ($printer->{currentqueue}{driver} eq 'ml85p') {
+		# Check whether printer is on first parallel port
+		if ($printer->{currentqueue}{connect} !~
+		    m!^\s*(parallel|file):/dev/(lp|printers/)0\s*$!) {
+		    $::noX || 
+			$in->ask_warn(N("Samsung ML/QL-85G configuration"),
+				      N("The driver for this printer only supports printers locally connected on the first parallel port, no printers on remote machines or print server boxes or on other parallel ports. Please connect your printer to the first parallel port or configure it on the machine where it is connected to."));
+		    return 0;
+		}
+		# Set driver executable permissions
+		if ($printer->{SPOOLER} eq 'cups') {
+		    set_permissions('/usr/bin/ml85p', 
+				    '4750', 'root', 'sys');
+		} elsif ($printer->{SPOOLER} eq 'pdq') {
+		    set_permissions('/usr/bin/ml85p', 
+				    '4755', 'root', 'sys');
+		} else {
+		    set_permissions('/usr/bin/ml85p', 
+				    '4750', 'root', 'lp');
+		}
+		# This is needed to have the device not blocked by the
+		# spooler backend.
+		$printer->{currentqueue}{connect} = 'file:/dev/null';
+	    } elsif (($printer->{currentqueue}{driver} =~
+		      m!^\s*lbp[46]60\s*$!) || 
+		     ($printer->{currentqueue}{ppd} && 
+		      ($printer->{currentqueue}{ppd} =~ 
+		       m!Canon-LBP-[46]60-lbp[46]60.ppd!))) {
+		# Check whether printer is on first parallel port
+		if ($printer->{currentqueue}{connect} !~
+		    m!^\s*(parallel|file):/dev/(lp|printers/)0\s*$!) {
+		    $::noX || 
+			$in->ask_warn(N("Canon LBP-460/660 configuration"),
+				      N("The driver for this printer only supports printers locally connected on the first parallel port, no printers on remote machines or print server boxes or on other parallel ports. Please connect your printer to the first parallel port or configure it on the machine where it is connected to."));
+		    return 0;
+		}
+		# Set driver executable permissions
+		if ($printer->{SPOOLER} eq 'cups') {
+		    set_permissions('/usr/bin/lbp660', 
+				    '4750', 'root', 'sys');
+		} elsif ($printer->{SPOOLER} eq 'pdq') {
+		    set_permissions('/usr/bin/lbp660', 
+				    '4755', 'root', 'sys');
+		} else {
+		    set_permissions('/usr/bin/lbp660', 
+				    '4750', 'root', 'lp');
+		}
+		# This is needed to have the device not blocked by the
+		# spooler backend.
+		$printer->{currentqueue}{connect} = 'file:/dev/null';
+	    } elsif (($printer->{currentqueue}{driver} =~
+		      m!^\s*capt\s*$!) || 
+		     ($printer->{currentqueue}{ppd} && 
+		      ($printer->{currentqueue}{ppd} =~ 
+		       m!Canon-LBP-\d*-capt.ppd!))) {
+		# Check whether printer is on USB
+		if ($printer->{currentqueue}{connect} !~
+		    m!^\s*(usb):!) {
+		    $::noX || 
+			$in->ask_warn(N("Canon LBP-810/1120 (CAPT) configuration"),
+				      N("The driver for this printer only supports printers locally connected via USB, no printers on remote machines or print server boxes or on the parallel port. Please connect your printer to the USB or configure it on the machine where it is directly connected to."));
+		    return 0;
+		}
+		# This is needed to have the device not blocked by the
+		# spooler backend.
+		$printer->{currentqueue}{connect} = 'file:/dev/null';
 	    } elsif ($printer->{currentqueue}{printer} eq 'HP-LaserJet_1000') {
 		$in->ask_warn(N("Firmware-Upload for HP LaserJet 1000"),
 			      $hp1000fwtext);
@@ -2778,8 +3510,45 @@ sub get_printer_info {
     1;
 }
 
+sub unhexify {
+    # Replace hex notation for unprintable characters in PPD files
+    # by the actual characters ex: "<0A>" --> chr(hex("0A"))
+    # Taken from Foomatic
+    my ($input) = @_;
+    my $output = "";
+    my $hexmode = 0;
+    my $firstdigit = "";
+    for (my $i = 0; $i < length($input); $i++) {
+	my $c = substr($input, $i, 1);
+	if ($hexmode) {
+	    if ($c eq ">") {
+		# End of hex string
+		$hexmode = 0;
+	    } elsif ($c =~ /^[0-9a-fA-F]$/) {
+		# Hexadecimal digit, two of them give a character
+		if ($firstdigit ne "") {
+		    $output .= chr(hex("$firstdigit$c"));
+		    $firstdigit = "";
+		} else {
+		    $firstdigit = $c;
+		}
+	    }
+	} else {
+	    if ($c eq "<") {
+		# Beginning of hex string
+		$hexmode = 1;
+	    } else {
+		# Normal character
+		$output .= $c;
+	    }
+	}
+    }
+    return $output;
+}
+
 sub setup_options {
     my ($printer, $in) = @_;
+    local $::isEmbedded = 0;
     my @simple_options = 
 	("PageSize",        # Media properties
 	 "MediaType",
@@ -2892,8 +3661,8 @@ You should make sure that the page size and the ink type/printing mode (if avail
 	    # Should the option only show when the "Advanced" button was
 	    # clicked?
 	    my $advanced = ((defined($printer->{ARGS}[$i]{group}) &&
-			     ($printer->{ARGS}[$i]{group} !~
-			      /^(|General|.*install.*)$/i)) ||
+			     $printer->{ARGS}[$i]{group} !~
+			      /^(|General|.*install.*)$/i) ||
 			    (!($printer->{ARGS}[$i]{group}) &&
 			     !member($printer->{ARGS}[$i]{name},
 				     @simple_options)) ? 1 : 0);
@@ -2903,8 +3672,8 @@ You should make sure that the page size and the ink type/printing mode (if avail
 		$oldgroup[$advanced] = $printer->{ARGS}[$i]{group};
 		if ($printer->{ARGS}[$i]{group}) {
 		    push(@widgets,
-			 { val => 
-			   join(" / ", @{$printer->{ARGS}[$i]{grouptrans}}),
+			 { val => unhexify(join(" / ", 
+				     @{$printer->{ARGS}[$i]{grouptrans}})),
 			   advanced => $advanced });
 		}
 	    }
@@ -2913,35 +3682,35 @@ You should make sure that the page size and the ink type/printing mode (if avail
 		$choicelists[$i] = [];
 		$shortchoicelists[$i] = [];
 		foreach my $choice (@{$printer->{ARGS}[$i]{vals}}) {
-		    push(@{$choicelists[$i]}, $choice->{comment});
+		    push(@{$choicelists[$i]}, unhexify($choice->{comment}));
 		    push(@{$shortchoicelists[$i]}, $choice->{value});
 		    if ($choice->{value} eq $optshortdefault) {
-			$userinputs[$i] = $choice->{comment};
+			$userinputs[$i] = unhexify($choice->{comment});
 		    }
 		}
 		push(@widgets,
-		     { label => $printer->{ARGS}[$i]{comment}, 
+		     { label => unhexify($printer->{ARGS}[$i]{comment}), 
 		       val => \$userinputs[$i], 
 		       not_edit => 1,
 		       list => \@{$choicelists[$i]},
 		       sort => 0,
 		       advanced => $advanced,
 		       help => $helptext })
-		    if ($printer->{ARGS}[$i]{name} ne 'PageRegion');
+		    if $printer->{ARGS}[$i]{name} ne 'PageRegion';
 	    } elsif ($printer->{ARGS}[$i]{type} eq 'bool') {
 		# boolean option
-		$choicelists[$i] = [($printer->{ARGS}[$i]{comment_true} ||
-				     $printer->{ARGS}[$i]{name} || "Yes"),
-				    ($printer->{ARGS}[$i]{comment_false} ||
-				     $printer->{ARGS}[$i]{name_false} ||
-				     "No")];
+		$choicelists[$i] =
+		    [(unhexify($printer->{ARGS}[$i]{comment_true}) ||
+		      unhexify($printer->{ARGS}[$i]{name}) || "Yes"),
+		     (unhexify($printer->{ARGS}[$i]{comment_false}) ||
+		      unhexify($printer->{ARGS}[$i]{name_false}) || "No")];
 		$shortchoicelists[$i] = [];
 		my $numdefault = 
-		    ($optshortdefault =~ m!^\s*(true|on|yes|1)\s*$! ? 
+		    ($optshortdefault =~ m!^\s*(true|on|yes|1)\s*$!i ? 
 		     "1" : "0");
 		$userinputs[$i] = $choicelists[$i][1-$numdefault];
 		push(@widgets,
-		     { label => $printer->{ARGS}[$i]{comment},
+		     { label => unhexify($printer->{ARGS}[$i]{comment}),
 		       val => \$userinputs[$i],
 		       not_edit => 1,
 		       list => \@{$choicelists[$i]},
@@ -2954,7 +3723,7 @@ You should make sure that the page size and the ink type/printing mode (if avail
 		$shortchoicelists[$i] = [];
 		$userinputs[$i] = $optshortdefault;
 		push(@widgets,
-		     { label => $printer->{ARGS}[$i]{comment} . 
+		     { label => unhexify($printer->{ARGS}[$i]{comment}) . 
 			   " ($printer->{ARGS}[$i]{min}... " .
 			       "$printer->{ARGS}[$i]{max})",
 			   #type => 'range',
@@ -3007,16 +3776,16 @@ You should make sure that the page size and the ink type/printing mode (if avail
 		     for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
 			 if ($printer->{ARGS}[$i]{type} eq 'int' || $printer->{ARGS}[$i]{type} eq 'float') {
 			     if ($printer->{ARGS}[$i]{type} eq 'int' && $userinputs[$i] !~ /^[\-\+]?[0-9]+$/) {
-				 $in->ask_warn(N("Error"), N("Option %s must be an integer number!", $printer->{ARGS}[$i]{comment}));
-				 return (1, $i);
+				 $in->ask_warn(N("Error"), N("Option %s must be an integer number!", unhexify($printer->{ARGS}[$i]{comment})));
+				 return 1, $i;
 			     }
 			     if ($printer->{ARGS}[$i]{type} eq 'float' && $userinputs[$i] !~ /^[\-\+]?[0-9\.]+$/) {
-				 $in->ask_warn(N("Error"), N("Option %s must be a number!", $printer->{ARGS}[$i]{comment}));
-				 return (1, $i);
+				 $in->ask_warn(N("Error"), N("Option %s must be a number!", unhexify($printer->{ARGS}[$i]{comment})));
+				 return 1, $i;
 			     }
 			     if ($userinputs[$i] < $printer->{ARGS}[$i]{min} || $userinputs[$i] > $printer->{ARGS}[$i]{max}) {
-				 $in->ask_warn(N("Error"), N("Option %s out of range!", $printer->{ARGS}[$i]{comment}));
-				 return (1, $i);
+				 $in->ask_warn(N("Error"), N("Option %s out of range!", unhexify($printer->{ARGS}[$i]{comment})));
+				 return 1, $i;
 			     }
 			 }
 		     }
@@ -3063,6 +3832,7 @@ You should make sure that the page size and the ink type/printing mode (if avail
 
 sub setasdefault {
     my ($printer, $in) = @_;
+    local $::isEmbedded = 0;
 #    $in->set_help('setupAsDefault') if $::isInstall;
     if ($printer->{DEFAULT} eq '' || # We have no default printer,
 	                             # so set the current one as default
@@ -3074,6 +3844,7 @@ sub setasdefault {
 	
 sub print_testpages {
     my ($printer, $in, $upNetwork) = @_;
+    local $::isEmbedded = 0;
 #    $in->set_help('printTestPages') if $::isInstall;
     # print test pages
     my $res2 = 0;
@@ -3105,7 +3876,7 @@ Note: the photo test page can take a rather long time to get printed and on lase
 					$res2 = 0;
 					$oldres2 = 0;
 				 }
-				 $old_options{standard} = $options{standard};
+				 $old_options{$opt} = $options{$opt};
 			  }
 		   }
 		   return 0;
@@ -3123,9 +3894,10 @@ Note: the photo test page can take a rather long time to get printed and on lase
 	  { text => N("Photo test page"), type => 'bool', val => \$options{photo} },
 	  #{ text => N("Plain text test page"), type => 'bool',
 	  #  val => \$options{ascii} }
-	  if_($::isWizard,
-	   { text => N("Do not print any test page"), type => 'bool', 
-	     val => \$res2 })
+	  #if_($::isWizard,
+	  # ({ val => "__________" },
+	  #  { text => N("Do not print any test page"), type => 'bool', 
+	  #    val => \$res2 }))
 	  ]);
     $res2 = 1 if !($options{standard} || $options{altletter} || $options{alta4} || $options{photo} || $options{ascii});
     if ($res1 && !$res2) {
@@ -3146,6 +3918,9 @@ Note: the photo test page can take a rather long time to get printed and on lase
 		!files_exist('/usr/bin/convert')) {
 		$in->do_pkgs->install('ImageMagick')
 		    or do {
+			# Do not embed this message in the add-printer
+			# wizard.
+			local $::isWizard = 0;
 			$in->ask_warn(N("Warning"),
 				      N("Could not install the %s package!",
 					"ImageMagick") . " " .
@@ -3174,6 +3949,9 @@ Printing status:\n%s\n\n", @lpq_output);
 It may take some time before the printer starts.\n");
 	}
 	if ($printer->{NEW} == 0) {
+	    # Do not embed the following messages in the add-printer
+	    # wizard.
+	    local $::isWizard = 0;
 	    $in->ask_warn(N("Printerdrake"),$dialogtext);
 	    return 1;
 	} else {
@@ -3188,34 +3966,29 @@ It may take some time before the printer starts.\n");
 
 sub printer_help {
     my ($printer, $in) = @_;
+    local $::isEmbedded = 0;
     my $spooler = $printer->{SPOOLER};
+    $spooler = "cups" if $spooler eq "rcups";
     my $queue = $printer->{QUEUE};
     my $default = $printer->{DEFAULT};
     my $raw = 0;
     my $cupsremote = 0;
+    my $hplip = "";
     my $scanning = "";
     my $photocard = "";
     my $hp11000fw = "";
     if ($printer->{configured}{$queue}) {
-	if ($printer->{configured}{$queue}{queuedata}{model} eq "Unknown model" ||
+	if ($printer->{configured}{$queue}{queuedata}{model} eq N("Unknown model") ||
 	    $printer->{configured}{$queue}{queuedata}{model} eq N("Raw printer")) {
 	    $raw = 1;
 	}
-	# Information about scanning with HP's multi-function devices
-	$scanning = scanner_help(
+	# Information about extra functions of HP printers enabled by HPLIP
+	$hplip = hplip_help(
 	     $printer->{configured}{$queue}{queuedata}{make} . " " .
 	     $printer->{configured}{$queue}{queuedata}{model}, 
 	     $printer->{configured}{$queue}{queuedata}{connect});
-	if ($scanning) {
-	    $scanning = "\n\n$scanning\n\n";
-	}
-	# Information about photo card access with HP's multi-function devices
-	$photocard = photocard_help(
-	     $printer->{configured}{$queue}{queuedata}{make} . " " .
-	     $printer->{configured}{$queue}{queuedata}{model}, 
-	     $printer->{configured}{$queue}{queuedata}{connect});
-	if ($photocard) {
-	    $photocard = "\n\n$photocard\n\n";
+	if ($hplip) {
+	    $hplip = "\n\n$hplip\n\n";
 	}
 	if ($printer->{configured}{$queue}{queuedata}{printer} eq
 	    'HP-LaserJet_1000') {
@@ -3238,11 +4011,11 @@ The \"%s\" command also allows to modify the option settings for a particular pr
 (!$cupsremote ?
  N("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s%s
 
-", $scanning, $photocard, $hp11000fw) . printer::main::help_output($printer, 'cups') : 
- $scanning . $photocard . $hp11000fw .
+", $hplip, $hp11000fw) . printer::main::help_output($printer, 'cups') : 
+ $hplip . $hp11000fw .
  N("Here is a list of the available printing options for the current printer:
 
-") . printer::main::help_output($printer, 'cups')) : $scanning . $photocard . $hp11000fw);
+") . printer::main::help_output($printer, 'cups')) : $hplip . $hp11000fw);
     } elsif ($spooler eq "lprng") {
 	$dialogtext =
 N("To print a file from the command line (terminal window) use the command \"%s <file>\".
@@ -3252,7 +4025,7 @@ N("This command you can also use in the \"Printing command\" field of the printi
 (!$raw ?
 N("
 The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -Z option=setting -Z switch" : "lpr -Z option=setting -Z switch")) .
-N("To get a list of the options available for the current printer click on the \"Print option list\" button.") . $scanning . $photocard . $hp11000fw : $scanning . $photocard . $hp11000fw);
+N("To get a list of the options available for the current printer click on the \"Print option list\" button.") . $hplip . $hp11000fw : $hplip . $hp11000fw);
     } elsif ($spooler eq "lpd") {
 	$dialogtext =
 N("To print a file from the command line (terminal window) use the command \"%s <file>\".
@@ -3262,7 +4035,7 @@ N("This command you can also use in the \"Printing command\" field of the printi
 (!$raw ?
 N("
 The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) .
-N("To get a list of the options available for the current printer click on the \"Print option list\" button.") . $scanning . $photocard . $hp11000fw : $scanning . $photocard . $hp11000fw);
+N("To get a list of the options available for the current printer click on the \"Print option list\" button.") . $hplip . $hp11000fw : $hplip . $hp11000fw);
     } elsif ($spooler eq "pdq") {
 	$dialogtext =
 N("To print a file from the command line (terminal window) use the command \"%s <file>\" or \"%s <file>\".
@@ -3278,16 +4051,12 @@ The \"%s\" and \"%s\" commands also allow to modify the option settings for a pa
 ", "pdq", "lpr", ($queue ne $default ? "pdq -P $queue -aoption=setting -oswitch" : "pdq -aoption=setting -oswitch")) .
 N("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s%s
 
-", $scanning, $photocard, $hp11000fw) . printer::main::help_output($printer, 'pdq') :
- $scanning . $photocard . $hp11000fw);
+", $hplip, $hp11000fw) . printer::main::help_output($printer, 'pdq') :
+ $hplip . $hp11000fw);
     }
-    my $windowtitle = ($scanning ?
-                       ($photocard ?
-			N("Printing/Scanning/Photo Cards on \"%s\"", $queue) :
-			N("Printing/Scanning on \"%s\"", $queue)) :
-                       ($photocard ?
-			N("Printing/Photo Card Access on \"%s\"", $queue) :
-			N("Printing on the printer \"%s\"", $queue)));
+    my $windowtitle = ($hplip ?
+			 N("Using/Maintaining the printer \"%s\"", $queue) :
+			 N("Printing on the printer \"%s\"", $queue));
     if (!$raw && !$cupsremote) {
         my $choice;
         while ($choice ne N("Close")) {
@@ -3297,7 +4066,7 @@ N("To know about the options available for the current printer read either the l
 		 N("Close"));
 	    if ($choice ne N("Close")) {
 		my $_w = $in->wait_message(N("Printerdrake"),
-					  N("Printing test page(s)..."));
+					  N("Printing option list..."));
 	        printer::main::print_optionlist($printer);
 	    }
 	}
@@ -3306,52 +4075,45 @@ N("To know about the options available for the current printer read either the l
     }
 }
 
-sub scanner_help {
-    my ($makemodel, $deviceuri) = @_;
-    if ($deviceuri =~ m!^ptal://?(.*?)$!) {
-	my $ptaldevice = $1;
-	if ($makemodel !~ /HP\s+PhotoSmart/i &&
-	    $makemodel !~ /HP\s+LaserJet\s+2200/i &&
-	    $makemodel !~ /HP\s+(DeskJet|dj)\s*450/i) {
-	    # Models with built-in scanner
-	    return N("Your multi-function device was configured automatically to be able to scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the scanner when you have more than one) from the command line or with the graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, you can also scan by choosing the appropriate point in the \"File\"/\"Acquire\" menu. Call also \"man scanimage\" on the command line to get more information.
-
-Do not use \"scannerdrake\" for this device!",
-		     $ptaldevice);
-	} else {
-	    # Scanner-less models
-	    return "";
-	}
+sub hplip_help {
+    my ($makemodel, $deviceuri, $hplipentry) = @_;
+    return "" if (!$hplipentry && $deviceuri !~ m!^hp:/!);
+    if (!$hplipentry) {
+	$hplipentry =
+	    printer::main::hplip_device_entry_from_uri($deviceuri);
+	return "" if !$hplipentry;
     }
-}
 
-sub photocard_help {
-    my ($makemodel, $deviceuri) = @_;
-    if ($deviceuri =~ m!^ptal://?(.*?)$!) {
-	my $ptaldevice = $1;
-	if (($makemodel =~ /HP\s+PhotoSmart/i ||
-	     $makemodel =~ /HP\s+PSC\s*9[05]0/i ||
-	     $makemodel =~ /HP\s+PSC\s*135\d/i ||
-	     $makemodel =~ /HP\s+PSC\s*21[57]\d/i ||
-	     $makemodel =~ /HP\s+PSC\s*22\d\d/i ||
-	     $makemodel =~ /HP\s+PSC\s*2[45]\d\d/i ||
-	     $makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i ||
-	     $makemodel =~ /HP\s+OfficeJet\s+71[34]0/i ||
-	     $makemodel =~ /HP\s+(DeskJet|dj)\s*450/i) &&
-	    $makemodel !~ /HP\s+PhotoSmart\s+7150/i) {
-	    # Models with built-in photo card drives
-	    return N("Your printer was configured automatically to give you access to the photo card drives from your PC. Now you can access your photo cards using the graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> \"MTools File Manager\") or the command line utilities \"mtools\" (enter \"man mtools\" on the command line for more info). You find the card's file system under the drive letter \"p:\", or subsequent drive letters when you have more than one HP printer with photo card drives. In \"MtoolsFM\" you can switch between drive letters with the field at the upper-right corners of the file lists.",
-		     $ptaldevice);
-	} else {
-	    # Photo-card-drive-less models
-	    return "";
-	}
+    my $text = N("Your %s is set up with HP's HPLIP driver software. This way many special features of your printer are supported.\n\n", $makemodel);
+    
+    if ($hplipentry->{scan}) {
+	$text .= N("The scanner in your printer can be used with the usual SANE software, for example Kooka or XSane (Both in the Multimedia/Graphics menu). ");
+	$text .= N("Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to share your scanner on the network.\n\n");
+    }
+
+    if (($hplipentry->{card} == 2) && ($deviceuri =~ m!/usb/!i)) {
+	$text .= N("The memory card readers in your printer can be accessed like a usual USB mass storage device. ");
+	$text .= N("After inserting a card a hard disk icon to access the card should appear on your desktop.\n\n");
+    } elsif ($hplipentry->{card} > 0) {
+	$text .= N("The memory card readers in your printer can be accessed using HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) clicking the \"Access Photo Cards...\" button on the \"Functions\" tab. ");
+	$text .= N("Note that this is very slow, reading the pictures from the camera or a USB card reader is usually faster.\n\n");
     }
+
+    $text .= N("HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) offers a lot of status monitoring and maintenance functions for your %s:\n\n", $makemodel);
+    $text .= N(" - Ink level/status info\n") if $hplipentry->{status};
+    $text .= N(" - Ink nozzle cleaning\n") if $hplipentry->{clean};
+    $text .= N(" - Print head alignment\n") if $hplipentry->{align};
+    $text .= N(" - Color calibration\n") if $hplipentry->{colorcal};
+
+    $text .= "\n";
+
+    return $text;
 }
 
 sub copy_queues_from {
     my ($printer, $in, $oldspooler) = @_;
 
+    local $::isEmbedded = 0;
 #    $in->set_help('copyQueues') if $::isInstall;
     my $newspooler = $printer->{SPOOLER};
     my @oldqueues;
@@ -3419,14 +4181,14 @@ You can also type a new name or skip this printer.",
 		        callbacks => { complete => sub {
 	                    unless ($newqueue =~ /^\w+$/) {
 				$in->ask_warn(N("Error"), N("Name of printer should contain only letters, numbers and the underscore"));
-				return (1,0);
+				return 1, 0;
 			    }
 			    if ($printer->{configured}{$newqueue}
 				&& $newqueue ne $oldqueue && 
 				!$in->ask_yesorno(N("Warning"), N("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?",
 							 $newqueue),
 						   0)) {
-				return (1,0); # Let the user correct the name
+				return 1, 0; # Let the user correct the name
 			    }
 			    return 0;
 			} }
@@ -3463,14 +4225,17 @@ You can also type a new name or skip this printer.",
 
 sub start_network {
     my ($in, $upNetwork) = @_;
+    local $::isEmbedded = 0;
     my $_w = $in->wait_message(N("Printerdrake"), 
 			      N("Starting network..."));
     if ($::isInstall) {
-	return ($upNetwork and 
-		do { my $ret = &$upNetwork(); 
-		     undef $upNetwork; 
-		     sleep(1);
-		     $ret });
+	my $ret;
+	if ($upNetwork) {
+            $ret = &$upNetwork();
+            undef $upNetwork;
+            sleep(1);
+        }
+        return $ret;
     } else { return printer::services::start("network") }
 }
 
@@ -3491,8 +4256,9 @@ sub check_network {
     # that the network is up and running so that the remote printer is
     # reachable.
 
-    my ($printer, $in, $upNetwork, $dontconfigure) = @_;
+    my ($printer, $in, $upNetwork, $b_dontconfigure) = @_;
 
+    local $::isEmbedded = 0;
     # Any additional dialogs caused by this subroutine should appear as
     # extra windows and not embedded in the "Add printer" wizard.
     local $::isWizard = 0;
@@ -3502,7 +4268,7 @@ sub check_network {
     # First check: Do configured networks
     # (/etc/sysconfig/network-scripts/ifcfg*) exist?
 
-    if (!$dontconfigure && !network_configured()) {
+    if (!$b_dontconfigure && !network_configured()) {
 	my $go_on = 0;
 	while (!$go_on) {
 	    my $choice = N("Configure the network now");
@@ -3513,12 +4279,12 @@ sub check_network {
 					    N("Go on without configuring the network") ] } ])) {
 		if ($choice eq N("Configure the network now")) {
 		    if ($::isInstall) {
+			my $o = $in;
 			require network::netconnect;
 		        network::netconnect::main(
 			     $in->{prefix}, $in->{netcnx} ||= {}, 
 			     $in, $in->{netc}, $in->{mouse}, 
 			     $in->{intf});
-#    my ($prefix, $netcnx, $in, $o_netc, $o_mouse, $o_intf, $o_first_time, $o_noauto) = @_;
 		    } else {
 			system("/usr/sbin/drakconnect");
 		    }
@@ -3541,7 +4307,7 @@ sub check_network {
 
     # The network is configured now, start it.
     if (!start_network($in, $upNetwork) && 
-	(!$dontconfigure || $::isInstall)) {
+	(!$b_dontconfigure || $::isInstall)) {
 	$in->ask_warn(N("Warning"), 
 ($::isInstall ?
 N("The network configuration done during the installation cannot be started now. Please check whether the network is accessible after booting your system and correct the configuration using the %s Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the %s Control Center, section \"Hardware\"/\"Printer\"", $shortdistroname, $shortdistroname) :
@@ -3564,23 +4330,15 @@ N("The network access was not running and could not be started. Please check you
 sub security_check {
     # Check the security mode and when in "high" or "paranoid" mode ask the
     # user whether he really wants to configure printing.
-    my ($_printer, $in, $spooler) = @_;
+    my ($spooler, $security, $o_in) = @_;
 
+    local $::isEmbedded = 0;
     # Any additional dialogs caused by this subroutine should appear as
     # extra windows and not embedded in the "Add printer" wizard.
     local $::isWizard = 0;
 
 #    $in->set_help('securityCheck') if $::isInstall;
 
-    # Get security level
-    my $security;
-    if ($::isInstall) {
-	$security = $in->{security};
-    } else {
-     require security::level;
-	$security = security::level::get();
-    }
-
     # Exit silently if the spooler is PDQ
     if ($spooler eq "pdq") { return 1 }
 
@@ -3595,7 +4353,8 @@ sub security_check {
     # wants to activate the spooler in the given security mode. Stop the
     # operation of installing the spooler if he disagrees.
     my $securitystr = ($security == 4 ? N("high") : N("paranoid"));
-    if ($in->ask_yesorno(N("Installing a printing system in the %s security level", $securitystr),
+    if ($o_in &&
+	$o_in->ask_yesorno(N("Installing a printing system in the %s security level", $securitystr),
 			 N("You are about to install the printing system %s on a system running in the %s security level.
 
 This printing system runs a daemon (background process) which waits for print jobs and handles them. This daemon is also accessible by remote machines through the network and so it is a possible point for attacks. Therefore only a few selected daemons are started by default in this security level.
@@ -3620,24 +4379,26 @@ Do you really want to configure printing on this machine?",
 sub start_spooler_on_boot {
     # Checks whether the spooler will be started at boot time and if not,
     # ask the user whether he wants to start the spooler at boot time.
-    my ($printer, $in, $service) = @_;
+    my ($printer, $o_in, $b_service, $b_silentspooleronboot) = @_;
     # PDQ has no daemon, so nothing needs to be started :
-    return unless $service;
+    return unless $b_service;
 
+    local $::isEmbedded = 0;
     # Any additional dialogs caused by this subroutine should appear as
     # extra windows and not embedded in the "Add printer" wizard.
     local $::isWizard = 0;
 
 #    $in->set_help('startSpoolerOnBoot') if $::isInstall;
-    if (!services::starts_on_boot($service)) {
-	if ($in->ask_yesorno(N("Starting the printing system at boot time"),
+    if (!services::starts_on_boot($b_service)) {
+	if ($b_silentspooleronboot ||
+	    $o_in && $o_in->ask_yesorno(N("Starting the printing system at boot time"),
 			     N("The printing system (%s) will not be started automatically when the machine is booted.
 
 It is possible that the automatic starting was turned off by changing to a higher security level, because the printing system is a potential point for attacks.
 
 Do you want to have the automatic starting of the printing system turned on again?",
 		       $printer::data::spoolers{$printer->{SPOOLER}}{short_name}))) {
-	    services::start_service_on_boot($service);
+	    services::start_service_on_boot($b_service);
 	}
     }
     1;
@@ -3645,36 +4406,53 @@ Do you want to have the automatic starting of the printing system turned on agai
 
 sub install_spooler {
     # installs the default spooler and start its daemon
-    my ($printer, $in, $upNetwork) = @_;
+    my ($printer, $security, $do_pkgs, $o_in, $o_upNetwork, $b_silentspooleronboot) = @_;
+    local $::isEmbedded = 0;
     return 1 if $::testing;
     my $spooler = $printer->{SPOOLER};
     # If the user refuses to install the spooler in high or paranoid
     # security level, exit.
-    return 0 unless security_check($printer, $in, $spooler);
-    return 1 if $spooler !~ /^(cups|lpd|lprng|pqd)$/; # should not happen
-    my $w = $in->wait_message(N("Printerdrake"), N("Checking installed software..."));
+    return 0 unless security_check($spooler, $security, $o_in);
+    # should not happen
+    return 0 if $spooler !~ /^(rcups|cups|lpd|lprng|pqd)$/;
+    my $w = $::noX || $::autoqueue || ($o_in && $o_in->wait_message(N("Printerdrake"), N("Checking installed software...")));
 
     # "lpr" conflicts with "LPRng", remove either "LPRng" or remove "lpr"
     my $packages = $spoolers{$spooler}{packages2rm};
     if ($packages && files_exist($packages->[1])) {
 	undef $w;
-        $w = $in->wait_message(N("Printerdrake"), N("Removing %s ..."), $spoolers{$packages->[0]}{short_name});
-        $in->do_pkgs->remove_nodeps($packages->[0])
+        $w = $o_in && $o_in->wait_message(N("Printerdrake"), N("Removing %s..."), $spoolers{$packages->[0]}{short_name});
+        $do_pkgs->remove_nodeps($packages->[0])
 	    or do {
-		$in->ask_warn(N("Error"),
+		$o_in && $o_in->ask_warn(N("Error"),
 			      N("Could not remove the %s printing system!",
 				$spoolers{$packages->[0]}{short_name}));
 		return 0;
 	    };
     }
 
+    # Install all packages needed to run printerdrake and the chosen spooler
     $packages = $spoolers{$spooler}{packages2add};
-    if ($packages && !files_exist(@{$packages->[1]})) {
+    push @{$packages->[0]}, @{$commonpackages->[0]};
+    push @{$packages->[0]}, @{$localqueuepackages->[0]} if
+	$spoolers{$spooler}{local_queues};
+    push @{$packages->[1]}, @{$commonpackages->[1]};
+    push @{$packages->[1]}, @{$localqueuepackages->[1]} if
+	$spoolers{$spooler}{local_queues};
+    if (files_exist("/usr/bin/gimp") || files_exist("/usr/bin/gimp-2.2")) {
+	push @{$packages->[0]}, @{$gimpprintingpackages->[0]};
+	push @{$packages->[1]}, @{$gimpprintingpackages->[1]};
+    }
+#    if (files_exist("/usr/bin/gnome-panel")) {
+#	push @{$packages->[0]}, @{$gnomecupspackages->[0]};
+#	push @{$packages->[1]}, @{$gnomecupspackages->[1]};
+#    }
+    if (@{$packages->[0]} && !files_exist(@{$packages->[1]})) {
 	undef $w;
-        $w = $in->wait_message(N("Printerdrake"), N("Installing %s ..."), $spoolers{$spooler}{short_name});
-        $in->do_pkgs->install(@{$packages->[0]})
+        $w = $o_in && $o_in->wait_message(N("Printerdrake"), N("Installing %s..."), $spoolers{$spooler}{short_name});
+        $do_pkgs->install(@{$packages->[0]})
 	    or do {
-		$in->ask_warn(N("Error"),
+		$o_in && $o_in->ask_warn(N("Error"),
 			      N("Could not install the %s printing system!",
 				$spoolers{$spooler}{short_name}));
 		return 0;
@@ -3686,9 +4464,9 @@ sub install_spooler {
     # Start the network (especially during installation), so the
     # user can set up queues to remote printers.
 
-    $upNetwork and do {
-        &$upNetwork(); 
-        undef $upNetwork; 
+    $o_upNetwork and do {
+        &$o_upNetwork(); 
+        undef $o_upNetwork; 
         sleep(1);
     };
 
@@ -3698,11 +4476,24 @@ sub install_spooler {
         # Avoid unnecessary restarting of CUPS, this blocks the
         # startup of printerdrake for several seconds.
         printer::services::start_not_running_service("cups");
+	# Remove a remote CUPS server setting from the client.conf
+	# file, otherwise the local CUPS daemon gets overridden.
+	my ($daemonless_cups, $remote_cups_server) =
+	    printer::main::read_client_conf();
+	if ($daemonless_cups) {
+	    printer::main::write_client_conf(0, $remote_cups_server);
+	}
+    } elsif ($spooler eq "rcups") {
+	# Stop CUPS daemon, we want to run daemon-less
+	services::stop("cups") if services::is_service_running("cups");
+	# Do not start CUPS daemon during boot
+	services::do_not_start_service_on_boot("cups");
     } elsif ($spoolers{$spooler}{service}) {
         printer::services::restart($spoolers{$spooler}{service});
     }
     
-    # Set the choosen spooler tools as defaults for "lpr", "lpq", "lprm", ...
+    # Set the choosen spooler tools as defaults for "lpr", "lpq",
+    # "lprm", ...
     foreach (@{$spoolers{$spooler}{alternatives}}) {
         set_alternative($_->[0], $_->[1]);
     }
@@ -3711,11 +4502,52 @@ sub install_spooler {
     printer::main::pdq_panic_button($spooler eq 'pdq' ? "add" : "remove");
 
     # Should it be started at boot time?
-    start_spooler_on_boot($printer, $in, $spoolers{$spooler}{boot_spooler});
+    start_spooler_on_boot($printer, $o_in, $spoolers{$spooler}{boot_spooler},
+			  $b_silentspooleronboot);
 
     # Give a SIGHUP to the devfsd daemon to correct the permissions
     # for the /dev/... files according to the spooler
-    printer::main::SIGHUP_daemon("devfs");
+    #printer::main::SIGHUP_daemon("devfs");
+    1;
+}
+
+sub assure_remote_server_is_set {
+    my ($printer, $in) = @_;
+    local $::isEmbedded = 0;
+    # Check if a remote CUPS server is specified
+    if (!$printer->{remote_cups_server}) {
+	my ($daemonless_cups, $remote_cups_server) =
+	    printer::main::read_client_conf();
+	if (!$daemonless_cups) {
+	    if (!$in->ask_from_
+		({ title => N("Remote CUPS server and no local CUPS daemon"),
+		   messages => N("In this mode there is no local printing system, all printing requests go directly to the server specified below. Note that it is not possible to define local print queues then and if the specified server is down it cannot be printed at all from this machine.") .
+		       "\n\n" . 
+		       N("Enter the host name or IP of your CUPS server and click OK if you want to use this mode, click \"Quit\" otherwise."),
+		   cancel => N("Quit"),
+		   callbacks => {
+		       complete => sub {
+			   if ($remote_cups_server =~ /^\s*$/) {
+			       
+			       $in->ask_warn(N("Error"), N("CUPS server name or IP address missing."));
+			       return 1, 1;
+			   }
+			   return 0;
+		       },
+		   },
+	       },
+		 # Show the widgets
+		 [ { label => N("Name or IP of remote server:"),
+		     val => \$remote_cups_server, 
+		 } ],
+		 )) {
+		# Cancel was clicked
+		exit 1;
+	    }
+	    printer::main::write_client_conf(1, $remote_cups_server);
+	    $printer->{remote_cups_server} = $remote_cups_server;
+	}
+    }
     1;
 }
 
@@ -3723,8 +4555,9 @@ sub assure_default_printer_is_set {
     my ($printer, $in) = @_;
     if (defined($printer->{SPOOLER}) && $printer->{SPOOLER} &&
 	(!defined($printer->{DEFAULT}) || !$printer->{DEFAULT})) {
-	my $_w = $in->wait_message(N("Printerdrake"),
-				   N("Setting Default Printer..."));
+	my $_w = $::noX || $::autoqueue || 
+	    $in->wait_message(N("Printerdrake"),
+			      N("Setting Default Printer..."));
 	$printer->{DEFAULT} = printer::default::get_printer($printer);
 	if ($printer->{DEFAULT}) {
 	    # If a CUPS system has only remote printers and no default
@@ -3738,29 +4571,98 @@ sub assure_default_printer_is_set {
     }
 }
 
+sub set_cups_daemon_mode {
+    my ($printer, $in) = @_;
+    local $::isEmbedded = 0;
+    my ($modechoice, $daemonless_cups, $remote_cups_server);
+
+    if ($in->ask_from_
+	({ title => N("Local CUPS printing system or remote CUPS server?"),
+	   messages => N("The CUPS printing system can be used in two ways: ") .
+	       "\n\n" .
+	       N("1. The CUPS printing system can run locally. ") .
+	       N("Then locally connected printers can be used and remote printers on other CUPS servers in the same network are automatically discovered. ") .
+	       N("Disadvantage of this approach is, that more resources on the local machine are needed: Additional software packages need to be installed, the CUPS daemon has to run in the background and needs some memory, and the IPP port (port 631) is opened. ") .
+	       "\n\n" .
+	       N("2. All printing requests are immediately sent to a remote CUPS server. ") .
+	       N("Here local resource occupation is reduced to a minimum. No CUPS daemon is started or port opened, no software infrastructure for setting up local print queues is installed, so less memory and disk space is used. ") .
+	       N("Disadvantage is that it is not possible to define local printers then and if the specified server is down it cannot be printed at all from this machine. ") .
+	       "\n\n" .
+	       N("How should CUPS be set up on your machine?"),
+	   callbacks => {
+	       complete => sub {
+		   if ($modechoice eq 
+		       N("Remote server, specify Name or IP here:") &&
+		       $remote_cups_server =~ /^\s*$/) {
+		       
+		       $in->ask_warn(N("Error"), N("CUPS server name or IP address missing."));
+		       return 1, 1;
+		   }
+		   return 0;
+	       },
+	   },
+       },
+	 # Show the widgets
+	 [ { val => \$modechoice, format => \&translate,
+	     type => 'list',
+	     sort => 0,
+	     list => [ N("Local CUPS printing system"),
+		       N("Remote server, specify Name or IP here:") ] },
+	   { val => \$remote_cups_server, 
+	     disabled => sub {
+		 $modechoice ne 
+		     N("Remote server, specify Name or IP here:");
+	     } },
+	   ],
+	 )) {
+	# OK was clicked, update the data
+	$daemonless_cups = 
+	    ($modechoice eq N("Remote server, specify Name or IP here:"));
+	if ($daemonless_cups) {
+	    $printer->{SPOOLER} = "rcups";
+	    $printer->{remote_cups_server} = $remote_cups_server;
+	} else {
+	    $printer->{SPOOLER} = "cups";
+	    undef $printer->{remote_cups_server};
+	}
+	printer::main::write_client_conf($daemonless_cups,
+					 $remote_cups_server);
+	return 1;
+    } else {
+	# Cancel was clicked
+	return 0;
+    }
+}
+
+
 sub setup_default_spooler {
-    my ($printer, $in, $upNetwork) = @_;
-    $printer->{SPOOLER} ||= 'cups';
+    my ($printer, $security, $in, $upNetwork) = @_;
+    local $::isEmbedded = 0;
     my $oldspooler = $printer->{SPOOLER};
-
-    my $str_spooler = 
-	$in->ask_from_listf_raw({ title => N("Select Printer Spooler"),
-				  messages => N("Which printing system (spooler) do you want to use?"),
-				  interactive_help_id => 'setupDefaultSpooler',
-				},
-				sub { translate($_[0]) },
-			    [ printer::main::spooler() ],
-			    $spoolers{$printer->{SPOOLER}}{long_name},
-			    ) or return;
-    $printer->{SPOOLER} = $spooler_inv{$str_spooler};
+    $printer->{SPOOLER} ||= 'cups';
+    my @spoolerlist = printer::main::spooler();
+    if ($#spoolerlist == 1) {
+	set_cups_daemon_mode($printer, $in) || return;
+    } else {
+	my $str_spooler = 
+	    $in->ask_from_listf_raw({ title => N("Select Printer Spooler"),
+				      messages => N("Which printing system (spooler) do you want to use?"),
+				      interactive_help_id => 'setupDefaultSpooler',
+				  },
+				    sub { translate($_[0]) },
+				    \@spoolerlist,
+				    $spoolers{$printer->{SPOOLER}}{long_name},
+				    ) or return;
+	$printer->{SPOOLER} = $spooler_inv{$str_spooler};
+    }
     # Install the spooler if not done yet
-    if (!install_spooler($printer, $in, $upNetwork)) {
+    if (!install_spooler($printer, $security, $in->do_pkgs, $in, $upNetwork)) {
 	$printer->{SPOOLER} = $oldspooler;
 	return;
     }
+    assure_remote_server_is_set($printer, $in)
+	if ($printer->{SPOOLER} eq "rcups");
     if ($printer->{SPOOLER} ne $oldspooler) {
-	# Remove the local printers from Star Office/OpenOffice.org/GIMP
-	printer::main::removelocalprintersfromapplications($printer);
 	# Get the queues of this spooler
 	{
 	    my $_w = $in->wait_message(N("Printerdrake"),
@@ -3768,16 +4670,12 @@ sub setup_default_spooler {
 	    printer::main::read_configured_queues($printer);
 	}
 	# Copy queues from former spooler
-	copy_queues_from($printer, $in, $oldspooler);
+	copy_queues_from($printer, $in, $oldspooler)
+	    if ($oldspooler && ($oldspooler ne "rcups"));
 	# Re-read the printer database (CUPS has additional drivers, PDQ
 	# has no raw queue)
 	%printer::main::thedb = ();
 	assure_default_printer_is_set($printer, $in);
-	# Configure the current printer queues in applications
-	my $_w =
-	    $in->wait_message(N("Printerdrake"),
-			      N("Configuring applications..."));
-	printer::main::configureapplications($printer);
     }
     # Save spooler choice
     printer::default::set_spooler($printer);
@@ -3786,6 +4684,7 @@ sub setup_default_spooler {
 
 sub configure_queue {
     my ($printer, $in) = @_;
+    local $::isEmbedded = 0;
     my $_w = $in->wait_message(N("Printerdrake"),
 			       N("Configuring printer \"%s\"...",
 				 $printer->{currentqueue}{queue}))
@@ -3793,7 +4692,7 @@ sub configure_queue {
     $printer->{complete} = 1;
     my $retval = printer::main::configure_queue($printer);
     $printer->{complete} = 0;
-    if (!$retval) {
+    if (!$retval && !$printer->{noninteractive}) {
 	local $::isWizard = 0;
 	$in->ask_warn(N("Printerdrake"),
 		      N("Failed to configure printer \"%s\"!",
@@ -3804,15 +4703,17 @@ sub configure_queue {
 
 sub install_foomatic {
     my ($in) = @_;
+    local $::isEmbedded = 0;
     if (!$::testing &&
 	!files_exist(qw(/usr/bin/foomatic-configure 
 			/usr/bin/foomatic-rip
-			/usr/share/foomatic/db/source/driver/ljet4.xml))) {
+			/usr/share/foomatic/db/source/driver/ljet4.xml
+			/usr/share/foomatic/db/source/driver/hpijs.xml))) {
 	my $_w = $in->wait_message(N("Printerdrake"),
 				   N("Installing Foomatic..."));
 	$in->do_pkgs->install('foomatic-db-engine',
 			      'foomatic-filters',
-			      'foomatic-db') 
+			      'foomatic-db', 'foomatic-db-hpijs') 
 	    or do {
 		$in->ask_warn(N("Error"),
 			      N("Could not install %s packages, %s cannot be started!",
@@ -3824,6 +4725,7 @@ sub install_foomatic {
 
 sub wizard_close {
     my ($in, $mode) = @_;
+    local $::isEmbedded = 0;
     # Leave wizard mode with congratulations screen if $mode = 1
     $::Wizard_no_previous = 1;
     $::Wizard_no_cancel = 1;
@@ -3832,11 +4734,11 @@ sub wizard_close {
     undef $::isWizard;
     $::WizardWindow->destroy if defined $::WizardWindow;
     undef $::WizardWindow;
-};
+}
 
 #- Program entry point for configuration of the printing system.
 sub main {
-    my ($printer, $in, $install_step, $upNetwork) = @_;
+    my ($printer, $security, $in, $install_step, $upNetwork) = @_;
     # $install_step is only made use of during the installation. It is
     # 0 when this function is called during the preparation of the "Summary"
     # screen and 1 when the user clicks on "Configure" on the "Summary" 
@@ -3849,8 +4751,15 @@ sub main {
     # screen is clicked. If the button is clicked after an automatic
     # installation of local printers or if it is clicked for the
     # second time, these steps are not repeated.
+
+    # Set the spooler to CUPS if we arrive here during the preparation
+    # of the "Summary" screen of the installation, as we have local
+    # printers then (if we do not have local printers, this function
+    # is not called during the preparation of the "Summary" screen).
     if (!$::isInstall || !$::printerdrake_initialized) {
-	init($printer, $in, $upNetwork) or return;
+	$printer->{SPOOLER} ||= 'cups'
+	    if ($::isInstall && $install_step == 0 && !$printer->{expert});
+	init($printer, $security, $in, $upNetwork) or return;
     }
 
     # Main loop: During installation we only enter it when the user has
@@ -3859,12 +4768,12 @@ sub main {
     if (!$::isInstall || $install_step == 1) {
 	# Ask for a spooler when none is defined yet
 	$printer->{SPOOLER} ||= 
-	    setup_default_spooler($printer, $in, $upNetwork) || return;
+	    setup_default_spooler($printer, $security, $in, $upNetwork) || return;
     
 	# Save the default spooler
 	printer::default::set_spooler($printer);
 
-	mainwindow_interactive($printer, $in, $upNetwork);
+	mainwindow_interactive($printer, $security, $in, $upNetwork);
     }
     # In the installation we call the clean-up manually when we leave 
     # the "Summary" step
@@ -3874,84 +4783,76 @@ sub main {
 }
 
 sub init {
-    my ($printer, $in, $upNetwork) = @_;
+    my ($printer, $security, $in, $upNetwork) = @_;
 
     # Initialization of Printerdrake and queue auto-installation
 
+    # This subroutine is called on every start of printerdrake
+    # directly, from mcc, during installation, or for automatic print
+    # queue setup in the background, triggered when
+    # hotplug/udev/dynamic (script /etc/dynamic/script/lp.script)
+    # discovers a new printer being connected and turned on.
+
+    # In the latter case (background queue installation) only this
+    # subroutine is called as only the automatic, non-interactive
+    # print queue creation is needed. This must be totally
+    # non-interactive and cannot open any window on the X desktop,
+    # also packages cannot be installed, as the background process
+    # cannot ask the user to insert CDs. To reach this state of
+    # absolute silence, there is the global variable $::noX. If it is
+    # set, all interactivity or wait message is suppressed. If
+    # interactivity is required, the operation requiring interactivity
+    # will be skipped.
+
     # Save the user mode, so that the same one is used on the next start
     # of Printerdrake
     printer::main::set_usermode($printer->{expert});
-    
-    # printerdrake does not work without foomatic, and for more
-    # convenience we install some more stuff
-    {
-	my $_w = $in->wait_message(N("Printerdrake"),
-				   N("Checking installed software..."));
-	if (!$::testing &&
-	    !files_exist(qw(/usr/bin/foomatic-configure
-			    /usr/lib/perl5/vendor_perl/5.8.0/Foomatic/DB.pm
-			    /usr/bin/foomatic-rip
-			    /usr/share/foomatic/db/source/driver/ljet4.xml
-			    /usr/bin/escputil
-			    /usr/share/printer-testpages/testprint.ps
-			    /usr/bin/nmap
-			    /usr/bin/scli
-			    ),
-			 if_(files_exist("/usr/bin/gimp"),
-			     "/usr/lib/gimp/1.2/plug-ins/print")
-			 )) {
-	    $in->do_pkgs->install('foomatic-db-engine', 'foomatic-filters',
-				  'foomatic-db', 'printer-utils',
-				  'printer-testpages', 'nmap', 'scli',
-				  if_($in->do_pkgs->is_installed('gimp'),
-				      'gimpprint'))
-		or do {
-		    $in->ask_warn(N("Error"),
-				  N("Could not install necessary packages, %s cannot be started!",
-				    "printerdrake"));
-		    exit 1;
-		};
-	}
-	
-	# only experts should be asked for the spooler
-	$printer->{SPOOLER} ||= 'cups' if !$printer->{expert};
-	
-    }
-    
+
+    # Get the settings for printer auto administration
+    printer::main::get_auto_admin($printer);
+
+    # only experts should be asked for the spooler also for background
+    # installation of print it should not be asked for the spooler,
+    # as this feature is only supported for CUPS.
+    $printer->{SPOOLER} ||= 'cups'
+	if (!$printer->{expert} || $::noX || $::autoqueue) && !$::isInstall;
+
     # If we have chosen a spooler, install it and mark it as default 
-    # spooler
+    # spooler. Spooler installation is ommitted on background queue
+    # installation, because this only works when CUPS is already running
     if ($printer->{SPOOLER}) {
-	return 0 unless install_spooler($printer, $in, $upNetwork);
+	return 0 unless ($::noX || 
+			 install_spooler($printer, $security, $in->do_pkgs, $in, $upNetwork));
+	assure_remote_server_is_set($printer, $in)
+	    if ($printer->{SPOOLER} eq "rcups") && !$::noX && !$::autoqueue;
+	printer::main::read_configured_queues($printer)
+	    if (($printer->{SPOOLER} ne "rcups") &&
+		(keys(%{$printer->{configured}}) == 0));
 	printer::default::set_spooler($printer);
-    }
-    
-    # Get the default printer (Done before non-interactive queue setup,
-    # so that former default is not lost)
-    assure_default_printer_is_set($printer, $in);
-    my $nodefault = !$printer->{DEFAULT};
     
-    # Non-interactive setup of newly detected printers (This is done
-    # only when not in expert mode, so we always have a spooler defined
-    # here)
-    configure_new_printers($printer, $in, $upNetwork);
+	# Get the default printer (Done before non-interactive queue setup,
+	# so that former default is not lost)
+	assure_default_printer_is_set($printer, $in);
+	my $nodefault = !$printer->{DEFAULT};
+
+	# Non-interactive setup of newly detected printers (This is done
+	# only when not in expert mode, so we always have a spooler defined
+	# here)
+	configure_new_printers($printer, $in, $upNetwork)
+	    if $printer->{SPOOLER} ne "rcups";
     
-    # Make sure that default printer is registered
-    if ($nodefault && $printer->{DEFAULT}) {
-	printer::default::set_printer($printer);
+	# Make sure that default printer is registered
+	if ($nodefault && $printer->{DEFAULT}) {
+	    printer::default::set_printer($printer);
+	}
     }
 
-    # Configure the current printer queues in applications
-    my $w =
-	$in->wait_message(N("Printerdrake"),
-			  N("Configuring applications..."));
-    printer::main::configureapplications($printer);
-    undef $w;
-    
-    # Turn on printer autodetection by default
+    # Turn on local printer autodetection by default
     $printer->{AUTODETECT} = 1;
     $printer->{AUTODETECTLOCAL} = 1;
-    $printer->{AUTODETECTNETWORK} = 1;
-    $printer->{AUTODETECTSMB} = 1;
+    $printer->{AUTODETECTNETWORK} = 0;
+    $printer->{AUTODETECTSMB} = 0;
+    $printer->{CONFIGLPD} = 0;
     
     # Mark this part as done, it should not be done a second time.
     if ($::isInstall) {
@@ -3963,14 +4864,14 @@ sub init {
 
 sub mainwindow_interactive {
 
-    my ($printer, $in, $upNetwork) = @_;
+    my ($printer, $security, $in, $upNetwork) = @_;
 
     # Control variables for the main loop
     my ($menuchoice, $cursorpos) = ('', '::');
 
     while (1) {
 	my ($queue, $newcursorpos) = ('', 0);
-	# If networking is configured, start it, but don't ask the
+	# If networking is configured, start it, but do not ask the
 	# user to configure networking. We want to know whether we
 	# have a local network to suppress some buttons when there is
 	# no network
@@ -3987,7 +4888,8 @@ sub mainwindow_interactive {
 	    if (defined($printer->{configured}{$printer->{DEFAULT}})) {
 		$cursorpos = 
 		    $printer->{configured}{$printer->{DEFAULT}}{queuedata}{menuentry} . N(" (Default)");
-	    } elsif ($printer->{SPOOLER} eq "cups") {
+	    } elsif (($printer->{SPOOLER} eq "cups") ||
+		     ($printer->{SPOOLER} eq "rcups")) {
 		$cursorpos = find { /!$printer->{DEFAULT}:[^!]*$/ } printer::cups::get_formatted_remote_queues($printer);
 	    }
 	}
@@ -3998,7 +4900,8 @@ sub mainwindow_interactive {
 			   N(" (Default)") : "") }
 		  keys(%{$printer->{configured}
 			 || {}})),
-	     ($printer->{SPOOLER} eq "cups" ?
+	     (($printer->{SPOOLER} eq "cups") ||
+	      ($printer->{SPOOLER} eq "rcups") ?
 	      sort(printer::cups::get_formatted_remote_queues($printer)) :
 	      ()));
 	my $noprinters = $#printerlist < 0;
@@ -4018,40 +4921,52 @@ sub mainwindow_interactive {
 		    sort => 0, separator => "!", tree_expanded => 1,
 		    quit_if_double_click => 1, allow_empty_list => 1,
 		    list => \@printerlist }),
-	      { clicked_may_quit =>
-		    sub { 
-			# Save the cursor position
-			$cursorpos = $menuchoice;
-			$menuchoice = '@addprinter';
-			1; 
-		    },
-		val => N("Add a new printer") },
-	      ($printer->{SPOOLER} eq "cups" &&
+	      ($printer->{SPOOLER} ne "rcups" ?
+	       { clicked_may_quit =>
+		     sub { 
+			 # Save the cursor position
+			 $cursorpos = $menuchoice;
+			 $menuchoice = '@addprinter';
+			 1; 
+		     },
+		 val => N("Add a new printer") } : ()),
+	      ((($printer->{SPOOLER} eq "cups") ||
+		($printer->{SPOOLER} eq "rcups")) &&
 	       $havelocalnetworks ?
-	       ({ clicked_may_quit =>
+	       { clicked_may_quit =>
+		     sub { 
+			 # Save the cursor position
+			 $cursorpos = $menuchoice;
+			 $menuchoice = '@refresh';
+			 1;
+		     },
+		 val => ($noprinters ?
+			 N("Display all available remote CUPS printers") :
+			 N("Refresh printer list (to display all available remote CUPS printers)")) } : ()),
+	      ((($printer->{SPOOLER} eq "cups") ||
+		($printer->{SPOOLER} eq "rcups")) &&
+	       $havelocalnetworks_or_expert ?
+	       { clicked_may_quit =>
 		      sub { 
 			  # Save the cursor position
 			  $cursorpos = $menuchoice;
-			  $menuchoice = '@refresh';
+			  $menuchoice = '@cupsconfig';
 			  1;
 		      },
-		  val => ($noprinters ?
-			  N("Display all available remote CUPS printers") :
-			  N("Refresh printer list (to display all available remote CUPS printers)")) }) : ()),
-	      ($printer->{SPOOLER} eq "cups" &&
-	       $havelocalnetworks_or_expert ?
-	       ({ clicked_may_quit =>
+		  val => N("CUPS configuration") } : ()),
+	      (($printer->{SPOOLER} eq "cups") ?
+	       { clicked_may_quit =>
 		      sub { 
 			  # Save the cursor position
 			  $cursorpos = $menuchoice;
-			  $menuchoice = '@cupsconfig';
+			  $menuchoice = '@autoadminconfig';
 			  1;
 		      },
-		  val => N("CUPS configuration") }) : ()),
+		  val => N("Configure Auto Administration") } : ()),
 	      ($printer->{expert} && 
 	       (files_exist(qw(/usr/bin/pdq)) ||
-		files_exist(qw(/usr/lib/filters/lpf 
-			       /usr/sbin/lpd))) ?
+		files_exist("/usr/$lib/filters/lpf", 
+			    "/usr/sbin/lpd")) ?
 	       { clicked_may_quit =>
 		     sub {
 			 # Save the cursor position
@@ -4066,7 +4981,7 @@ sub mainwindow_interactive {
 			# Save the cursor position
 			$cursorpos = $menuchoice;
 			$menuchoice = '@usermode';
-			1 
+			1;
 			},
 			    val => ($printer->{expert} ? N("Normal Mode") :
 				    N("Expert Mode")) },
@@ -4103,12 +5018,17 @@ sub mainwindow_interactive {
 	next if $menuchoice eq '@refresh';
 	# Configure CUPS
 	if ($menuchoice eq '@cupsconfig') {
-	    config_cups($printer, $in, $upNetwork);
+	    config_cups($printer, $security, $in, $upNetwork);
+	    next;
+	}
+	# Configure auto administration
+	if ($menuchoice eq '@autoadminconfig') {
+	    config_auto_admin($printer, $in);
 	    next;
 	}
 	# Call function to switch to another spooler
 	if ($menuchoice eq '@spooler') {
-	    $printer->{SPOOLER} = setup_default_spooler($printer, $in, $upNetwork) || $printer->{SPOOLER};
+	    $printer->{SPOOLER} = setup_default_spooler($printer, $security, $in, $upNetwork) || $printer->{SPOOLER};
 	    next;
 	}
 	# Add a new print queue
@@ -4168,26 +5088,13 @@ sub add_printer {
     # Tell subroutines that we add a new printer
     $printer->{NEW} = 1;
 
-    # Default printer name, we do not use "lp" so that one can
-    # switch the default printer under LPD without needing to
-    # rename another printer.  Under LPD the alias "lp" will be
-    # given to the default printer.
-    my $defaultprname = N("Printer");
-    
-    # Determine a default name for a new printer queue
-    my %queues; 
-    @queues{map { split '\|', $_ } keys %{$printer->{configured}}} = ();
-    my $i = '';
-    while ($i < 99999) { 
-	last unless exists $queues{"$defaultprname$i"};
-	$i ++;
-    }
-    my $queue = "$defaultprname$i";
+    # Printer queue name
+    my $queue = "";
 
     #- Set default values for a new queue
     $printer_type_inv{$printer->{TYPE}} or 
 	$printer->{TYPE} = printer::default::printer_type();
-    $printer->{currentqueue} = { queue    => $queue,
+    $printer->{currentqueue} = { queue    => "",
 				 foomatic => 0,
 				 desc     => "",
 				 loc      => "",
@@ -4196,21 +5103,23 @@ sub add_printer {
 				 printer  => "",
 				 driver   => "",
 				 connect  => "",
+				 dd       => 1,
+				 att      => 0,
+				 delay    => 30,
 				 spooler  => $printer->{SPOOLER},
 			     };
-    #- Set OLD_QUEUE field so that the subroutines for the
-    #- configuration work correctly.
-    $printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue;
     #- Do all the configuration steps for a new queue
-  step_0:
-    #if (!$::isEmbedded && !$::isInstall &&
-    if ((!$::isInstall) &&
+    if (!$::isInstall &&
 	$in->isa('interactive::gtk')) {
-	# Enter wizard mode
+	local $::isEmbedded = 0;
+	undef $::WizardTable;
+	undef $::WizardWindow;
+	# Enter wizard mode (only after installation)
 	$::Wizard_pix_up = "printerdrake.png";
 	$::Wizard_title = N("Add a new printer");
 	$::isWizard = 1;
 	# Wizard welcome screen
+      step_0:
 	$::Wizard_no_previous = 1;
 	undef $::Wizard_no_cancel; undef $::Wizard_finished;
 	wizard_welcome($printer, $in, $upNetwork) or do {
@@ -4223,7 +5132,13 @@ sub add_printer {
 	    # eval to catch wizard cancel. The wizard stuff 
 	    # should be in a separate function with steps. see 
 	    # drakgw.
-	    $printer->{expert} or $printer->{TYPE} = "LOCAL";
+	    $printer->{expert} or do {
+		if ($printer->{CONFIGLPD}) { 
+		    $printer->{TYPE} = "LPD";
+		} else {
+		    $printer->{TYPE} = "LOCAL";
+		}
+	    };
 	  step_1:
 	    !$printer->{expert} or choose_printer_type($printer, $in, $upNetwork) or
 		goto step_0;
@@ -4233,19 +5148,10 @@ sub add_printer {
 		    goto step_1 if $printer->{expert};
 		    goto step_0;
 		};
-	  step_3:
-	    if ($printer->{expert} || $printer->{MANUAL} ||
-		$printer->{MORETHANONE}) {
-		choose_printer_name($printer, $in) or
-		    goto step_2;
-	    }
 	    get_db_entry($printer, $in);
 	  step_3_9:
 	    if (!$printer->{expert} && !$printer->{MANUAL}) {
-		is_model_correct($printer, $in) or do {
-		    goto step_3 if $printer->{MORETHANONE};
-		    goto step_2;
-		}
+		is_model_correct($printer, $in) or goto step_2;
 	    }
 	  step_4:
 	    # Remember DB entry for "Previous" button in wizard
@@ -4255,22 +5161,34 @@ sub add_printer {
 		choose_model($printer, $in) or do {
 		    # Restore DB entry
 		    $printer->{DBENTRY} = $dbentry;
-		    goto step_3_9 if $printer->{MANUALMODEL};
-		    goto step_3;
+		    goto step_3_9 if $printer->{MANUALMODEL} &&
+			$printer->{DBENTRY};
+		    goto step_2;
 		};
 	    }
-	    get_printer_info($printer, $in) or return 0;
+	    get_printer_info($printer, $in) or do {
+		goto step_4 if $printer->{expert} || $printer->{MANUAL} ||
+		    $printer->{MANUALMODEL};
+		goto step_3_9;
+	    };
+	    $queue = generate_queuename($printer);
 	  step_5:
 	    setup_options($printer, $in) or
 		goto step_4;
+	  step_6:
+	    if ($printer->{expert} || $printer->{MANUAL} ||
+		$printer->{MORETHANONE}) {
+		choose_printer_name($printer, $in) or do {
+		    goto step_5 if $printer->{expert} || $printer->{MANUAL};
+		    goto step_4 if $printer->{MANUALMODEL};
+		    goto step_3_9;
+		};
+	    }
 	    configure_queue($printer, $in) or die 'wizcancel';
 	    undef $printer->{MANUAL} if $printer->{MANUAL};
+	  step_7:
 	    $::Wizard_no_previous = 1;
 	    setasdefault($printer, $in);
-	    my $_w = $in->wait_message(N("Printerdrake"),
-				       N("Configuring applications..."));
-	    printer::main::configureapplications($printer);
-	    undef $_w;
 	    my $testpages = print_testpages($printer, $in, $printer->{TYPE} !~ /LOCAL/ && $upNetwork);
 	    if ($testpages == 1) {
 		# User was content with test pages
@@ -4284,18 +5202,26 @@ sub add_printer {
 		$queue = $printer->{QUEUE};
 		edit_printer($printer, $in, $upNetwork, $queue);
 		return 1;
+	    } else {
+		# "Previous" button clicked in test page dialog
+		goto step_7;
 	    }
 	};
-	wizard_close($in, 0) if $@ =~ /wizcancel/;
+	die if $@ && $@ !~ /^wizcancel/;
+	wizard_close($in, 0);
     } else {
+	# Print queue setup without wizard (for installation)
 	$printer->{expert} or $printer->{TYPE} = "LOCAL";
 	wizard_welcome($printer, $in, $upNetwork) or return 0;
+	    $printer->{expert} or do {
+		if ($printer->{CONFIGLPD}) { 
+		    $printer->{TYPE} = "LPD";
+		} else {
+		    $printer->{TYPE} = "LOCAL";
+		}
+	    };
 	!$printer->{expert} or choose_printer_type($printer, $in, $upNetwork) or return 0;
 	setup_printer_connection($printer, $in, $upNetwork) or return 0;
-	if ($printer->{expert} || $printer->{MANUAL} ||
-	    $printer->{MORETHANONE}) {
-	    choose_printer_name($printer, $in) or return 0;
-	}
 	get_db_entry($printer, $in);
 	if (!$printer->{expert} && !$printer->{MANUAL}) {
 	    is_model_correct($printer, $in) or return 0;
@@ -4305,15 +5231,15 @@ sub add_printer {
 	    choose_model($printer, $in) or return 0;
 	}
 	get_printer_info($printer, $in) or return 0;
+	$queue = generate_queuename($printer);
 	setup_options($printer, $in) or return 0;
+	if ($printer->{expert} || $printer->{MANUAL} ||
+	    $printer->{MORETHANONE}) {
+	    choose_printer_name($printer, $in) or return 0;
+	}
 	configure_queue($printer, $in) or return 0;
 	undef $printer->{MANUAL} if $printer->{MANUAL};
 	setasdefault($printer, $in);
-	# Configure the current printer queue in applications
-	my $_w = $in->wait_message(N("Printerdrake"),
-				   N("Configuring applications..."));
-	printer::main::configureapplications($printer);
-	undef $_w;
 	my $testpages = print_testpages($printer, $in, $printer->{TYPE} !~ /LOCAL/ && $upNetwork);
 	if ($testpages == 2) {
 	    # User was not content with test pages
@@ -4321,7 +5247,7 @@ sub add_printer {
 	    edit_printer($printer, $in, $upNetwork, $queue);
 	    return 1;
 	}
-    };
+    }
 
     # Delete some variables
     cleanup($printer);
@@ -4335,10 +5261,6 @@ sub edit_printer {
 
     # The menu for doing modifications on an existing print queue
 
-    # If one, we have to update the application configuration (GIMP,
-    # StarOffice, ...)
-    my $configapps = 0;
-
     # Cursor position in queue modification window
     my $modify = N("Printer options");
 
@@ -4346,7 +5268,7 @@ sub edit_printer {
     $printer->{NEW} = 0;
 
     while (defined($printer->{QUEUE}) || 
-	   defined($queue)) {  # Do not when current queue
+	   defined($queue)) {  # Do not continue when current queue
 	                       # is deleted
 	# Modify a queue, ask which part should be modified
 #	$in->set_help('modifyPrinterMenu') if $::isInstall;
@@ -4378,45 +5300,47 @@ sub edit_printer {
 	if ($in->ask_from_(
 	    { title => N("Modify printer configuration"),
 	      messages => 
-		  N("Printer %s
+		  N("Printer %s%s
 What do you want to modify on this printer?",
-		    $infoline),
+		    $infoline,
+		    if_(($printer->{SPOOLER} =~ /cups/) &&
+			!printer::cups::queue_enabled($queue),
+			"\n" . N("This printer is disabled"))),
 		  cancel => N("Close"),
 		  ok => N("Do it!")
 	      },
 	    [ { val => \$modify, format => \&translate, 
-		type => 'list',
+		type => 'list', separator => '|',
 		list => [ ($printer->{configured}{$queue} ?
 			   (N("Printer connection type"),
 			    N("Printer name, description, location"),
 			    ($printer->{expert} ?
 			     N("Printer manufacturer, model, driver") :
 			     N("Printer manufacturer, model")),
-			    if_($printer->{configured}{$queue}{queuedata}{make} ne "" &&
-				$printer->{configured}{$queue}{queuedata}{model} ne N("Unknown model") &&
-				$printer->{configured}{$queue}{queuedata}{model} ne N("Raw printer"),
+			    if_($printer->{configured}{$queue}{args},
 				N("Printer options"))) : ()),
 			  if_($queue ne $printer->{DEFAULT},
 			      N("Set this printer as the default")),
-			  if_(!$printer->{configured}{$queue},
-			      N("Add this printer to Star Office/OpenOffice.org/GIMP"),
-			      N("Remove this printer from Star Office/OpenOffice.org/GIMP")),
+			  if_(($printer->{SPOOLER} ne "pdq") &&
+			      $printer->{configured}{$queue},
+			      if_(($printer->{SPOOLER} !~ /cups/) ||
+				  !printer::cups::queue_enabled($queue),
+				  N("Enable Printer")),
+			      if_(($printer->{SPOOLER} !~ /cups/) ||
+				  printer::cups::queue_enabled($queue),
+				  N("Disable Printer"))),
+			  if_(($printer->{SPOOLER} eq "cups") &&
+			      $printer->{configured}{$queue} &&
+			      ($printer->{configured}{$queue}{queuedata}{connect} !~ m!^hp:/!), 
+			      N("Printer communication error handling")),
 			  N("Print test pages"),
 			  N("Learn how to use this printer"),
 			  if_($printer->{configured}{$queue}, N("Remove printer")) ] } ])) {
 
 	    #- Copy the queue data and work on the copy
 	    $printer->{currentqueue} = {};
-	    my $driver;
 	    if ($printer->{configured}{$queue}) {
 		printer::main::copy_printer_params($printer->{configured}{$queue}{queuedata}, $printer->{currentqueue});
-		#- Keep in mind the printer driver which was
-		#- used, so it can be determined whether the
-		#- driver is only available in expert and so
-		#- for setting the options for the driver in
-		#- recommended mode a special treatment has
-		#- to be applied.
-		$driver = $printer->{currentqueue}{driver};
 	    }
 	    #- keep in mind old name of queue (in case of changing)
 	    $printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue;
@@ -4426,17 +5350,20 @@ What do you want to modify on this printer?",
 	    #- Which printer type did we have before (check 
 	    #- beginning of URI)
 	    if ($printer->{configured}{$queue}) {
-		if ($printer->{currentqueue}{connect} =~ m!^ptal://?hpjd!) {
-		    $printer->{TYPE} = "socket";
+		if (($printer->{currentqueue}{connect} =~ 
+		     m!^ptal://?hpjd!) ||
+		    ($printer->{currentqueue}{connect} =~ 
+		     m!^hp:/net!)) {
+		    $printer->{TYPE} = "SOCKET";
 		} else {
-		    foreach my $type (qw(file parallel serial usb ptal
+		    foreach my $type (qw(file parallel serial usb ptal hp
 					 mtink lpd socket smb ncp
 					 postpipe)) {
 			if ($printer->{currentqueue}{connect} =~
 			    /^$type:/) {
 			    $printer->{TYPE} = 
 				($type =~ 
-				 /(file|parallel|serial|usb|ptal|mtink)/ ? 
+				 /(file|parallel|serial|usb|ptal|hp|mtink)/ ? 
 				 'LOCAL' : uc($type));
 			    last;
 			}
@@ -4448,15 +5375,17 @@ What do you want to modify on this printer?",
 	    if ($modify eq N("Printer connection type")) {
 		choose_printer_type($printer, $in, $upNetwork) &&
 		    setup_printer_connection($printer, $in, $upNetwork) &&
+		    #get_db_entry($printer, $in) &&
+		    get_printer_info($printer, $in) &&
 		    configure_queue($printer, $in);
 	    } elsif ($modify eq N("Printer name, description, location")) {
-		choose_printer_name($printer, $in) &&
-		    configure_queue($printer, $in) &&
-		    ($configapps = 1);
+		choose_printer_name($printer, $in) and
+		    get_printer_info($printer, $in) and
+		    configure_queue($printer, $in) or next;
 		# Delete old queue when it was renamed
 		if (lc($printer->{QUEUE}) ne lc($printer->{OLD_QUEUE})) {
-		    my $_w = $in->wait_message
-			(N("Printerdrake"),
+		    my $_w = $in->wait_message(
+			 N("Printerdrake"),
 			 N("Removing old printer \"%s\"...",
 			   $printer->{OLD_QUEUE}));
 		    printer::main::remove_queue($printer, $printer->{OLD_QUEUE});
@@ -4474,36 +5403,39 @@ What do you want to modify on this printer?",
 		choose_model($printer, $in) &&
 		    get_printer_info($printer, $in) &&
 		    setup_options($printer, $in) &&
-		    configure_queue($printer, $in) &&
-		    ($configapps = 1);
+		    configure_queue($printer, $in);
 	    } elsif ($modify eq N("Printer options")) {
 		get_printer_info($printer, $in) &&
 		    setup_options($printer, $in) &&
 		    configure_queue($printer, $in);
 	    } elsif ($modify eq N("Set this printer as the default")) {
 		default_printer($printer, $in, $queue);
-		$configapps = 1;
 		# The "Set this printer as the default" menu entry will
 		# disappear if the printer is the default, so go back to the
 		# default entry
 		$modify = N("Printer options");
-	    } elsif ($modify eq N("Add this printer to Star Office/OpenOffice.org/GIMP")) {
-		$in->ask_warn(N("Adding printer to Star Office/OpenOffice.org/GIMP"),
-			      printer::main::addcupsremotetoapplications($printer, $queue) ?
-			      N("The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP.", $queue) :
-			      N("Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP.", $queue));
-	    } elsif ($modify eq N("Remove this printer from Star Office/OpenOffice.org/GIMP")) {
-		$in->ask_warn(N("Removing printer from Star Office/OpenOffice.org/GIMP"),
-			      printer::main::removeprinterfromapplications($printer, $queue) ?
-			      N("The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/GIMP.", $queue) :
-			      N("Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP.", $queue));
+	    } elsif ($modify eq N("Enable Printer")) {
+		printer::main::enable_disable_queue($printer, $queue, 1) &&
+		    $in->ask_warn(N("Enable Printer"),
+				  N("Printer \"%s\" is now enabled.", 
+				    $queue));
+		$modify = N("Disable Printer");
+	    } elsif ($modify eq N("Disable Printer")) {
+		printer::main::enable_disable_queue($printer, $queue, 0) &&
+		    $in->ask_warn(N("Disable Printer"),
+				  N("Printer \"%s\" is now disabled.", 
+				    $queue));
+		$modify = N("Enable Printer");
+	    } elsif ($modify eq N("Printer communication error handling")) {
+		config_backend_error_handling($printer, $in) &&
+		    get_printer_info($printer, $in) &&
+		    configure_queue($printer, $in);
 	    } elsif ($modify eq N("Print test pages")) {
 		print_testpages($printer, $in, $upNetwork);
 	    } elsif ($modify eq N("Learn how to use this printer")) {
 		printer_help($printer, $in);
 	    } elsif ($modify eq N("Remove printer")) {
 		if (remove_printer($printer, $in, $queue)) {
-		    $configapps = 1;
 		    # Let the main menu cursor go to the default
 		    # position
 		    delete $printer->{QUEUE};
@@ -4511,13 +5443,6 @@ What do you want to modify on this printer?",
 		}
 	    }
 
-	    # Configure the current printer queue in applications
-	    if ($configapps) {
-		my $_w = 
-		    $in->wait_message(N("Printerdrake"),
-				      N("Configuring applications..."));
-		printer::main::configureapplications($printer);
-	    }
 	    # Delete some variables
 	    cleanup($printer);
 	} else {
@@ -4539,11 +5464,11 @@ sub remove_printer {
     # and, if yes, removes it. The default printer will be reassigned if
     # needed.
 
-    if ($in->ask_yesorno
-	(N("Warning"), N("Do you really want to remove the printer \"%s\"?", $queue),
+    if ($in->ask_yesorno(
+	 N("Warning"), N("Do you really want to remove the printer \"%s\"?", $queue),
 	 1)) {
-	my $_w = $in->wait_message
-	    (N("Printerdrake"),
+	my $_w = $in->wait_message(
+	     N("Printerdrake"),
 	     N("Removing printer \"%s\"...", $queue));
 	if (printer::main::remove_queue($printer, $queue)) { 
 	    # Define a new default printer if we have
@@ -4594,7 +5519,7 @@ sub final_cleanup {
 	}
 	delete($printer->{configured}{$queue}{queuedata}{menuentry});
     }
-    foreach (qw(Old_queue OLD_QUEUE QUEUE TYPE str_type currentqueue DBENTRY ARGS complete OLD_CHOICE NEW MORETHANONE MANUALMODEL AUTODETECT AUTODETECTLOCAL AUTODETECTNETWORK AUTODETECTSMB noninteractive expert))
-    { delete $printer->{$_} };
+    foreach (qw(Old_queue OLD_QUEUE QUEUE TYPE str_type currentqueue DBENTRY ARGS complete OLD_CHOICE NEW MORETHANONE MANUALMODEL AUTODETECT AUTODETECTLOCAL AUTODETECTNETWORK AUTODETECTSMB CONFIGLPD noninteractive expert))
+    { delete $printer->{$_} }
 }
 
diff --git a/perl-install/printer/services.pm b/perl-install/printer/services.pm
index adb2587fe..f94cc5af5 100644
--- a/perl-install/printer/services.pm
+++ b/perl-install/printer/services.pm
@@ -45,7 +45,9 @@ sub wait_for_cups() {
     my $cupsready = 0;
     my $i;
     for ($i = 0; $i < 30; $i++) {
-	run_program::rooted($::prefix, "/usr/bin/lpstat", "-r");
+	# Check whether CUPS is running without any console output
+	system(($::testing ? $::prefix : "chroot $::prefix/ ") . 
+	    "/usr/bin/lpstat -r >/dev/null 2>&1");
 	if (($? >> 8) != 0) {
 	    # CUPS is not ready, continue
 	    sleep 1;
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index f6965dfbf..bb01d456f 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2003-2004 MandrakeSoft
+# Copyright (C) 2003-2005 Mandriva
 #
-# Till Kamppeter <till@mandrakesoft.com>
-# Daouda Lo <daouda@mandrakesoft.com>
+# Till Kamppeter <till at mandriva.com>
+# Daouda Lo <daouda at mandriva.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License Version 2 as
@@ -20,6 +20,11 @@
 #
 
 use strict;
+
+# i18n: IMPORTANT: to get correct namespace (printerdrake instead of 
+# libDrakX)
+BEGIN { unshift @::textdomains, 'drakconf' }
+
 use lib qw(/usr/lib/libDrakX);
 use standalone;
 
@@ -37,64 +42,55 @@ use Gtk2::Gdk::Keysyms;
 use modules;
 use c;
 
-my $companyname = "Mandrakesoft";
-my $distroname = "Mandrakelinux";
-my $domainname = "mandrakesoft.com";
+my %sysh = distrib();
+my $distroname = $sysh{system};
+
+my $domainname = "mandriva.com";
 
 my $pixdir = '/usr/share/libDrakX/pixmaps/';
 
+my $refreshinterval = 5;
+
 local $_ = join '', @ARGV;
 
 my $printer;
 
+$ugtk2::wm_icon = "printerdrake";
 my $in = 'interactive'->vnew('su', if_(!$::isEmbedded, 'printer-mdk'));
 
 my $commandline = $_;
 
-exit 0 unless printer::printerdrake::first_time_dialog($printer, $in);
+# Suppress some wait messages to avoid windows popping up if no new print 
+# queue has to be set up
+$commandline =~ /-onlyautoqueue/ and $::autoqueue = 1;
 
 # Data structure for GTK2 main window
 my $us = {};
-$us->{VERSION} = '0.1';
-
-# GTK2 splash screen
-my $window_splash;
-if (0 && !$::isInstall && !$::isEmbedded) {
-    $window_splash = Gtk2::Window->new('popup');
-#BUG    $window_splash->signal_connect(delete_event => \&quit_global);
-    $window_splash->set_title(N("Printerdrake") . $us->{VERSION});
-    $window_splash->set_position('center_always');
-    $window_splash->add(gtkadd(gtkset_shadow_type(Gtk2::Frame->new, 'etched_out'),
-			       gtkpack(Gtk2::VBox->new(0, 0),
-				       gtkcreate_img("$pixdir/about.png"),
-				       Gtk2::Label->new(N("Loading printer configuration... Please wait"))
-				       )
-			       )
-			);
-    $window_splash->show_all;
-    gtkflush();
-}
-
-#my $wait = $in->wait_message(N("Please wait"),
-#			     N("Loading printer configuration... "));
-#gtkflush();
+$us->{VERSION} = '2006';
 
 # Check whether Foomatic is installed and install it if necessary
 #printer::printerdrake::install_foomatic($in);
 
-my $w = $in->wait_message(N("Printerdrake"),
-                          N("Reading data of installed printers..."));
+my $w = $::autoqueue ||
+    $in->wait_message(N("Printerdrake"),
+		      N("Reading data of installed printers..."));
 
 # Get what was installed before
 eval { $printer = printer::main::getinfo('') };
 
+undef $w;
+
+exit 0 unless printer::printerdrake::first_time_dialog($printer, $in, undef);
+
 # Were we in expert mode last time?
 $printer->{expert} = printer::main::get_usermode();
 
 # Choose the spooler by command line options
-$commandline =~ /-expert/ and $printer->{expert} = 1;
+$::expert and $printer->{expert} = 1;
 $commandline =~ /-cups/ and
     $printer->{SPOOLER} = 'cups' and printer::main::read_configured_queues($printer);
+$commandline =~ /-rcups/ and
+    $printer->{SPOOLER} = 'rcups' and printer::main::read_configured_queues($printer);
 $commandline =~ /-lpr/ and 
     $printer->{SPOOLER} = 'lpd'  and printer::main::read_configured_queues($printer);
 $commandline =~ /-lpd/ and 
@@ -103,29 +99,32 @@ $commandline =~ /-lprng/ and
     $printer->{SPOOLER} = 'lprng' and printer::main::read_configured_queues($printer);
 $commandline =~ /-pdq/ and 
     $printer->{SPOOLER} = 'pdq'  and printer::main::read_configured_queues($printer);
--r '/etc/modules.conf' and modules::mergein_conf('/etc/modules.conf');
-
-undef $w;
 
 if ($::isInstall) {
     # Interactive main window for installation
-    printer::printerdrake::main($printer, $in, 1);
+    printer::printerdrake::main($printer, $::o->{security}, $in, 1, undef);
     exit();
 }
 
+require security::level;
+my $security = security::level::get();
+
 # Do not let printerdrake ask for the spooler
 $printer->{SPOOLER} ||= 'cups';
 
 # Initialization
-printer::printerdrake::init($printer, $in);
+printer::printerdrake::init($printer, $security, $in, undef);
+
+# Stop here when we are supposed to only automatically set up print queues
+$commandline =~ /-onlyautoqueue/ and exit 0;
 
 # GTK2 main window
 
-my $error = 0;
 my $stringsearch = '';
 
-sub HelpSystem() { exec("drakhelp --id printerdrake") unless fork() };
+sub HelpSystem() { exec("drakhelp --id printerdrake") unless fork() }
 
+$::noborderWhenEmbedded = 1;
 $us->{wnd} = ugtk2->new(N("%s Printer Management Tool", $distroname) . " " . $us->{VERSION});
 gtkset_size_request($us->{wnd}{rwindow}, 660, 460);
 
@@ -133,13 +132,14 @@ if (!$::isEmbedded) {
     $us->{wnd}{rwindow}->set_position('center');
 }
 $us->{wnd}{window}->signal_connect(delete_event => \&QuitGlobal);
-my $ltree_model = Gtk2::ListStore->new("Glib::String", "Glib::String", "Glib::String", "Glib::String", "Glib::String", "Glib::String");
-my $rtree_model = Gtk2::ListStore->new("Glib::String", "Glib::String", "Glib::String", "Glib::String", "Glib::String");
+my $ltree_model = Gtk2::ListStore->new("Glib::String", "Glib::String", "Glib::String", "Glib::String", "Glib::String", "Glib::String", "Glib::String");
+my $rtree_model = Gtk2::ListStore->new("Glib::String", "Glib::String", "Glib::String", "Glib::String", "Glib::String", "Glib::String");
 my ($localtree, $remotetree);
 $localtree = CreateTree($ltree_model);
 $remotetree = CreateTree($rtree_model);
 # slightly verbatimed from control-center
 my %options = (
+	       'add' => [ N("/_Actions"), N("/_Add Printer") ],
 	       'default' => [ N("/_Actions"), N("/Set as _Default") ],
 	       'edit' => [ N("/_Actions"), N("/_Edit") ],
 	       'delete' => [ N("/_Actions"), N("/_Delete") ],
@@ -168,19 +168,18 @@ my ($menu, $factory) = create_factory_menu($::isEmbedded ? $::Plug : $us->{wnd}{
 						  %printer::main::thedb = 
 						      ();
                                               }, undef, '<CheckItem>' ],
+                                            [ N("/_Options") . N("/Configure _Auto Administration"), undef, \&ConfigAutoAdmin, undef, '<StockItem>', 'gtk-autoadmin' ],
                                             [ N("/_Help"), undef, undef, undef, '<Branch>' ],
 					    if_(-x "/usr/sbin/drakhelp_inst",
-						[ N("/_Help").N("/_Help"), undef, sub { HelpSystem() }, undef, '<StockItem>', 'gtk-help' ],
+						[ N("/_Help") . N("/_Help"), undef, sub { HelpSystem() }, undef, '<StockItem>', 'gtk-help' ],
 					       ),
 					    if_(!-e "/etc/sysconfig/oem",
-						[ N("/_Help").N("/_Report Bug"), undef, sub { system("$ENV{BROWSER} https://qa.$domainname &") }, undef, '<StockItem>', 'gtk-stop' ],
+						[ N("/_Help") . N("/_Report Bug"), undef, sub { system("$ENV{BROWSER} https://qa.$domainname &") }, undef, '<StockItem>', 'gtk-stop' ],
 					       ),
-                                            [ N("/_Help").N("/_About..."), undef, \&About, undef, '<StockItem>', 'gtk-preferences' ]
+                                            [ N("/_Help") . N("/_About..."), undef, \&About, undef, '<StockItem>', 'gtk-preferences' ]
 					   )
 					  );
-%buttorcheck = map {
-    $_ => $factory->get_widget("<main>" . join '', map { s/_//; $_ } @{$options{$_}})
-}('default', 'edit', 'delete', 'expert');
+%buttorcheck = map {  $_ => $factory->get_widget("<main>" . join '', map { s/_//; $_ } @{$options{$_}}) } ('add', 'default', 'edit', 'delete', 'expert');
 
 if (defined $buttorcheck{expert}) {
     $buttorcheck{expert}->set_active($printer->{expert});
@@ -194,80 +193,100 @@ my $searchBox = gtkpack_(Gtk2::HBox->new(0,5),
                          1, Gtk2::Label->new(""),
                          0, Gtk2::Label->new(N("Search:")),
                          0, gtksignal_connect($filter = Gtk2::Entry->new,
-				       key_press_event => sub { $_[1]->keyval == $Gtk2::Gdk::Keysyms{Return} and Refresh($filter->get_text) }),
+				       key_press_event => sub { $_[1]->keyval == $Gtk2::Gdk::Keysyms{Return} and do { $stringsearch = $filter->get_text; Refresh($stringsearch) };}),
                          0, my $fbut = Gtk2::Button->new(N("Apply filter")),
                         );
 gtkappend_page(my $nb = Gtk2::Notebook->new, gtkpack(create_scrolled_window($localtree)), gtkshow(Gtk2::Label->new(N("Configured on this machine"))));
 gtkappend_page($nb, gtkpack(create_scrolled_window($remotetree)), gtkshow(Gtk2::Label->new(N("Configured on other machines"))));
 $nb->set_show_border(0);
+
+my @extra_widgets;
+if ($::isEmbedded) {
+	push @extra_widgets, 0, Gtk2::Banner->new("/usr/share/mcc/themes/default/printer-mcc-mdk.png",
+		#-PO: do not translate, this is already translated in mcc
+		translate("Printers"));
+}	 
+
 $us->{wnd}{window}->add(gtkpack_(Gtk2::VBox->new(0, 0),
 				  0, $menu,
+				  @extra_widgets,
 				  0, $toolb,
 				  0, $searchBox,
 				  0, Gtk2::HSeparator->new,
 				  1, $nb));
-my @lcolsize = (1, 1, 1, 1, 1, 1, -1);
-my @rcolsize = (1, 1, 1, 1, 1, -1);
+my @lcolsize = (1, 1, 1, 1, 1, 1, 1, -1);
+my @rcolsize = (1, 1, 1, 1, 1, 1, -1);
 each_index {
     my $col = Gtk2::TreeViewColumn->new_with_attributes($_, Gtk2::CellRendererText->new, 'text' => $::i);
     $col->set_sort_column_id($::i);
     $col->set_min_width($lcolsize[$::i]);
     $localtree->append_column($col);
-} (N("Def."), N("Printer Name"), N("Model"), N("Connection Type"), N("Description"), N("Location"));
+} (N("Def."), N("Printer Name"), N("State"), N("Model"), N("Connection Type"), N("Description"), N("Location"));
 
 each_index {
     my $col = Gtk2::TreeViewColumn->new_with_attributes($_, Gtk2::CellRendererText->new, 'text' => $::i);
     $col->set_sort_column_id($::i);
     $col->set_min_width($rcolsize[$::i]);
     $remotetree->append_column($col);
-} (N("Def."), N("Printer Name"), N("Server Name"), N("Description"), N("Location"));
+} (N("Def."), N("Printer Name"), N("State"), N("Server Name"), N("Description"), N("Location"));
 my @toolbwg = map {
     $toolb->append_item($_->[0], $_->[1], $_->[2],  
                         Gtk2::Image->new_from_file($pixdir . $_->[2] . '.png'), $_->[3], $toolb);
 #    $toolb->append_space;
-#-PO "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-} ( [ N("Add Printer"), N("Add a new printer to the system"), 'printer_add', \&AddPrinter ], 
-#-PO "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-    [ N("Set as default"), N("Set selected printer as the default printer"), 'printer_default', \&SetAsDefault ],
-#-PO "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
-    [ N("Edit"), N("Edit selected printer"), 'printer_conf', \&Edit ],
-#-PO "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
-    [ N("Delete"), N("Delete selected printer"), 'printer_del', \&Delete ],
-#-PO "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-    [ N("Refresh"), N("Refresh the list"), 'refresh', sub { Refresh($stringsearch) } ],
-#-PO "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-    [ N("Configure CUPS"), N("Configure CUPS printing system"), 'cups_config', \&ConfigCUPS ]
+} ([
+     # FIXME: then "add printer" should be a simple verb as suggested in Human Guidelines!!!
+     #-PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
+     N("Add Printer"), N("Add a new printer to the system"), 'printer_add', \&AddPrinter ], 
+    [
+     #-PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
+     N("Set as default"), N("Set selected printer as the default printer"), 'printer_default', \&SetAsDefault ],
+    [ 
+     #-PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
+     N("Edit"), N("Edit selected printer"), 'printer_conf', \&Edit ],
+    [ 
+     #-PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
+     N("Delete"), N("Delete selected printer"), 'printer_del', \&Delete ],
+    [ 
+     #-PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
+     N("Refresh"), N("Refresh the list"), 'refresh', sub { Refresh($stringsearch) } ],
+    [
+     #-PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
+     N("Configure CUPS"), N("Configure CUPS printing system"), 'cups_config', \&ConfigCUPS ]
   );
-my ($_tbadd, $tbdefault, $tbedit, $tbdel, $_tbref, $_tbconfig) = @toolbwg;
+my ($tbadd, $tbdefault, $tbedit, $tbdel, $_tbref, $_tbconfig) = @toolbwg;
 GrayDelEdit();
+foreach ($tbadd, $buttorcheck{add}) { defined $_ and $_->set_sensitive($printer->{SPOOLER} ne "rcups") }
+$localtree->parent->parent->set_sensitive($printer->{SPOOLER} ne "rcups");
+$nb->set_current_page(1) if $printer->{SPOOLER} eq "rcups";
 
 $fbut->signal_connect('clicked', sub { $stringsearch = $filter->get_text; Refresh($stringsearch) });
 Refresh($stringsearch);
 $nb->signal_connect('switch-page' => sub { NotebookSwitch() });
 $us->{wnd}{rwindow}->show_all;
 set_selection($printer->{DEFAULT});
-#undef $wait;
-if (0 && !$::isInstall && !$::isEmbedded) {
-    $window_splash->destroy;
-    undef $window_splash;
-}
 gtkset_mousecursor_normal();
 
 # Prevent subwindows to embed themselves in the mcc which has already the
 # main window embedded
+my $isEmbedded = $::isEmbedded;
 local $::isEmbedded = 0;
 
-Gtk2->main;
+# Auto refresh
+my $refreshing = 0;
+Glib::Timeout->add($refreshinterval * 1000, 
+		   sub { Refresh($stringsearch); 1 });
+
+$us->{wnd}->main;
 ugtk2->exit;
 
 sub GrayDelEdit() {
-    foreach ($tbdefault, $tbedit, $tbdel, $buttorcheck{default}, $buttorcheck{edit}, $buttorcheck{delete}) { defined $_ and $_->set_sensitive(0) };
+    foreach ($tbdefault, $tbedit, $tbdel, $buttorcheck{default}, $buttorcheck{edit}, $buttorcheck{delete}) { defined $_ and $_->set_sensitive(0) }
 }
 
 sub TreeUnselect {
     my $treev = shift;
     $treev->get_selection->unselect_all;
-    GrayDelEdit()
+    GrayDelEdit();
 }
 sub NotebookSwitch() { 
     TreeUnselect($localtree);
@@ -276,38 +295,48 @@ sub NotebookSwitch() {
 }
 
 sub RefreshLocalPrintersFull {
-    my ($strfilt) = @_;
+    my ($strfilt, @allprinters) = @_;
     my @printers;
     defined $printer and @printers = keys %{$printer->{configured}};
     $ltree_model->clear;
+    return if $printer->{SPOOLER} eq "rcups";
     my @LocalReal;
-    LOOP: foreach my $p (@printers) {
+    foreach my $p (@printers) {
 	# Apply string search to all fields, not only the printer name
+	my $state = ($printer->{SPOOLER} !~ /cups/ ? N("Unknown") :
+		     ((any { 
+			 ($_->{queuename} eq $p) &&
+			     ($_->{state} eq "enabled");  
+		     } @allprinters) ? N("Enabled") : N("Disabled")));
 	my $connect = printer::main::connectionstr($printer->{configured}{$p}{queuedata}{connect});
 	my $model = $printer->{configured}{$p}{queuedata}{make} . ' ' .
 	    $printer->{configured}{$p}{queuedata}{model};
 	my $description = $printer->{configured}{$p}{queuedata}{desc};
 	my $location = $printer->{configured}{$p}{queuedata}{loc};
-	my $searchstr = "$p|$model|$connect|$description|$location";
-	push(@LocalReal, $p) if $searchstr =~ /\Q$strfilt/i;
-    };
+	my $searchstr = "$p|$state|$model|$connect|$description|$location";
+	push(@LocalReal, $p) if !$strfilt || ($searchstr =~ /\Q$strfilt/i);
+    }
     foreach my $p (sort { lc($a) cmp lc($b) } @LocalReal) {
+	my $state = ($printer->{SPOOLER} !~ /cups/ ? N("Unknown") :
+		     ((any { 
+			 ($_->{queuename} eq $p) &&
+			     ($_->{state} eq "enabled");  
+		     } @allprinters) ? N("Enabled") : N("Disabled")));
 	my $connect = printer::main::connectionstr($printer->{configured}{$p}{queuedata}{connect});
 	my $description = $printer->{configured}{$p}{queuedata}{desc};
 	my $location = $printer->{configured}{$p}{queuedata}{loc};
 	my $model = $printer->{configured}{$p}{queuedata}{make} . ' ' .
 	    $printer->{configured}{$p}{queuedata}{model};
 	my $default = ($p eq $printer->{DEFAULT} ? "X" : "");
-	$ltree_model->append_set([ 0 => $default, 1 => $p, 2 => $model, 
-				   3 => $connect, 4 => $description,
-				   5 => $location ]);
+	$ltree_model->append_set([ 0 => $default, 1 => $p, 2 => $state, 
+				   3 => $model, 
+				   4 => $connect, 5 => $description,
+				   6 => $location ]);
     }
 }
 
 sub RefreshRemotePrintersFull {
-    my ($strfilt) = @_;
-    my @printers;
-    defined $printer and @printers = printer::cups::lpstat_lpv();
+    my ($strfilt, @printers) = @_;
     $rtree_model->clear;
     my @RemoteReal;
     LOOP: foreach my $p (@printers) {
@@ -315,38 +344,50 @@ sub RefreshRemotePrintersFull {
 	next LOOP if defined($printer->{configured}{$p->{queuename}});
 	# Apply string search to all fields, not only the printer name
 	my $queue = $p->{queuename};
-	my $server = $p->{ipp};
+	my $state = ($p->{state} eq "enabled" ?
+		     N("Enabled") : N("Disabled"));
+	my $server = $p->{ipp} || $printer->{remote_cups_server};
 	my $description = $p->{description};
 	my $location = $p->{location};
-	my $searchstr = "$queue|$server|$description|$location";
+	my $searchstr = "$queue|$state|$server|$description|$location";
 	# All remaining to which the search term applies
-	push(@RemoteReal, $p) if $searchstr =~ /\Q$strfilt/i;
-    };
+	push(@RemoteReal, $p) if !$strfilt || ($searchstr =~ /\Q$strfilt/i);
+    }
     foreach my $p (sort { lc($a->{queuename}) cmp lc($b->{queuename}) } 
 		   @RemoteReal) {
 	my $queue = $p->{queuename};
-	my $server = $p->{ipp};
+	my $state = ($p->{state} eq "enabled" ?
+		     N("Enabled") : N("Disabled"));
+	my $server = $p->{ipp} || $printer->{remote_cups_server};
 	my $description = $p->{description};
 	my $location = $p->{location};
 	my $default = ($queue eq $printer->{DEFAULT} ? "X" : "");
 	$rtree_model->append_set([ 0 => $default, 1 => $queue, 
-				   2 => $server, 3 => $description,
-				   4 => $location ]);
+				   2 => $state, 3 => $server,
+				   4 => $description,
+				   5 => $location ]);
     }
 }
 
 sub Refresh {
+    # Do not have ourselves recalled if we are already running
+    return if $refreshing;
+    $refreshing = 1;
     my ($strfilt) = @_;
     my $selection = get_selection();
-    RefreshLocalPrintersFull($strfilt); 
-    RefreshRemotePrintersFull($strfilt);
+    printer::services::wait_for_cups() if ($printer->{SPOOLER} eq "cups");
+    my @printers;
+    defined $printer and @printers = printer::cups::lpstat_lpv();
+    RefreshLocalPrintersFull($strfilt, @printers); 
+    RefreshRemotePrintersFull($strfilt, @printers);
     GrayDelEdit();
     set_selection($selection);
+    $refreshing = 0;
 }
 
 sub AddPrinter() {
     deactivate_mainwindow();
-    if (printer::printerdrake::add_printer($printer, $in)) {
+    if (printer::printerdrake::add_printer($printer, $in, undef)) {
 	Refresh($stringsearch);
 	set_selection($printer->{QUEUE});
     } else {
@@ -390,7 +431,17 @@ sub Delete() {
 
 sub ConfigCUPS() {
     deactivate_mainwindow();
-    printer::printerdrake::config_cups($printer, $in);
+    printer::printerdrake::config_cups($printer, $security, $in, undef);
+    foreach ($tbadd, $buttorcheck{add}) { defined $_ and $_->set_sensitive($printer->{SPOOLER} ne "rcups") }
+    $localtree->parent->parent->set_sensitive($printer->{SPOOLER} ne "rcups");
+    $nb->set_current_page(1) if $printer->{SPOOLER} eq "rcups";
+    Refresh($stringsearch);
+    activate_mainwindow();
+}
+
+sub ConfigAutoAdmin() {
+    deactivate_mainwindow();
+    printer::printerdrake::config_auto_admin($printer, $in);
     Refresh($stringsearch);
     activate_mainwindow();
 }
@@ -398,7 +449,6 @@ sub ConfigCUPS() {
 sub deactivate_mainwindow() {
     $us->{wnd}{rwindow}->set_sensitive(0);
     gtkset_mousecursor_wait();
-    $error = 0;
 }
 
 sub activate_mainwindow() {
@@ -470,7 +520,7 @@ sub GetNameEntFromIter {
     my (undef, $iter) = $tree->get_selection->get_selected;
     return undef if !defined($iter);
     my $name = $model->get($iter, $rank);
-    $name
+    $name;
 }
 
 sub CreateTree {
@@ -479,18 +529,39 @@ sub CreateTree {
     $tree->get_selection->set_mode('browse');
     $tree->set_headers_visible(1);
     $tree->set_rules_hint(1);
-    $tree->get_selection->signal_connect('changed' => sub { foreach ($tbdefault, $tbedit, $tbdel, $buttorcheck{default}, $buttorcheck{edit}, $buttorcheck{delete}) { $_->set_sensitive(1) } });
+    $tree->get_selection->signal_connect('changed' => sub {
+			       my (undef, $_event) = @_;
+			       my (undef, $iter) = $tree->get_selection->get_selected;
+			       return unless $iter;
+                               foreach ($tbdefault, $tbedit, $tbdel, $buttorcheck{default}, $buttorcheck{edit}, $buttorcheck{delete}) { $_->set_sensitive(1) }
+			       my $queue = $tree_model->get($iter, 1);
+			       if (!defined($printer->{configured}{$queue})) {
+				   foreach ($tbdel, $buttorcheck{delete}) { 
+				       $_->set_sensitive(0);
+				   }
+			       }
+			       if ($queue eq $printer->{DEFAULT}) {
+				   foreach ($tbdefault, $buttorcheck{default}) { 
+				       $_->set_sensitive(0);
+				   }
+			       }
+			       });
     $tree->signal_connect(button_press_event => sub {
 			       my (undef, $event) = @_;
 			       my (undef, $iter) = $tree->get_selection->get_selected;
 			       return unless $iter;
-			       foreach ($tbdefault, $tbedit, $tbdel, $buttorcheck{default}, $buttorcheck{edit}, $buttorcheck{delete}) { $_->set_sensitive(1) };
+			       foreach ($tbdefault, $tbedit, $tbdel, $buttorcheck{default}, $buttorcheck{edit}, $buttorcheck{delete}) { $_->set_sensitive(1) }
 			       my $queue = $tree_model->get($iter, 1);
 			       if (!defined($printer->{configured}{$queue})) {
 				   foreach ($tbdel, $buttorcheck{delete}) { 
 				       $_->set_sensitive(0);
 				   }
 			       }
+			       if ($queue eq $printer->{DEFAULT}) {
+				   foreach ($tbdefault, $buttorcheck{default}) { 
+				       $_->set_sensitive(0);
+				   }
+			       }
 			       Edit() if $event->type eq '2button-press';
 			      });
     $tree->signal_connect(key_press_event => sub {
@@ -499,13 +570,13 @@ sub CreateTree {
 			       return unless $iter;
 			       Edit() if $event->keyval == $Gtk2::Gdk::Keysyms{Return};
 			   });
-    $tree
+    $tree;
 }
 
 sub NewDialog {
     my ($title, $o_no_button) = @_;
     my $dialog = gtkset_border_width(Gtk2::Dialog->new, 10);
-    $dialog->set_transient_for($us->{wnd}{rwindow});
+    $dialog->set_transient_for($us->{wnd}{real_window});
     $dialog->set_position('center-on-parent');
     $dialog->set_title($title);
     $dialog->action_area->pack_start(gtkadd(Gtk2::HButtonBox->new,
@@ -522,13 +593,18 @@ sub About() {
     $list->can_focus(0);
     each_index { $list->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => $::i)) } 0..2;
     $list->set_headers_visible(0);
-    foreach my $row ([ '', '', ''], [ N("Authors: "), 'Till Kamppeter', "<till\@$domainname>" ], ['', '', '']) {
+    foreach my $row ([ '', '', '' ], [ N("Authors: "), 'Till Kamppeter', "<till\@$domainname>" ], [ '', '', '' ]) {
         $tree_model->append_set(undef, [ map_index { $::i => $_ } @$row ]);
     }
     $list->get_selection->set_mode('none');
     gtkpack_($window_about->vbox,
              -r "$pixdir/about-printerdrake.png" ?
-             (0, Gtk2::Image->new_from_file("$pixdir/about-printerdrake.png")) : (1, gtkmodify_font(Gtk2::Label->new(N("Printer Management \n") . $us->{VERSION}), 'Bold 18'),),
+             (0, Gtk2::Image->new_from_file("$pixdir/about-printerdrake.png")) :
+               (1, gtkset_markup(Gtk2::Label->new, 
+                                 qq(<span weight="bold" size="x-large">) .
+                                   #-PO: here %s is the version number
+                                   N("Printer Management %s", $us->{VERSION}) . "</span>"),
+            ),
 	     1, $list,
 	    );
     $window_about->show_all;
-- 
cgit v1.2.1