diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index f841774048d2..f383dfd0751b 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -6,36 +6,26 @@
 #
 
 PORTNAME=	kbiff
-PORTVERSION=	3.8
-PORTREVISION=	3
+PORTVERSION=	3.9
 CATEGORIES=	mail kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mail notification utility for KDE with nice features
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_KDELIBS_VER=3
+USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--disable-fast-perl
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+
 MAN1=		kbiff.1
 
-OPTIONS=	SSL	"SSL support" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SSL)
-CONFIGURE_ARGS+=--enable-ssl
-.else
-CONFIGURE_ARGS+=--disable-ssl
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|-pthread|${PTHREAD_LIBS}|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g ; \
+		 /if test/s|==|=|g' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/kbiff/distinfo b/mail/kbiff/distinfo
index a43d6403bd4e..54bcf38c402f 100644
--- a/mail/kbiff/distinfo
+++ b/mail/kbiff/distinfo
@@ -1,3 +1,3 @@
-MD5 (kbiff-3.8.tar.bz2) = 97d9f7e24d4928a602f1c89d7ff18755
-SHA256 (kbiff-3.8.tar.bz2) = 18d6153d309ad9e71251f25100ec2e51930f9b9630d39b4a47b777978810d17a
-SIZE (kbiff-3.8.tar.bz2) = 767864
+MD5 (kbiff-3.9.tar.bz2) = b3136b60036ada07f2bda6f3b648b7a3
+SHA256 (kbiff-3.9.tar.bz2) = 1e65dc3deeb4139c23356bfca7c4324dae150c47ca1a411050a2764c1a3da7fa
+SIZE (kbiff-3.9.tar.bz2) = 571829
diff --git a/mail/kbiff/files/patch-configure b/mail/kbiff/files/patch-configure
deleted file mode 100644
index 3b3f6db646aa..000000000000
--- a/mail/kbiff/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2008-04-08 21:45:31.000000000 +0200
-+++ configure	2008-04-08 21:45:50.000000000 +0200
-@@ -25477,7 +25477,7 @@
-   use_ssl=yes
- fi;
- 
--if test "$use_ssl" == "yes"; then
-+if test "$use_ssl" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_SSL
-@@ -25494,7 +25494,7 @@
-   use_ssl=yes
- fi;
- 
--if test "$use_ssl" == "yes"; then
-+if test "$use_ssl" = "yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define USE_SSL
diff --git a/mail/kbiff/pkg-descr b/mail/kbiff/pkg-descr
index 750b5c6fcaf7..72073b4a634c 100644
--- a/mail/kbiff/pkg-descr
+++ b/mail/kbiff/pkg-descr
@@ -8,4 +8,4 @@ Features:
 	o Sounds
 	o Supported mailbox formats: mbox, maildir, mh, POP3(s), IMAP4(s), and NNTP.
 
-WWW: http://kbiff.granroth.org/
+WWW: http://www.kbiff.org/
diff --git a/mail/kbiff/pkg-plist b/mail/kbiff/pkg-plist
index 1d48e557be96..fefb61db2bba 100644
--- a/mail/kbiff/pkg-plist
+++ b/mail/kbiff/pkg-plist
@@ -1,7 +1,10 @@
 bin/kbiff
-lib/kbiff.a
-lib/kbiff.la
-lib/kbiff.so
+lib/kde3/kbiff.a
+lib/kde3/kbiff.la
+lib/kde3/kbiff.so
+lib/libkdeinit_kbiff.a
+lib/libkdeinit_kbiff.la
+lib/libkdeinit_kbiff.so
 share/applnk/Internet/kbiff.desktop
 share/apps/kbiff/pics/delete.png
 share/apps/kbiff/pics/mailbox.png
@@ -9,11 +12,13 @@ share/apps/kbiff/pics/mini-newmail.png
 share/apps/kbiff/pics/mini-noconn.png
 share/apps/kbiff/pics/mini-nomail.png
 share/apps/kbiff/pics/mini-oldmail.png
+share/apps/kbiff/pics/mini-stopped.png
 share/apps/kbiff/pics/newmail.png
 share/apps/kbiff/pics/noconn.png
 share/apps/kbiff/pics/nomail.png
 share/apps/kbiff/pics/oldmail.png
 share/apps/kbiff/pics/playsound.png
+share/apps/kbiff/pics/stopped.png
 share/doc/HTML/de/kbiff/common
 share/doc/HTML/de/kbiff/index.cache.bz2
 share/doc/HTML/de/kbiff/index.docbook
@@ -47,9 +52,9 @@ share/locale/hu/LC_MESSAGES/kbiff.mo
 share/locale/is/LC_MESSAGES/kbiff.mo
 share/locale/it/LC_MESSAGES/kbiff.mo
 share/locale/ja/LC_MESSAGES/kbiff.mo
+share/locale/nb/LC_MESSAGES/kbiff.mo
 share/locale/nl/LC_MESSAGES/kbiff.mo
-share/locale/no/LC_MESSAGES/kbiff.mo
-share/locale/no_NY/LC_MESSAGES/kbiff.mo
+share/locale/nn/LC_MESSAGES/kbiff.mo
 share/locale/pl/LC_MESSAGES/kbiff.mo
 share/locale/pt/LC_MESSAGES/kbiff.mo
 share/locale/pt_BR/LC_MESSAGES/kbiff.mo
@@ -67,5 +72,3 @@ share/locale/zh_TW.Big5/LC_MESSAGES/kbiff.mo
 @dirrm share/doc/HTML/de/kbiff
 @dirrm share/apps/kbiff/pics
 @dirrm share/apps/kbiff
-@dirrmtry share/locale/no_NY/LC_MESSAGES
-@dirrmtry share/locale/no_NY