diff --git a/misc/hfsplus/Makefile b/misc/hfsplus/Makefile
index 851a74e8b2b..17f8d1d3c61 100644
--- a/misc/hfsplus/Makefile
+++ b/misc/hfsplus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2011/04/22 11:37:46 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2011/06/29 12:20:56 jasper Exp $
 
 COMMENT=	hfsplus filesystem access tool
 
@@ -6,9 +6,9 @@ VERSION=	1.0.4
 DISTNAME=	hfsplus_${VERSION}
 PKGNAME=	hfsplus-${VERSION}
 REVISION=	4
-WRKDIST=	${WRKDIR}/hfsplus-${VERSION}
+SHARED_LIBS=	hfsp	0.0
+
 CATEGORIES=	misc 
-EXTRACT_SUFX=	.src.tar.bz2
 
 # GPL
 PERMIT_DISTFILES_FTP=	Yes
@@ -16,35 +16,36 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	c
+WANTLIB=		c
+
+MASTER_SITES=		http://distfiles.nl/
+EXTRACT_SUFX=		.src.tar.bz2
+
+USE_GMAKE=		Yes
+USE_LIBTOOL=		Yes
 
 AUTOCONF_VERSION=	2.59
-BUILD_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS}
-# needs the AM_PROG_LIBTOOL macro                                             
-BUILD_DEPENDS += devel/libtool                              
-
-USE_GMAKE=	Yes
-USE_LIBTOOL=	Yes
-
-MASTER_SITES=	http://penguinppc.org/historical/hfsplus/
+BUILD_DEPENDS=		${MODGNU_AUTOCONF_DEPENDS}
+# needs the AM_PROG_LIBTOOL macro                                           
+BUILD_DEPENDS +=	devel/libtool
 
 # actually uses automake/autoheader, but that is done in pre-configure now
-CONFIGURE_STYLE=automake
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_STYLE=	automake
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}
-SHARED_LIBS=	hfsp	0.0
+
+WRKDIST=		${WRKDIR}/hfsplus-${VERSION}
+
+DOC=bugs.html hfsp.html libhfsp.html
 
 pre-configure:
 	@cd ${WRKDIST} && AUTOCONF_VERSION=${AUTOCONF_VERSION} \
 		AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
 		${MAKE_PROGRAM} -f Makefile.cvs all
 
-DOC=bugs.html hfsp.html libhfsp.html
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hfsplus/
-
 .for h in ${DOC}
 	${INSTALL_DATA} ${WRKSRC}/doc/${h} ${PREFIX}/share/doc/hfsplus/
 .endfor