diff --git a/x11/afterstep/Makefile b/x11/afterstep/Makefile
index f2865fc4f23..6a1c47aa088 100644
--- a/x11/afterstep/Makefile
+++ b/x11/afterstep/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.30 2008/11/21 15:13:58 jasper Exp $
+# $OpenBSD: Makefile,v 1.31 2009/12/03 12:37:24 jasper Exp $
 
-COMMENT=	Window manager, continuation of the Bowman NeXTSTEP clone
+COMMENT=	window manager, continuation of the Bowman NeXTSTEP clone
 
 DISTNAME=	AfterStep-1.8.9
 PKGNAME=	${DISTNAME:L}p0
@@ -14,24 +14,23 @@ LIB_DEPENDS=	png.>=2::graphics/png \
 		jpeg.>=62::graphics/jpeg \
 		rplay::audio/rplay
 
-MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
-
-# GPL/LGPL/X11
+# GPLv2/LGPLv2/X11
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=		ICE SM X11 Xext Xpm c m z
+
+WANTLIB += ICE SM X11 Xext Xpm c m z
 
 FAKE=		lib
 USE_X11=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	 --enable-different-looknfeels
-CONFIGURE_ARGS+= --with-helpcommand="xterm -e man"
-CONFIGURE_ARGS+= --with-jpeg-includes=${DEPBASE}/include
-CONFIGURE_ARGS+= --with-jpeg-library=${DEPBASE}/lib
-CONFIGURE_ARGS+= --with-png-includes=${DEPBASE}/include/libpng
-CONFIGURE_ARGS+= --with-png-library=${DEPBASE}/lib
+CONFIGURE_ARGS= --enable-different-looknfeels \
+		--with-helpcommand="xterm -e man" \
+		--with-jpeg-includes=${DEPBASE}/include \
+		--with-jpeg-library=${DEPBASE}/lib \
+		--with-png-includes=${DEPBASE}/include/libpng \
+		--with-png-library=${DEPBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="-I${DEPBASE}/include" \
 		LDFLAGS="-L${DEPBASE}/lib" \
 		CFLAGS="${CFLAGS} -fsigned-char"
@@ -39,6 +38,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${DEPBASE}/include" \
 NO_REGRESS=	Yes
 		
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/monitor_bsd.xpm ${PREFIX}/share/afterstep/desktop/icons/common
+	${INSTALL_DATA} ${FILESDIR}/monitor_bsd.xpm \
+		${PREFIX}/share/afterstep/desktop/icons/common
 
 .include <bsd.port.mk>
diff --git a/x11/afterstep/pkg/DESCR b/x11/afterstep/pkg/DESCR
index ac4befe0201..38f556128e3 100644
--- a/x11/afterstep/pkg/DESCR
+++ b/x11/afterstep/pkg/DESCR
@@ -1,20 +1,21 @@
 AfterStep is a continuation of the BowMan window manager which was
 originally put together by Bo Yang. BowMan was based on the fvwm window
-manager, written by Robert Nation. Fvwm was based on code from twm. And so
-on... It is designed to emulate some of the look and feel of the NEXTSTEP(R)
-user interface, while adding useful, requested, and neat features. The
-changes which comprise AfterStep's personality were originally part of
-BowMan development, but due to a desire to move past simple emulation and
-into a niche as its own valuable window manager, the current designers
-decided to change the project name and move on. BowMan development may
-continue, but we will no longer be a part of it.
+manager, written by Robert Nation. Fvwm was based on code from twm. And
+so on... It is designed to emulate some of the look and feel of the
+NEXTSTEP(R) user interface, while adding useful, requested, and neat
+features. The changes which comprise AfterStep's personality were
+originally part of BowMan development, but due to a desire to move past
+simple emulation and into a niche as its own valuable window manager,
+the current designers decided to change the project name and move on.
+BowMan development may continue, but we will no longer be a part of it.
 
 Major changes from fvwm are:
 
 - NEXTSTEP-like title bar, title buttons, borders and corners. BowMan's
   Wharf is a much worked-out version of GoodStuff.  To avoid copyright
-  complications it is not called a "dock." 
+  complications it is not called a "dock."
 - NEXTSTEP style menu. However, the menus are not controlled by
-  applications; they are more of pop-up service lists on the root window.
-- NEXTSTEP style icons. These styles are hard-coded in the program, which is
-  good for the consistent look of the NEXTSTEP interface.
+  applications; they are more of pop-up service lists on the root
+  window.
+- NEXTSTEP style icons. These styles are hard-coded in the program,
+  which is good for the consistent look of the NEXTSTEP interface.