diff --git a/.cvsignore b/.cvsignore
index bab42b4..36869af 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 sa-exim-4.2.tar.gz
-exim-4.60.tar.bz2
+exim-4.61.tar.bz2
diff --git a/exim-4.60-mon-overflow.patch b/exim-4.60-mon-overflow.patch
deleted file mode 100644
index 0e8d202..0000000
--- a/exim-4.60-mon-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-4.61-c-before-d.patch b/exim-4.61-c-before-d.patch
new file mode 100644
index 0000000..fb12f4b
--- /dev/null
+++ b/exim-4.61-c-before-d.patch
@@ -0,0 +1,34 @@
+Index: src/acl.c
+===================================================================
+RCS file: /home/cvs/exim/exim-src/src/acl.c,v
+retrieving revision 1.57
+retrieving revision 1.58
+diff -u -p -r1.57 -r1.58
+--- src/acl.c	6 Mar 2006 16:05:12 -0000	1.57
++++ src/acl.c	4 Apr 2006 17:05:45 -0000	1.58
+@@ -1,4 +1,4 @@
+-/* $Cambridge: exim/exim-src/src/acl.c,v 1.57 2006/03/06 16:05:12 ph10 Exp $ */
++/* $Cambridge: exim/exim-src/src/acl.c,v 1.58 2006/04/04 17:05:45 fanf2 Exp $ */
+ 
+ /*************************************************
+ *     Exim - an Internet mail transport agent    *
+@@ -202,8 +202,8 @@ at the outer level. In the other cases, 
+ checking functions. */
+ 
+ static uschar cond_expand_at_top[] = {
+-  TRUE,    /* add_header */
+   TRUE,    /* acl */
++  TRUE,    /* add_header */
+   FALSE,   /* authenticated */
+ #ifdef EXPERIMENTAL_BRIGHTMAIL
+   TRUE,    /* bmi_optin */
+@@ -260,8 +260,8 @@ static uschar cond_expand_at_top[] = {
+ /* Flags to identify the modifiers */
+ 
+ static uschar cond_modifiers[] = {
+-  TRUE,    /* add_header */
+   FALSE,   /* acl */
++  TRUE,    /* add_header */
+   FALSE,   /* authenticated */
+ #ifdef EXPERIMENTAL_BRIGHTMAIL
+   TRUE,    /* bmi_optin */
diff --git a/exim.spec b/exim.spec
index 3506287..4fdd016 100644
--- a/exim.spec
+++ b/exim.spec
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.60
-Release: 5%{?dist}
+Version: 4.61
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -25,7 +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
+Patch16: exim-4.61-c-before-d.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -80,7 +80,7 @@ cp exim_monitor/EDITME Local/eximon.conf
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
-%patch16 -p1
+%patch16 -p0
 
 %build
 %ifnarch s390 s390x
@@ -289,6 +289,9 @@ fi
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2@redhat.com> 4.61-1
+- Update to 4.61
+
 * Thu Mar 23 2006 David Woodhouse <dwmw2@redhat.com> 4.60-5
 - Fix eximon buffer overflow (#186303)
 
diff --git a/sources b/sources
index 0249046..7a3ac9a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 ad76f73c6b3d01caa88078e3e622745a  sa-exim-4.2.tar.gz
-eed3c8fc393cf7ccc9c1079b28516128  exim-4.60.tar.bz2
+f6bbf99a6f63c0f5045a1779e7e810c4  exim-4.61.tar.bz2