diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile
index ca4fc57870b6..81eca0f4ddfb 100644
--- a/archivers/xmill/Makefile
+++ b/archivers/xmill/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	xmill
+# New ports collection makefile for:	XMill
 # Date created:				09 May 2003
 # Whom:					Alexey Dokuchaev <danfe@regency.nsu.ru>
 #
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	xmill
-PORTVERSION=	0.7
+DISTVERSION=	0-7
 CATEGORIES=	archivers
-MASTER_SITES=	http://www.research.att.com/~mff/XMILL/
-DISTNAME=	xmill-0-7
+MASTER_SITES=	http://www.research.att.com/sw/tools/XMILL/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	An efficient compressor for XML
 
+USE_REINPLACE=	yes
+
 NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
 
@@ -22,15 +23,18 @@ USE_ZIP=	yes
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE="Explicit agreement to the terms and conditions of the license required.  Download ${DISTNAME}${EXTRACT_SUFX} manually from http://www.research.att.com/sw/tools/xmill/download.html, put it under ${DISTDIR} and run make again"
+IGNORE=		"requires explicit agreement to the terms and conditions of the license.  Download ${DISTNAME}${EXTRACT_SUFX} manually from http://www.research.att.com/sw/tools/XMILL/,put it under ${DISTDIR} and run make again"
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e 's,friend,& class,' \
+		${WRKSRC}/src/*.?pp
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unix/xmill ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/unix/xdemill ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/unix/xbmill ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/unix/xbdemill ${PREFIX}/bin
-
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.txt ${DOCSDIR}
diff --git a/archivers/xmill/pkg-descr b/archivers/xmill/pkg-descr
index 609d4cf7fcd7..66aab703ecc2 100644
--- a/archivers/xmill/pkg-descr
+++ b/archivers/xmill/pkg-descr
@@ -6,4 +6,4 @@ between those text strings for compression.  Hence, XMill typically
 achieves much better compression rates than conventional compressors
 such as gzip.
 
-WWW: http://www.research.att.com/sw/tools/xmill/
+WWW: http://www.research.att.com/sw/tools/XMILL/