diff --git a/exim-4.60-mon-overflow.patch b/exim-4.60-mon-overflow.patch
new file mode 100644
index 0000000..0e8d202
--- /dev/null
+++ b/exim-4.60-mon-overflow.patch
@@ -0,0 +1,11 @@
+--- exim-4.60/exim_monitor/em_queue.c~	2005-11-28 10:57:32.000000000 +0000
++++ exim-4.60/exim_monitor/em_queue.c	2006-03-23 12:23:20.000000000 +0000
+@@ -500,7 +500,7 @@ for (i = 0; i < subdir_max; i++)
+       uschar basename[SPOOL_NAME_LENGTH];
+       stripchart_total[0]++;
+       if (!eximon_initialized) { printf("."); fflush(stdout); }
+-      Ustrcpy(basename, name);
++      Ustrncpy(basename, name, SPOOL_NAME_LENGTH - 2);
+       basename[SPOOL_NAME_LENGTH - 2] = 0;
+       if (full) find_queue(basename, queue_add, subdirchar);
+       }
diff --git a/exim.spec b/exim.spec
index 4990030..3506287 100644
--- a/exim.spec
+++ b/exim.spec
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.60
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -25,6 +25,7 @@ Patch12: exim-4.33-cyrus.patch
 Patch13: exim-4.43-pamconfig.patch
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
+Patch16: exim-4.60-mon-overflow.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -79,6 +80,7 @@ cp exim_monitor/EDITME Local/eximon.conf
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
+%patch16 -p1
 
 %build
 %ifnarch s390 s390x
@@ -287,6 +289,9 @@ fi
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Thu Mar 23 2006 David Woodhouse <dwmw2@redhat.com> 4.60-5
+- Fix eximon buffer overflow (#186303)
+
 * Tue Mar 21 2006 David Woodhouse <dwmw2@redhat.com> 4.60-4
 - Actually enable Postgres