diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 12c3b1fd55d..3c782d3aa32 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2009/08/10 06:32:42 kili Exp $
+# $OpenBSD: Makefile,v 1.29 2009/10/23 17:12:36 landry Exp $
 
 SHARED_ONLY=		Yes
 
@@ -8,12 +8,12 @@ COMMENT-bogofilter=	bogofilter plugin
 COMMENT-clamav=		clamav plugin
 COMMENT-spamassassin=	spamassassin plugin
 
-V=			3.7.2
+V=			3.7.3
 DISTNAME=		claws-mail-${V}
-PKGNAME-main=			${DISTNAME}p0
+PKGNAME-main=			${DISTNAME}
 FULLPKGNAME-docs=		claws-mail-docs-${V}
-FULLPKGNAME-bogofilter=		claws-mail-bogofilter-${V}p0
-FULLPKGNAME-spamassassin=	claws-mail-spamassassin-${V}p0
+FULLPKGNAME-bogofilter=		claws-mail-bogofilter-${V}
+FULLPKGNAME-spamassassin=	claws-mail-spamassassin-${V}
 CATEGORIES=		mail news
 
 HOMEPAGE=		http://www.claws-mail.org/
@@ -47,18 +47,14 @@ WANTLIB=		X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 			Xi Xinerama Xrandr Xrender atk-1.0 cairo crypto curl \
 			expat fontconfig freetype gio-2.0 glib-2.0 glitz \
 			gmodule-2.0 gobject-2.0 idn m pango-1.0 pangocairo-1.0 \
-			pangoft2-1.0 pcre pixman-1 png pthread-stubs ssl tasn1 \
-			xcb z
+			pangoft2-1.0 pcre pixman-1 png pthread-stubs ssl \
+			gcrypt gpg-error xcb z
 
-WANTLIB-main=		${WANTLIB} ICE SM c dbus-1 gthread-2.0 gpg-error \
-			gcrypt pthread stdc++
+WANTLIB-main=		${WANTLIB} ICE SM c dbus-1 gthread-2.0 \
+			pthread stdc++ tasn1 xcb-atom xcb-aux xcb-event
 
 WANTLIB-docs=
 
-WANTLIB-bogofilter=	${WANTLIB} gcrypt gnutls gpg-error
-
-WANTLIB-spamassassin=	${WANTLIB} gcrypt gnutls gpg-error
-
 LIB_DEPENDS=		gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
 			execinfo::devel/libexecinfo \
 			etpan.>=13::mail/libetpan \
@@ -87,7 +83,7 @@ USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
 LIBTOOL_FLAGS=		--tag=disable-static
 CONFIGURE_STYLE=	autoconf
-AUTOCONF_VERSION=	2.61
+AUTOCONF_VERSION=	2.62
 CONFIGURE_ENV+=		CPPFLAGS="-I${X11BASE}/include" \
 			LDFLAGS="-L${X11BASE}/lib"
 
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 05c1fd1a179..dde866a81af 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,5 +1,5 @@
-MD5 (claws/claws-mail-3.7.2.tar.bz2) = 3yfCSI30mdjAVkbT4QHQlQ==
-RMD160 (claws/claws-mail-3.7.2.tar.bz2) = 8350ZvBv313YeNRfGs2wRmfF0bA=
-SHA1 (claws/claws-mail-3.7.2.tar.bz2) = TpiHk6xiWMJtYcBq9bfs8ellOJ8=
-SHA256 (claws/claws-mail-3.7.2.tar.bz2) = /5rcoRGWXneFuZ7noqHKKglmWmQ/WSyWAwwW5Ex72+4=
-SIZE (claws/claws-mail-3.7.2.tar.bz2) = 5907134
+MD5 (claws/claws-mail-3.7.3.tar.bz2) = s69epeEYKqU/lxZX24bhEA==
+RMD160 (claws/claws-mail-3.7.3.tar.bz2) = Mh0LCrE3dI3zh41ChxbpqO7bt+E=
+SHA1 (claws/claws-mail-3.7.3.tar.bz2) = wcuXjCcvQr/E/9IO5ulTxNBtNwI=
+SHA256 (claws/claws-mail-3.7.3.tar.bz2) = 4gHakAYL23lYHtTW/MUnPVSlomSeuVCODJ5+bSBO42k=
+SIZE (claws/claws-mail-3.7.3.tar.bz2) = 5941284
diff --git a/mail/claws-mail/pkg/PLIST-main b/mail/claws-mail/pkg/PLIST-main
index 5b7fc847bb4..5db3f928a61 100644
--- a/mail/claws-mail/pkg/PLIST-main
+++ b/mail/claws-mail/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.16 2009/07/17 17:02:45 landry Exp $
+@comment $OpenBSD: PLIST-main,v 1.17 2009/10/23 17:12:36 landry Exp $
 @pkgpath mail/sylpheed-claws,-main${FLAVOR_STRING}
 @pkgpath mail/sylpheed-claws${FLAVOR_STRING}
 @bin bin/claws-mail
@@ -245,10 +245,8 @@ lib/claws-mail/plugins/smime.la
 lib/claws-mail/plugins/smime.so
 lib/claws-mail/plugins/trayicon.la
 lib/claws-mail/plugins/trayicon.so
-lib/pkgconfig/
 lib/pkgconfig/claws-mail.pc
 @man man/man1/claws-mail.1
-share/applications/
 share/applications/claws-mail.desktop
 share/claws-mail/
 share/claws-mail/tools/
@@ -291,23 +289,13 @@ share/claws-mail/tools/thunderbird-filters-convertor.pl
 share/claws-mail/tools/uudec
 share/claws-mail/tools/uuooffice
 share/claws-mail/tools/vcard2xml.py
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/128x128/
-share/icons/hicolor/128x128/apps/
 share/icons/hicolor/128x128/apps/claws-mail.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
 share/icons/hicolor/48x48/apps/claws-mail.png
-share/icons/hicolor/64x64/
-share/icons/hicolor/64x64/apps/
 share/icons/hicolor/64x64/apps/claws-mail.png
 share/locale/bg/LC_MESSAGES/claws-mail.mo
 share/locale/ca/LC_MESSAGES/claws-mail.mo
 share/locale/cs/LC_MESSAGES/claws-mail.mo
 share/locale/de/LC_MESSAGES/claws-mail.mo
-share/locale/en_GB/
-share/locale/en_GB/LC_MESSAGES/
 share/locale/en_GB/LC_MESSAGES/claws-mail.mo
 share/locale/es/LC_MESSAGES/claws-mail.mo
 share/locale/fi/LC_MESSAGES/claws-mail.mo