diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index 96cd6618af3..b73c5ba9785 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.9 2002/12/01 04:30:31 margarida Exp $
+# $OpenBSD: Makefile,v 1.10 2003/04/06 03:41:55 pvalchev Exp $
 
 COMMENT=	"GNU Problem Report Management System"
 
 DISTNAME=	gnats-3.113.1
 CATEGORIES=	databases devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE:=gnats/snapshots/}
-HOMEPAGE=	http://sources.redhat.com/gnats/
-MAINTAINER=	Dug Song <dugsong@monkey.org>
+MASTER_SITES=	${MASTER_SITE_GNU:=gnats/}
 
-FLAVORS=	www
-FLAVOR?=
+HOMEPAGE=	http://www.gnu.org/software/gnats/
+
+MAINTAINER=	Jolan Luff <jolan@cryptonomicon.org>
 
 # GPL
 PERMIT_DISTFILES_CDROM=	Yes
@@ -17,12 +16,12 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
-CONFIGURE_STYLE= gnu dest
+NO_REGRESS=	Yes
+
+CONFIGURE_STYLE=gnu dest
 CONFIGURE_ARGS+=--with-full-gnats --with-release-based
 CONFIGURE_ENV+=	SEND_PR=/usr/bin/false
 
-NO_REGRESS=	Yes
-
 INSTALL_TARGET=	install-gnats install-send-pr install-info
 
 post-install:
@@ -33,6 +32,10 @@ post-install:
 	sed "s%/var/lib%${TRUEPREFIX}/share%g" \
 		${WRKDIST}/gnats/gnats-db.conf > \
 		${PREFIX}/share/examples/gnats/gnats-db.conf
+
+FLAVORS=	www
+FLAVOR?=
+
 .if ${FLAVOR:L:Mwww}
 	${INSTALL_PROGRAM} ${WRKDIST}/contrib/gnatsweb/gnatsweb.pl \
 		${PREFIX}/lib/gnatsweb