diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index e8644c00a76..2bbbe1b74fa 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,13 +1,19 @@
-# $OpenBSD: Makefile,v 1.15 2000/09/02 13:06:19 kevlo Exp $
+# $OpenBSD: Makefile,v 1.16 2000/09/12 15:54:35 brad Exp $
 # $NetBSD: Makefile,v 1.2 1998/07/04 09:19:04 mycroft Exp $
 
+ONLY_FOR_ARCHS=	i386 sparc m68k hp300
+
 DISTNAME=       xfmail-1.4.6
 CATEGORIES=     mail x11
-NEED_VERSION=	1.319
+NEED_VERSION=	1.328
 MASTER_SITES=	ftp://xfmail.ufies.org/pub/xfmail/release/1.4.6-3/src/
+EXTRACT_SUFX=	.tar.bz2
 
 HOMEPAGE=	http://xfmail.slappy.org/
 
+LIB_DEPENDS=	forms::x11/xforms \
+		glib.1.2::devel/glib
+
 MAINTAINER=	kevlo@openbsd.org
 
 PERMIT_PACKAGE_CDROM=	"no fee"
@@ -15,28 +21,18 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"no fee"
 PERMIT_DISTFILES_FTP=	Yes
 
-LIB_DEPENDS+=	forms::x11/xforms \
-		glib.1.2::devel/glib
-
-ONLY_FOR_ARCHS=	i386 sparc m68k hp300
-
-RESTRICTED=	"Selling this software requires permission of the authors."
-
-USE_BZIP2=	Yes
 USE_X11=	Yes
-
-CONFIGURE_STYLE=	gnu
-
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include/X11" \
+CONFIGURE_STYLE= gnu
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/X11" \
 		LDFLAGS="-L${LOCALBASE}/lib/X11"
 
 FLAVORS=	threads
 FLAVOR?=
 
 .if ${FLAVOR:L} == "threads"
-CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS=	--with-threads
 .else
-CONFIGURE_ARGS+= --without-threads
+CONFIGURE_ARGS=	--without-threads
 .endif	
 
 pre-configure: