diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index f5e1350984d9..02d81a506ba2 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sylpheed-claws
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -158,7 +159,7 @@ post-install:
 .if !defined(WITHOUT_THEMES)
 	@${MKDIR} ${DATADIR}/themes
 	@cd ${WRKDIR}/${THEMEFILE:C/.tar.gz//} && ${FIND} . -print | \
-		${GREP} -v xvpics | \
+		${GREP} -vE '(xvpics|.directory)' | \
 		${CPIO} -pdu -R ${BINOWN}:${BINGRP} --quiet ${DATADIR}/themes/
 .endif
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylpheed-switcher ${PREFIX}/bin
diff --git a/mail/claws-mail/files/patch-src:summaryview.h b/mail/claws-mail/files/patch-src:summaryview.h
new file mode 100644
index 000000000000..798b4272d138
--- /dev/null
+++ b/mail/claws-mail/files/patch-src:summaryview.h
@@ -0,0 +1,10 @@
+--- src/summaryview.h.orig	Tue Dec 30 15:28:37 2003
++++ src/summaryview.h	Tue Dec 30 15:29:00 2003
+@@ -20,6 +20,7 @@
+ #ifndef __SUMMARY_H__
+ #define __SUMMARY_H__
+ 
++#include <sys/types.h>
+ #include <regex.h>
+ 
+ #include <glib.h>
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 5e3f1a4657e9..4a64a6c055e9 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -183,7 +183,6 @@ share/sylpheed-claws/newscache_clean.pl
 share/sylpheed-claws/outlook2sylpheed.pl
 share/sylpheed-claws/tb2sylpheed
 share/sylpheed-claws/vcard2xml.py
-%%THEMES%%share/sylpheed-claws/themes/Crystal/.directory
 %%THEMES%%share/sylpheed-claws/themes/Crystal/close.xpm
 %%THEMES%%share/sylpheed-claws/themes/Crystal/continue.xpm
 %%THEMES%%share/sylpheed-claws/themes/Crystal/dir-close.xpm
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index f5e1350984d9..02d81a506ba2 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sylpheed-claws
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -158,7 +159,7 @@ post-install:
 .if !defined(WITHOUT_THEMES)
 	@${MKDIR} ${DATADIR}/themes
 	@cd ${WRKDIR}/${THEMEFILE:C/.tar.gz//} && ${FIND} . -print | \
-		${GREP} -v xvpics | \
+		${GREP} -vE '(xvpics|.directory)' | \
 		${CPIO} -pdu -R ${BINOWN}:${BINGRP} --quiet ${DATADIR}/themes/
 .endif
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/sylpheed-switcher ${PREFIX}/bin
diff --git a/mail/sylpheed-claws/files/patch-src:summaryview.h b/mail/sylpheed-claws/files/patch-src:summaryview.h
new file mode 100644
index 000000000000..798b4272d138
--- /dev/null
+++ b/mail/sylpheed-claws/files/patch-src:summaryview.h
@@ -0,0 +1,10 @@
+--- src/summaryview.h.orig	Tue Dec 30 15:28:37 2003
++++ src/summaryview.h	Tue Dec 30 15:29:00 2003
+@@ -20,6 +20,7 @@
+ #ifndef __SUMMARY_H__
+ #define __SUMMARY_H__
+ 
++#include <sys/types.h>
+ #include <regex.h>
+ 
+ #include <glib.h>
diff --git a/mail/sylpheed-claws/pkg-plist b/mail/sylpheed-claws/pkg-plist
index 5e3f1a4657e9..4a64a6c055e9 100644
--- a/mail/sylpheed-claws/pkg-plist
+++ b/mail/sylpheed-claws/pkg-plist
@@ -183,7 +183,6 @@ share/sylpheed-claws/newscache_clean.pl
 share/sylpheed-claws/outlook2sylpheed.pl
 share/sylpheed-claws/tb2sylpheed
 share/sylpheed-claws/vcard2xml.py
-%%THEMES%%share/sylpheed-claws/themes/Crystal/.directory
 %%THEMES%%share/sylpheed-claws/themes/Crystal/close.xpm
 %%THEMES%%share/sylpheed-claws/themes/Crystal/continue.xpm
 %%THEMES%%share/sylpheed-claws/themes/Crystal/dir-close.xpm