diff --git a/pycups-stack-overflow.patch b/pycups-stack-overflow.patch
new file mode 100644
index 0000000..9bcd7d4
--- /dev/null
+++ b/pycups-stack-overflow.patch
@@ -0,0 +1,12 @@
+diff -up pycups-1.9.50/cupsconnection.c.stack-overflow pycups-1.9.50/cupsconnection.c
+--- pycups-1.9.50/cupsconnection.c.stack-overflow	2010-05-11 16:36:57.000000000 +0100
++++ pycups-1.9.50/cupsconnection.c	2010-05-19 16:28:17.894123769 +0100
+@@ -2910,7 +2910,7 @@ Connection_deletePrinterOptionDefault (C
+   char *name;
+   PyObject *optionobj;
+   char *option;
+-  const char *const suffix = "-default";
++  const char const suffix[] = "-default";
+   char *opt;
+   ipp_t *request, *answer;
+   int i;
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 961fa2f..4a6138b 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.19
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,8 @@ Source0: http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-pr
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
+Patch101: pycups-stack-overflow.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -74,6 +76,10 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 
+pushd pycups-%{pycups_version}
+%patch101 -p1 -b .stack-overflow
+popd
+
 %build
 %configure --with-udev-rules --with-polkit-1
 
@@ -191,6 +197,10 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed May 19 2010 Tim Waugh <twaugh@redhat.com> - 1.1.19-2
+- Fixed stack overflow in cups.Connection.deletePrinterOptionDefault
+  (bug #584991).
+
 * Tue May 18 2010 Tim Waugh <twaugh@redhat.com> - 1.1.19-1
 - Updated pycups to 1.9.50.
 - Updated pysmbc to 1.0.7.