diff --git a/courier-imap-ulimit_conf.diff b/courier-imap-ulimit_conf.diff
new file mode 100644
index 0000000..7d6df6f
--- /dev/null
+++ b/courier-imap-ulimit_conf.diff
@@ -0,0 +1,28 @@
+--- imap/pop3d.dist.in
++++ imap/pop3d.dist.in
+@@ -28,6 +28,25 @@
+ 
+ MAXPERIP=4
+ 
++##NAME: POP3_ULIMITD:0
++#
++# POP3_ULIMITD sets the maximum size of the data segment of the server
++# process.  The value of POP3_ULIMITD is simply passed to the "ulimit -d"
++# command (or ulimit -v).  The argument to ulimi sets the upper limit on the
++# size of the data segment of the server process, in kilobytes.  The default
++# value of 65536 sets a very generous limit of 64 megabytes, which should
++# be more than plenty for anyone.
++#
++# This feature is used as an additional safety check that should stop
++# any potential denial-of-service attacks that exploit any kind of
++# a memory leak to exhaust all the available memory on the server.
++# It is theoretically possible that obscenely huge folders will also
++# result in the server running out of memory when doing server-side
++# sorting (by my calculations you have to have at least 100,000 messages
++# in a single folder, for that to happen).
++
++POP3_ULIMITD=65536
++
+ ##NAME: POP3AUTH:1
+ #
+ # To advertise the SASL capability, per RFC 2449, uncomment the POP3AUTH
diff --git a/courier-imap.changes b/courier-imap.changes
index 66a84e5..9c339ad 100644
--- a/courier-imap.changes
+++ b/courier-imap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov 21 10:33:13 CET 2007 - mskibbe@suse.de
+
+- Bug 342601 - courier-imap rc and config bugs 
+
 -------------------------------------------------------------------
 Fri Nov 16 08:32:29 CET 2007 - mskibbe@suse.de
 
diff --git a/courier-imap.spec b/courier-imap.spec
index 3d90287..f3d4f4e 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -16,7 +16,7 @@ Requires:       fam-server
 Url:            http://www.courier-mta.org/imap/
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 Version:        4.1.3
-Release:        59
+Release:        62
 License:        GPL v2 or later
 Conflicts:      imap qpopper
 Group:          Productivity/Networking/Email/Servers
@@ -32,6 +32,7 @@ Source8:        %name.firewall
 Source9:        %name-ssl.firewall
 Patch:          %{name}-4.0.6.diff
 Patch1:         %{name}-4.1.1.diff
+Patch2:         %{name}-ulimit_conf.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Prefix:         /usr
 %define _sysconfdir /etc/courier
@@ -52,6 +53,7 @@ delivers to maildir format mailboxes.
 %setup -q
 %patch
 %patch1
+%patch2
 
 %build
 %{suse_update_config}
@@ -174,6 +176,8 @@ exit 0
 %clean
 rm -rf $RPM_BUILD_ROOT
 %changelog
+* Wed Nov 21 2007 - mskibbe@suse.de
+- Bug 342601 - courier-imap rc and config bugs
 * Fri Nov 16 2007 - mskibbe@suse.de
 - Bug 341267 - courier-imap-ssl configuration problems
 * Mon Oct 22 2007 - sbrabec@suse.cz