diff --git a/system-config-printer-auth-no-pw.patch b/system-config-printer-auth-no-pw.patch
new file mode 100644
index 0000000..17510ed
--- /dev/null
+++ b/system-config-printer-auth-no-pw.patch
@@ -0,0 +1,27 @@
+diff -up system-config-printer-1.1.16/jobviewer.py.auth-no-pw system-config-printer-1.1.16/jobviewer.py
+--- system-config-printer-1.1.16/jobviewer.py.auth-no-pw	2009-12-22 14:44:19.000000000 +0000
++++ system-config-printer-1.1.16/jobviewer.py	2010-01-07 15:40:43.517049465 +0000
+@@ -1,6 +1,6 @@
+ 
+-## Copyright (C) 2007, 2008, 2009 Tim Waugh <twaugh@redhat.com>
+-## Copyright (C) 2007, 2008, 2009 Red Hat, Inc.
++## Copyright (C) 2007, 2008, 2009, 2010 Red Hat, Inc.
++## Author: Tim Waugh <twaugh@redhat.com>
+ 
+ ## This program is free software; you can redistribute it and/or modify
+ ## it under the terms of the GNU General Public License as published by
+@@ -599,13 +599,12 @@ class JobViewer (GtkGUI, monitor.Watcher
+ 
+                 # Find out which auth-info is required.
+                 try_keyring = USE_KEYRING
+-                keyring_attrs = None
++                keyring_attrs = dict()
+                 auth_info = None
+                 if try_keyring and 'password' in auth_info_required:
+                     auth_info_required = data.get ('auth-info-required', [])
+                     device_uri = data.get ("device-uri")
+                     (scheme, rest) = urllib.splittype (device_uri)
+-                    keyring_attrs = dict ()
+                     if scheme == 'smb':
+                         uri = smburi.SMBURI (uri=device_uri)
+                         (group, server, share,
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 2199df7..04e24b5 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.16
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -24,6 +24,7 @@ Patch6: system-config-printer-npinit-traceback.patch
 Patch7: system-config-printer-notification-timeouts.patch
 Patch8: system-config-printer-select-nonexistent-printer.patch
 Patch9: system-config-printer-ink-levels.patch
+Patch10: system-config-printer-auth-no-pw.patch
 
 Patch101: pycups-request-readio.patch
 
@@ -94,6 +95,7 @@ printers.
 %patch7 -p1 -b .notification-timeouts
 %patch8 -p1 -b .select-nonexistent-printer
 %patch9 -p1 -b .ink-levels
+%patch10 -p1 -b .auth-no-pw
 
 pushd pycups-%{pycups_version}
 %patch101 -p1 -b .request-readio
@@ -214,6 +216,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Thu Jan  7 2010 Tim Waugh <twaugh@redhat.com> - 1.1.16-6
+- Fixed crash when using keyring for auth without password (bug #553141).
+
 * Thu Jan  7 2010 Tim Waugh <twaugh@redhat.com> - 1.1.16-5
 - Fixed typo introduced in recent fix (bug #551436).