diff --git a/math/chaco/Makefile b/math/chaco/Makefile
index 4f92ffccde6e..d3fe6020b178 100644
--- a/math/chaco/Makefile
+++ b/math/chaco/Makefile
@@ -1,37 +1,34 @@
 PORTNAME=	chaco
-PORTVERSION=	2.2
+DISTVERSION=	2.2
 CATEGORIES=	math
-MASTER_SITES=	http://www.cs.sandia.gov/downloads/papers/bahendr/ \
-		http://bsd1.csme.ru/myports/ \
-		http://bsd2.csme.ru/myports/ \
-		http://bsd3.csme.ru/myports/
-DISTNAME=	Chaco-${PORTVERSION}
+MASTER_SITES=	https://ftp.mcs.anl.gov/pub/petsc/externalpackages/
+DISTNAME=	Chaco-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alven@FreeBSD.org
 COMMENT=	Software for partitioning graphs
-WWW=		http://www.cs.sandia.gov/~bahendr/chaco.html
+WWW=		https://github.com/sandialabs/Chaco/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/../GNU_Lesser_GPL.txt
 
 USES=		gmake
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
 WRKSRC=		${WRKDIR}/${DISTNAME}/code
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/exec/chaco ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/exec/libchaco.a ${STAGEDIR}${PREFIX}/lib
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/*.ps ${STAGEDIR}${DOCSDIR}
 	${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/*.ps
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/exec/*.graph ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/exec/*.coords ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/chaco/files/patch-Makefile b/math/chaco/files/patch-Makefile
index 5f7bd7630476..a718de50d14d 100644
--- a/math/chaco/files/patch-Makefile
+++ b/math/chaco/files/patch-Makefile
@@ -1,41 +1,41 @@
---- Makefile.orig	Thu Oct  2 12:23:22 1997
-+++ Makefile	Mon May  1 22:19:06 2006
-@@ -1,11 +1,13 @@
+--- Makefile.orig	1997-10-02 17:23:22 UTC
++++ Makefile
+@@ -1,11 +1,13 @@ DEST=		${DEST_DIR}/chaco
  DEST_DIR = 	../exec
  DEST=		${DEST_DIR}/chaco
 -CC = 		gcc
 +CC ?= 		cc
  IFLAG =		-Imain
 -CFLAGS =	-O2
 -OFLAGS =	-O2
 +CFLAGS =	@CFLAGS@
 +OFLAGS +=	-O2
  
 -FILES.c=	main/user_params.c main/interface.c main/main.c \
 +main_file=	 main/main.c
 +
 +libFILES.c=	main/user_params.c main/interface.c \
  		submain/balance.c submain/divide.c submain/submain.c \
  		input/input_assign.c \
  		input/check_input.c input/input.c input/input_geom.c \
-@@ -87,11 +89,20 @@
+@@ -87,11 +89,20 @@ FILES.c=	main/user_params.c main/interface.c main/main
  		util/update.c  util/vecout.c util/vecran.c \
                  util/vecscale.c 
  
 +FILES.c=	$(libFILES.c) $(main_file)
 +
  FILES.o=	$(FILES.c:.c=.o) 
  
 +libFILES.o=	$(libFILES.c:.c=.o)
-+
-+all: ${DEST} ${DEST_DIR}/libchaco.a
  
++all: ${DEST} ${DEST_DIR}/libchaco.a
++
  ${DEST}:	${FILES.o} Makefile
  		${CC} ${OFLAGS} ${FILES.o} -lm -o ${DEST}
 +
 +${DEST_DIR}/libchaco.a:	${libFILES.o} Makefile
 +		ar r ${DEST_DIR}/libchaco.a ${libFILES.o}
 +		ranlib ${DEST_DIR}/libchaco.a
  
  lint:
  		lint ${IFLAG} ${FILES.c} -lm