diff --git a/tcsh-6.16.00-mailbox.dif b/tcsh-6.16.00-mailbox.dif
new file mode 100644
index 0000000..079761a
--- /dev/null
+++ b/tcsh-6.16.00-mailbox.dif
@@ -0,0 +1,10 @@
+--- sh.c
++++ sh.c	2009-08-14 10:27:58.129901841 +0200
+@@ -2153,6 +2153,7 @@ mailchk(void)
+ 
+ 	    while (readdir(mailbox))
+ 		mailcount++;
++	    closedir(mailbox);
+ 
+ 	    if (mailcount == 0)
+ 		continue;
diff --git a/tcsh.changes b/tcsh.changes
index b7e2605..8a85859 100644
--- a/tcsh.changes
+++ b/tcsh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 14 10:29:22 CEST 2009 - werner@suse.de
+
+- After mailbox counting close directory (bnc#530779)
+
 -------------------------------------------------------------------
 Tue Jun 23 11:18:55 CEST 2009 - werner@suse.de
 
diff --git a/tcsh.spec b/tcsh.spec
index 86beaba..2e50fce 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -26,7 +26,7 @@ Group:          System/Shells
 Requires:       gawk textutils
 AutoReqProv:    on
 Version:        6.16.00
-Release:        3
+Release:        4
 Summary:        The C SHell
 Source:         ftp.astron.com:/pub/tcsh/tcsh-6.16.00.tar.bz2
 Source1:        nls-iconv
@@ -43,6 +43,7 @@ Patch7:         tcsh-6.15.00-blanks.dif
 Patch8:         tcsh-6.15.00-fullpath.dif
 Patch9:         tcsh-6.16.00-grabpgrp.dif
 Patch10:        tcsh-6.16.00-colorls.dif
+Patch11:        tcsh-6.16.00-mailbox.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -72,6 +73,7 @@ Authors:
 %patch8 -p0 -b .fullpath
 %patch9 -p0 -b .pgrp
 %patch10 -p0 -b .colorls
+%patch11 -p0 -b .mailbox
 %patch
     sh $RPM_SOURCE_DIR/nls-iconv