diff --git a/x11/qvwm/Makefile b/x11/qvwm/Makefile
index 72dac40737c..53dd8334edc 100644
--- a/x11/qvwm/Makefile
+++ b/x11/qvwm/Makefile
@@ -1,10 +1,13 @@
-# $OpenBSD: Makefile,v 1.4 2000/07/10 20:28:04 danh Exp $
+# $OpenBSD: Makefile,v 1.5 2000/09/23 20:03:20 danh Exp $
 
-DISTNAME=		qvwm-1.1.8
-CATEGORIES=     	x11
-NEED_VERSION=		1.310
-HOMEPAGE=		http://www.qvwm.org/
-MAINTAINER=		danh@openbsd.org
+DISTNAME=	qvwm-1.1.8
+CATEGORIES=     x11
+NEED_VERSION=	1.334
+MASTER_SITES=	ftp://ftp.qvwm.org/pub/qvwm/
+
+HOMEPAGE=	http://www.qvwm.org/
+
+MAINTAINER=	Dan Harnett <danh@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes 
@@ -12,30 +15,30 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes 
 PERMIT_DISTFILES_FTP=	Yes 
 
-MASTER_SITES=		ftp://ftp.qvwm.org/pub/qvwm/
-
-USE_X11=		Yes
-CONFIGURE_STYLE=	gnu
-FLAVORS=		esound imlib
+FLAVORS=	esound imlib
 FLAVOR?=
 
+USE_X11=	Yes
+
+SEPARATE_BUILD=	flavored
+CONFIGURE_STYLE= gnu
+
 # the build-scheme will get confused otherwise
 post-patch:
 	rm ${WRKDIST}/src/yaccsrc.{cc,h}
 
-SEPARATE_BUILD=flavored
-
 .if ${FLAVOR:L:Mesound}
-LIB_DEPENDS+=esd.2.::audio/esound
-CONFIGURE_ARGS+=--with-esd-prefix=${LOCALBASE}
+LIB_DEPENDS+=	esd.2.::audio/esound
+CONFIGURE_ARGS+= --with-esd-prefix=${LOCALBASE}
 .else
-CONFIGURE_ARGS+=--without-esd
+CONFIGURE_ARGS+= --without-esd
 .endif
+
 .if ${FLAVOR:L:Mimlib}
-LIB_DEPENDS+=Imlib.19.::graphics/imlib
-CONFIGURE_ARGS+=--with-imlib-prefix=${LOCALBASE}
+LIB_DEPENDS+=	Imlib.19.::graphics/imlib
+CONFIGURE_ARGS+= --with-imlib-prefix=${LOCALBASE}
 .else
-CONFIGURE_ARGS+=--without-imlib
+CONFIGURE_ARGS+= --without-imlib
 .endif
 
 .include <bsd.port.mk>