diff --git a/databases/xmbase-grok/Makefile b/databases/xmbase-grok/Makefile
index 13f90220983f..54c37b620b61 100644
--- a/databases/xmbase-grok/Makefile
+++ b/databases/xmbase-grok/Makefile
@@ -9,8 +9,9 @@ PORTNAME=	xmbase-grok
 PORTVERSION=	1.5
 PORTREVISION=	3
 CATEGORIES=	databases
-MASTER_SITES=	ftp://grok.ftp.fu-berlin.de/ \
-		ftp://bitrot.de/pub/grok/
+MASTER_SITES=	http://www.sourcefiles.org/Databases/Relational/ \
+		http://fossies.org/unix/misc/old/ \
+		ftp://grok.ftp.fu-berlin.de/
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -24,6 +25,7 @@ MAKE_ENV=	MYCC="${CC}" DEBUG="${CFLAGS}" YO="" INCDIR="" \
 		GBIN="${PREFIX}/bin" GLIB="${DATADIR}" \
 		CF="-I${LOCALBASE}/include" LF="${MOTIFLIB} -lXt -lX11 -lm"
 MAN1=		grok.1
+MAKE_JOBS_SAFE=	yes
 
 DATADIR=	${PREFIX}/lib/X11/xmbase-grok
 
@@ -33,18 +35,16 @@ pre-patch:
 		 s|^DEBUG =|#DEBUG =|g' ${BUILD_WRKSRC}/Makefile
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/grok ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/man/grok.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/grok ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/grok.1 ${MANPREFIX}/man/man1
 	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/misc/grok.hlp ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/misc/grok.hlp ${DATADIR}
 	@${MKDIR} ${DATADIR}/grokdir
-	@${TAR} -C ${WRKSRC}/demo -cf - . | \
-		${TAR} -C ${DATADIR}/grokdir -xf -
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/grokdir
+	@(cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${DATADIR}/grokdir)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.* ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/xmbase-grok/pkg-descr b/databases/xmbase-grok/pkg-descr
index 66f4aaebd296..559d489dbec0 100644
--- a/databases/xmbase-grok/pkg-descr
+++ b/databases/xmbase-grok/pkg-descr
@@ -7,4 +7,4 @@ and UI builder that can -
   *  manage any other database after simple GUI-driven customization
   *  customized data export, HTML export built in
 
-WWW: http://me.in-berlin.de/~bitrot/grok.html
+WWW: http://bitrot.de/grok.html