diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index 8d5bba628453..6f1dd6aad2d8 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spamprobe
-PORTVERSION=	0.8b
+PORTVERSION=	0.9h
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
@@ -14,20 +14,13 @@ MASTER_SITE_SUBDIR=${PORTNAME}
 MAINTAINER=	mdodd@freebsd.org
 COMMENT=	Spam detector using Bayesian analysis of word counts
 
-LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4
+LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
 
-MAKEFILE=	${FILESDIR}/Makefile
-MAKE_ENV+=	FILESDIR="${FILESDIR}"
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-default-8bit
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db4" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.pre.mk>
+MAN1=	spamprobe.1
 
-post-build:
-	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f \
-		${FILESDIR}/Makefile.export0_6 clean all
-
-post-install:
-	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -f \
-		${FILESDIR}/Makefile.export0_6 install
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/spamprobe/distinfo b/mail/spamprobe/distinfo
index dd9880fe4eb2..fe6763d8c9f1 100644
--- a/mail/spamprobe/distinfo
+++ b/mail/spamprobe/distinfo
@@ -1 +1 @@
-MD5 (spamprobe-0.8b.tar.gz) = a5ddc25dd2d116f3e6f346b027ae034f
+MD5 (spamprobe-0.9h.tar.gz) = 3d36cd1811c860a64f371d318736e808
diff --git a/mail/spamprobe/files/Makefile b/mail/spamprobe/files/Makefile
deleted file mode 100644
index 5387d34497c0..000000000000
--- a/mail/spamprobe/files/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $FreeBSD$
-#
-
-.PATH:		${FILESDIR}
-
-PREFIX?=	/usr/local
-BINDIR=		${PREFIX}/bin
-MANDIR=		${PREFIX}/man/man
-PROG_CXX=	spamprobe
-CXXFLAGS+=	-Wall -I${PREFIX}/include/db4 -DNDEBUG \
-		-DPACKAGE=\"spamprobe\" -DVERSION=\"0.8b\" \
-		-DHAVE_UNISTD_H=1 -DHAVE_REGEX_H=1 -DUSE_DB=1
-CFLAGS+=	-Wall -I${PREFIX}/include/db4 -DNDEBUG \
-		-DPACKAGE=\"spamprobe\" -DVERSION=\"0.8b\" \
-		-DHAVE_UNISTD_H=1 -DHAVE_REGEX_H=1 -DUSE_DB=1
-LDFLAGS=	-L${PREFIX}/lib -ldb4
-SRCS=		File.cc FrequencyDB.cc FrequencyDBImpl_bdb.cc \
-		FrequencyDBImpl_cache.cc FrequencyDBImpl_dbm.cc \
-		FrequencyDBImpl_dual.cc LockFile.cc Message.cc \
-		MessageFactory.cc MimeHeader.cc MimeLineReader.cc \
-		MimeMessageReader.cc RegularExpression.cc SpamFilter.cc \
-		Tokenizer.cc spamprobe.cc util.cc md5.c
-
-.include <bsd.prog.mk>
diff --git a/mail/spamprobe/files/Makefile.export0_6 b/mail/spamprobe/files/Makefile.export0_6
deleted file mode 100644
index 4b025b2aaf53..000000000000
--- a/mail/spamprobe/files/Makefile.export0_6
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD: /tmp/pcvs/ports/mail/spamprobe/files/Attic/Makefile.export0_6,v 1.3 2003-04-29 00:18:11 mdodd Exp $
-#
-PREFIX?=	/usr/local
-BINDIR=		${PREFIX}/bin
-NOMAN=
-PROG_CXX=	spamprobe-export_0.6
-CXXFLAGS+=	-Wall -DUSE_DBM -DNDEBUG
-SRCS=		File.cc export0_6.cc
-
-.include <bsd.prog.mk>
diff --git a/mail/spamprobe/files/patch-MessageFactory.cc b/mail/spamprobe/files/patch-MessageFactory.cc
index 941ab4596ac8..9f266c8244ef 100644
--- a/mail/spamprobe/files/patch-MessageFactory.cc
+++ b/mail/spamprobe/files/patch-MessageFactory.cc
@@ -1,34 +1,39 @@
---- MessageFactory.cc.orig	Tue Mar 11 07:38:41 2003
-+++ MessageFactory.cc	Tue Mar 11 07:51:38 2003
-@@ -28,7 +28,7 @@
- //    http://www.cooldevtools.com/qpl.html
+
+$FreeBSD$
+
+--- MessageFactory.cc.orig	Mon Jan 26 22:49:13 2004
++++ MessageFactory.cc	Thu Feb 12 16:25:43 2004
+@@ -27,7 +27,7 @@
  //
  
+ #include <set>
 -#include <strstream>
 +#include <sstream>
+ #include "FrequencyDB.h"
  #include "Tokenizer.h"
  #include "MessageFactory.h"
- #include "RegularExpression.h"
-@@ -50,11 +50,11 @@
+@@ -58,13 +58,13 @@
  MessageFactory::MessageFactory()
-   : m_minWordLength(2),
+   : m_minWordLength(1),
      m_maxWordLength(90),
 +    m_phraser(new PhraseBuilder(2)),
      m_replaceNonAsciiChars(true),
      m_nonAsciiChar('z'),
      m_removeHTML(true),
+     m_keepSuspiciousTags(false),
+     m_ignoreBody(false),
 -    m_headersToInclude(NORMAL_HEADERS),
 -    m_phraser(new PhraseBuilder(2))
 +    m_headersToInclude(NORMAL_HEADERS)
  {
  }
  
-@@ -299,7 +299,7 @@
+@@ -383,7 +383,7 @@
      text += ' ';
    } else if (entity[0] == '#') {
      int code = 0;
 -    istrstream in(entity.c_str() + 1);
 +    istringstream in(entity.c_str() + 1);
      in >> code;
-     text += (char)code;
+     text += safe_char(code);
    } else {
diff --git a/mail/spamprobe/pkg-plist b/mail/spamprobe/pkg-plist
index cd436410e120..099c1f132a30 100644
--- a/mail/spamprobe/pkg-plist
+++ b/mail/spamprobe/pkg-plist
@@ -1,3 +1 @@
 bin/spamprobe
-bin/spamprobe-export_0.6
-man/man1/spamprobe.1.gz