diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 2b3d271441fb..38e42b4af82d 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfmail
-PORTVERSION=	1.5.3
+PORTVERSION=	1.5.4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://xfmail.cfreeze.com/pub/xfmail/release/%SUBDIR%/	\
 		ftp://cupido.geophys.nat.tu-bs.de/pub/xfmail/release/%SUBDIR%/	\
diff --git a/mail/xfmail/distinfo b/mail/xfmail/distinfo
index d15417cc2dba..520e2e6e0f6b 100644
--- a/mail/xfmail/distinfo
+++ b/mail/xfmail/distinfo
@@ -1 +1 @@
-MD5 (xfmail-1.5.3.tar.bz2) = ce7fb31306642ba336f41ac2e0e9738f
+MD5 (xfmail-1.5.4.tar.bz2) = 2921b249238a4223259b1037dd12082e
diff --git a/mail/xfmail/files/patch-aa b/mail/xfmail/files/patch-aa
deleted file mode 100644
index d00d3e6d35a9..000000000000
--- a/mail/xfmail/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- contrib/Makefile.am.orig	Wed Nov  6 10:04:08 2002
-+++ contrib/Makefile.am	Wed Nov  6 10:04:18 2002
-@@ -4,6 +4,6 @@
- 	xfmail-full.spec \
- 	xfmail.spec
- 
--SUBDIRS = misc specfiles
-+SUBDIRS = misc
- 
- DIST_SUBDIRS = $(SUBDIRS)
diff --git a/mail/xfmail/files/patch-ac b/mail/xfmail/files/patch-ac
deleted file mode 100644
index 5090babe3d6f..000000000000
--- a/mail/xfmail/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mail/nntp.cpp.orig	Thu Jan 16 12:37:07 2003
-+++ src/mail/nntp.cpp	Thu Jan 16 12:37:32 2003
-@@ -59,7 +59,7 @@
- #endif
- 
- 	if(fmt) {
--		snprintf(response, sizeof(response), fmt, ap);
-+		vsnprintf(response, sizeof(response), fmt, ap);
- 
- 		if(logging & LOG_NNTP) {
- 			if(!strncasecmp(response, "AUTHINFO PASS ", 14))
diff --git a/mail/xfmail/files/patch-ag b/mail/xfmail/files/patch-ag
deleted file mode 100644
index b113b8356f5b..000000000000
--- a/mail/xfmail/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ui/rules.cpp.orig	Fri Jan 25 22:14:55 2002
-+++ src/ui/rules.cpp	Wed Nov  6 00:32:49 2002
-@@ -362,7 +362,7 @@
- 	r_modified = 0;
- 	fl_delete_browser_line(rule_obj->Rule_List, k);
- 	add_dead_rule(rules[i]);
--	rules.erase((vector<struct _xf_rule *>::iterator) &rules[i]);
-+	rules.erase(rules.begin() + i);
- 
- 	changed = 1;
-